diff --git a/flake.nix b/flake.nix index cf035bb..0e09e1a 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,6 @@ let system = "x86_64-linux"; username = "josh"; - profile = "desktop"; homePath = ./. + "/users/${username}/home.nix"; pkgs = import nixpkgs { @@ -60,6 +59,7 @@ mkHost = { host, + profile, extraModules ? [ ], }: nixpkgs.lib.nixosSystem { @@ -79,12 +79,19 @@ in { nixosConfigurations = { - laptop = mkHost { host = "laptop"; }; + laptop = mkHost { + host = "laptop"; + profile = "gaming"; + }; - vm = mkHost { host = "vm"; }; + vm = mkHost { + host = "vm"; + profile = "desktop"; + }; live = mkHost { host = "installation-iso"; + profile = "desktop"; extraModules = [ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") { environment.systemPackages = [ install-system.packages.${system}.default ]; } @@ -94,7 +101,8 @@ homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { extraSpecialArgs = { - inherit inputs profile username; + inherit inputs username; + profile = "desktop"; }; inherit pkgs; modules = [ diff --git a/hosts/installation-iso/default.nix b/hosts/installation-iso/default.nix index f5c4fd4..e97513f 100644 --- a/hosts/installation-iso/default.nix +++ b/hosts/installation-iso/default.nix @@ -1,9 +1,10 @@ { + profile, ... }: { imports = [ - ../../profiles/desktop + ../../profiles/${profile} ../../modules/nixos ../../modules/drivers diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 6fea6df..eb3171f 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -1,9 +1,10 @@ { + profile, ... }: { imports = [ - ../../profiles/desktop + ../../profiles/${profile} ../../modules/nixos ../../modules/drivers diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix index 3d17445..bdc48c2 100644 --- a/hosts/vm/default.nix +++ b/hosts/vm/default.nix @@ -1,9 +1,10 @@ { + profile, ... }: { imports = [ - ../../profiles/desktop + ../../profiles/${profile} ../../modules/nixos ../../modules/drivers diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix index 4b763dc..ee48f5d 100644 --- a/profiles/desktop/default.nix +++ b/profiles/desktop/default.nix @@ -29,6 +29,4 @@ modules.screenshot.enable = true; modules.tailscale.enable = true; - - modules.steam.enable = true; } diff --git a/profiles/gaming/default.nix b/profiles/gaming/default.nix new file mode 100644 index 0000000..f1dbd9e --- /dev/null +++ b/profiles/gaming/default.nix @@ -0,0 +1,10 @@ +{ + ... +}: +{ + imports = [ + ../desktop + ]; + + modules.steam.enable = true; +}