restructure

modules/users/nathan/nathan.nix

@@ -21,10 +21,21 @@
 
             };
 
-            home-manager.users.nathan = lib.mkMerge [
+            home-manager.users.nathan = with self.homeModules; let
+                laptop = [ "laptop" ];
+                #homebox = [ "homebox" ];
+                #both = laptop ++ homebox;
+                useWith = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName) x) y);
+            in lib.mkMerge [
                 self.homeModules.nathan
+                (useWith laptop nathan-aurora)
+                (useWith laptop nathan-firefox)
+                (useWith laptop nathan-rofi)
+                (useWith laptop nathan-hypridle)
+                (useWith laptop nathan-hyprland)
+                (useWith laptop nathan-kitty)
                 
-                (lib.mkIf (config.networking.hostName == "laptop") {
+                (useWith laptop {
                     wayland.windowManager.hyprland.extraConfig = ''
                         monitor=eDP-1,1920x1080@60,0x0,1
                         bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
@@ -35,7 +46,7 @@
         };
     };
 
-    flake.homeModules.nathan = { lib, ... }:
+    flake.homeModules.nathan-standalone = { lib, ... }:
 
     {