diff --git a/flake.nix b/flake.nix index 035f773..4dd63e7 100644 --- a/flake.nix +++ b/flake.nix @@ -24,32 +24,25 @@ let lib = import ./lib { inherit (nixpkgs) lib; }; - cleanHostname = - config: - builtins.removeAttrs config [ "hostname" ]; - toPartialNixosConfigSet = - config: - { - name = config.hostname; - value = nixpkgs.lib.nixosSystem (cleanHostname config); - }; - toNixosSystemConfig = + toPartialNixosConfig = { hostname, system }: { - inherit system hostname; - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/${hostname}/hardware-configuration.nix - ./hosts/${hostname}/configuration.nix - inputs.home-manager.nixosModules.default - ]; + name = hostname; + value = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { inherit inputs; }; + modules = [ + ./hosts/${hostname}/hardware-configuration.nix + ./hosts/${hostname}/configuration.nix + inputs.home-manager.nixosModules.default + ]; + }; }; compileSystems = systems: lib.right builtins.listToAttrs - (map toPartialNixosConfigSet) - (map toNixosSystemConfig) + (map toPartialNixosConfig) systems; in compileSystems