add desktop and laptop config option

flake.nix

@@ -37,14 +37,29 @@
   };
 
   outputs = { nixpkgs, self, ...} @ inputs:
-    let
+  let
-      selfPkgs = import ./pkgs;
+    selfPkgs = import ./pkgs;
-      username = "frostphoenix";
+    username = "frostphoenix";
-    in
+    system = "x86_64-linux";
-    {
+    pkgs = import nixpkgs {
-      overlays.default = selfPkgs.overlay;
+      inherit system;
-      nixosConfigurations = import ./modules/core/default.nix {
+      config.allowUnfree = true;
-        inherit self nixpkgs inputs username;
+    };
+    lib = nixpkgs.lib;
+  in
+  {
+    overlays.default = selfPkgs.overlay;
+    nixosConfigurations = {
+      desktop = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [ (import ./hosts/desktop) ];
+        specialArgs = { host="desktop"; inherit self inputs username ; };
+      };
+      laptop = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [ (import ./hosts/laptop) ];
+        specialArgs = { host="laptop"; inherit self inputs username ; };
       };
     };
+  };
 }

hosts/desktop/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: 
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./../../modules/core
+  ];
+}

hosts/laptop/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: 
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./../../modules/core
+  ];
+}

modules/core/default.nix

@@ -1,29 +1,16 @@
-{ inputs, nixpkgs, self, username, ...}:
+{ inputs, nixpkgs, self, username, host, ...}:
-let
-  system = "x86_64-linux";
-  pkgs = import nixpkgs {
-    inherit system;
-    config.allowUnfree = true;
-  };
-  lib = nixpkgs.lib;
-in
 {
-  nixos = nixpkgs.lib.nixosSystem {
+  imports =
-    specialArgs = { inherit self inputs username; };
+       [ (import ./bootloader.nix) ]
-    modules =
+    ++ [ (import ./hardware.nix) ]
-      [ (import ./bootloader.nix) ]
+    ++ [ (import ./xserver.nix) ]
-      ++ [ (import ./hardware.nix) ]
+    ++ [ (import ./network.nix) ]
-      ++ [ (import ./xserver.nix) ]
+    ++ [ (import ./pipewire.nix) ]
-      ++ [ (import ./network.nix) ]
+    ++ [ (import ./program.nix) ]
-      ++ [ (import ./pipewire.nix) ]
+    ++ [ (import ./security.nix) ]
-      ++ [ (import ./program.nix) ]
+    ++ [ (import ./services.nix) ]
-      ++ [ (import ./security.nix) ]
+    ++ [ (import ./system.nix) ]
-      ++ [ (import ./services.nix) ]
+    ++ [ (import ./user.nix) ]
-      ++ [ (import ./system.nix) ]
+    ++ [ (import ./wayland.nix) ]
-      ++ [ (import ./user.nix) ]
+    ++ [ (import ./virtualization.nix) ];
-      ++ [ (import ./wayland.nix) ]
-      ++ [ (import ./virtualization.nix) ]
-      ++ [ (import ./../../hosts/desktop/hardware-configuration.nix) ]
-    ;
-  };
 }

modules/core/user.nix

@@ -1,9 +1,4 @@
-{ pkgs, inputs, username, ...}:
+{ pkgs, inputs, username, host, ...}:
-let
-  packages = with pkgs; [
-    fish
-  ];
-in
 {
   imports = [ inputs.home-manager.nixosModules.home-manager ];
   home-manager = {
@@ -11,7 +6,10 @@ in
     useGlobalPkgs = true;
     extraSpecialArgs = { inherit inputs username; };
     users.${username} = {
-      imports = [ (import ./../home) ];
+      imports = 
+        if (host == "desktop") then 
+          [ ./../home/default.desktop.nix ] 
+        else [ ./../home ];
       home.username = "${username}";
       home.homeDirectory = "/home/${username}";
       home.stateVersion = "22.11";

modules/home/default.desktop.nix

@@ -0,0 +1,7 @@
+{inputs, username, ...}: {
+  imports =
+       [(import ./default.nix)]
+    ++ [(import ./rider.nix)]                     # C# JetBrain editor
+    # ++ [ (import ./steam.nix) ]
+    ++ [(import ./unity.nix)];
+}

modules/home/default.nix

@@ -16,12 +16,9 @@
     ++ [(import ./micro.nix)]                     # nano replacement
     ++ [(import ./nvim.nix)]
     ++ [(import ./packages.nix)]
-    ++ [(import ./rider.nix)]                     # C# JetBrain editor
     ++ [(import ./scripts/scripts.nix)]           # personal scripts
     ++ [(import ./starship.nix)]
-    # ++ [ (import ./steam.nix) ]
     ++ [(import ./swaylock.nix)]
-    ++ [(import ./unity.nix)]
     ++ [(import ./vscodium.nix)]
     ++ [(import ./waybar)]
     ++ [(import ./wofi.nix)]