From bb7342d87683568a4f527df3786beb5f44bb64c7 Mon Sep 17 00:00:00 2001 From: Nydragon Date: Tue, 25 Jun 2024 14:46:50 +0200 Subject: [PATCH] refactor: move system creation to function --- flake.nix | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index f830bd0..395f850 100644 --- a/flake.nix +++ b/flake.nix @@ -25,15 +25,15 @@ }; lib = nixpkgs.lib; - in - { - nixosConfigurations = { - marr = lib.nixosSystem { + + mkSystem = + { + hostname, + extraModules ? [ ], + }: + lib.nixosSystem { inherit system; - modules = [ - ./hosts/marr/configuration.nix - #inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia - ]; + modules = [ ./hosts/${hostname}/configuration.nix ] ++ extraModules; specialArgs = { inherit inputs @@ -41,9 +41,23 @@ system lib pkgs + hostname ; + + username = "nico"; }; }; + in + { + nixosConfigurations = { + marr = mkSystem { + hostname = "marr"; + extraModules = [ + #inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia + ]; + }; + + brontes = mkSystem { hostname = "brontes"; }; }; devShells."${system}".default = pkgs.mkShell {