makeSystem cleanup

This commit is contained in:
Your Name 2024-05-18 20:37:51 +03:00
parent 4c913a7667
commit 094b964749

View file

@ -44,10 +44,10 @@
extraSpecialArgs = specialArgs; extraSpecialArgs = specialArgs;
}; };
makeSystem = name: pkgsVersion: systemModules: nixpkgs.lib.nixosSystem { makeSystem = name: pkgsVersion: nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = specialArgs // { inherit pkgsVersion; }; specialArgs = specialArgs // { inherit pkgsVersion; };
modules = [ ./hosts/generic.nix ] ++ systemModules; modules = [ ./hosts/generic.nix ./hosts/${name}/system.nix ];
}; };
in { in {
@ -55,9 +55,9 @@
devShells = { "x86_64-linux" = import ./shell.nix { inherit pkgs; }; }; devShells = { "x86_64-linux" = import ./shell.nix { inherit pkgs; }; };
nixosConfigurations = { nixosConfigurations = {
dlaptop = makeSystem "dlaptop" unstable [ ./hosts/dlaptop/system.nix ]; dlaptop = makeSystem "dlaptop" unstable;
intelnuc = makeSystem "intelnuc" stable [ ./hosts/intelnuc/system.nix ]; intelnuc = makeSystem "intelnuc" stable;
huanan = makeSystem "huanan" pkgs [ ./hosts/huanan/system.nix ]; huanan = makeSystem "huanan" pkgs;
}; };
}; };
} }