diff --git a/builders.nix b/builders.nix index 7a15226..692bd69 100644 --- a/builders.nix +++ b/builders.nix @@ -42,12 +42,6 @@ rec { } ]; }); - compileSystems = - systems: - lib.right - builtins.listToAttrs - (map toPartialNixosConfig) - systems; toPartialHomeManagerConfig = { user, system ? "x86_64-linux", hostname ? "", configHostname ? "" }: @@ -67,13 +61,6 @@ rec { ./hosts/${configHost}/home.nix ]; }); - compileHomes = - systems: - lib.right - builtins.listToAttrs - (map toPartialHomeManagerConfig) - systems; - toPartialDarwinConfig = { hostname, system ? "aarch64-darwin", }: @@ -95,10 +82,14 @@ rec { ]; }); - compileDarwinSystems = + compileSystems = + toPartialConfiguration: systems: lib.right builtins.listToAttrs - (map toPartialDarwinConfig) + (map toPartialConfiguration) systems; + compileNixosSystems = compileSystems toPartialNixosConfig; + compileDarwinSystems = compileSystems toPartialDarwinConfig; + compileHomes = compileSystems toPartialHomeManagerConfig; } diff --git a/flake.nix b/flake.nix index 87d4090..576a20f 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ builders = import ./builders.nix inputs; in { - nixosConfigurations = builders.compileSystems [ + nixosConfigurations = builders.compileNixosSystems [ { hostname = "snowhawk"; } ];