seang96/nixos-config
1
0
Fork 0
mirror of https://github.com/buckley310/nixos-config.git synced 2024-09-14 18:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move "nixosSystem" step out of getHosts

Browse source
This commit is contained in:
Sean Buckley 2021-12-02 16:04:13 -05:00
parent 05bee65c5d
commit bbafad8487
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -43,11 +43,13 @@
nixpkgs.overlays = [ (_: mypkgs) ];
};
nixosConfigurations = getHosts {
path = ./hosts;
inherit nixpkgs;
inherit (self) nixosModule;
};
nixosConfigurations =
builtins.mapAttrs
(_: nixpkgs.lib.nixosSystem)
(getHosts {
inherit (self) nixosModule;
path = ./hosts;
});
packages = forAllSystems
(system: mypkgs nixpkgs.legacyPackages.${system});

31
lib/hosts.nix
View file

@ -1,4 +1,4 @@
{ path, nixpkgs, nixosModule }:
{ path, nixosModule }:
let
inherit (builtins) mapAttrs attrValues attrNames readDir foldl' listToAttrs;
@ -17,18 +17,19 @@ let
(system: hosts: listToAttrs (map (name: { inherit name; value = system; }) hosts))
sysToHosts));
# build system configurations
# { host1 = <nixosConfiguration>; host2 = <nixosConfiguration>; }
hostToConfig = mapAttrs
(hostName: system: nixpkgs.lib.nixosSystem {
inherit system;
modules = [
(nixosModule)
(path + "/${system}/${hostName}")
(_: { networking.hostName = hostName; })
];
})
hostToSys;
in
hostToConfig
# produce stub configurations
# {
# host1 = { system = "x86_64-linux"; modules = [ ... ]; };
# host2 = { system = "x86_64-linux"; modules = [ ... ]; };
# }
mapAttrs
(hostName: system: {
inherit system;
modules = [
(nixosModule)
(path + "/${system}/${hostName}")
{ networking = { inherit hostName; }; }
];
})
hostToSys