willemml/dotfiles.nix
1
0
Fork 0
mirror of https://github.com/willemml/dotfiles.nix.git synced 2025-04-13 03:37:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moves nixosModules from modules.nix to their own files

Browse source
This commit is contained in:
willemml 2023-11-06 12:27:44 -08:00
parent 3976578cd5
commit 68157bd671
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
5 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake-parts/nixos/hosts.nix
View file

@ -8,7 +8,7 @@
imports = [ imports = [
../../nixos/profiles/common.nix ../../nixos/profiles/common.nix
../../nixos/profiles/linux/base.nix ../../nixos/profiles/linux/base.nix
self.nixosModules.nixpkgs-useFlakeNixpkgs self.nixosModules.useFlakeNixpkgs
]; ];
nixpkgs.overlays = builtins.attrValues self.overlays; nixpkgs.overlays = builtins.attrValues self.overlays;
@ -18,7 +18,7 @@
nixosModules.willem-home = {...}: { nixosModules.willem-home = {...}: {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
self.nixosModules.home-manager-integration self.nixosModules.homeManagerIntegration
]; ];
home-manager.users.willem = self.homeManagerModules.user-willem-linux; home-manager.users.willem = self.homeManagerModules.user-willem-linux;
}; };
@ -29,8 +29,7 @@
inputs.home-manager.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager
self.nixosModules.linkNixInputs self.nixosModules.linkNixInputs
self.nixosModules.home-manager-integration self.nixosModules.home-manager-integration
self.nixosModules.nix-useCachix self.nixosModules.useFlakeNixpkgs
self.nixosModules.nixpkgs-useFlakeNixpkgs
]; ];
nixpkgs.overlays = builtins.attrValues self.overlays; nixpkgs.overlays = builtins.attrValues self.overlays;
@ -82,6 +81,7 @@
self.darwinModules.base self.darwinModules.base
../../nixos/hosts/zeus.darwin.nix ../../nixos/hosts/zeus.darwin.nix
]; ];
specialArgs = {inherit inputs;};
}; };
}; };
} }

28
flake-parts/nixos/modules.nix
View file

@ -7,25 +7,13 @@
inputs, inputs,
... ...
}: { }: {
flake.nixosModules = { flake.nixosModules = let
default = {}; modules = self.lib.importDirToAttrs ../../nixos/modules;
in
appleSilicon = {config, ...}: { {
imports = [inputs.nixos-apple-silicon.nixosModules.apple-silicon-support]; default = {
nixpkgs.overlays = [inputs.nixos-apple-silicon.overlays.default]; imports = builtins.attrValues modules;
};
nixpkgs-useFlakeNixpkgs = {
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
nix.registry.nixpkgs.flake = inputs.nixpkgs;
};
home-manager-integration = {
config.home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "bak";
}; };
}; }
}; // modules;
} }

4
nixos/modules/appleSilicon.nix Normal file
View file

@ -0,0 +1,4 @@
{inputs, ...}: {
imports = [inputs.nixos-apple-silicon.nixosModules.apple-silicon-support];
nixpkgs.overlays = [inputs.nixos-apple-silicon.overlays.default];
}

7
nixos/modules/homeManagerIntegration.nix Normal file
View file

@ -0,0 +1,7 @@
{
config.home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "bak";
};
}

4
nixos/modules/useFlakeNixpkgs.nix Normal file
View file

@ -0,0 +1,4 @@
{inputs, ...}: {
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
nix.registry.nixpkgs.flake = inputs.nixpkgs;
}