Shift around configuration so that non-machine specific settings live under profiles instead of hosts

hosts/installation-iso/default.nix

@@ -3,23 +3,13 @@
 }:
 {
   imports = [
+    ../../profiles/desktop
+
     ../../modules/core
+    ../../modules/drivers
     ../../modules/options
 
     ./hardware.nix
     ./host-packages.nix
   ];
-
-  modules.hyprland = {
-    enable = true;
-    terminal = "kitty";
-  };
-
-  modules.plasma.enable = false;
-  modules.displayManager.displayManager = "gdm";
-
-  modules.zsh.enable = true;
-  modules.shell.defaultShell = "zsh";
-
-  modules.pipewire.enable = true;
 }

hosts/vm/default.nix

@@ -3,27 +3,26 @@
 }:
 {
   imports = [
-    ../../profiles/vm
+    ../../profiles/desktop
+
     ../../modules/core
+    ../../modules/drivers
     ../../modules/options
 
     ./hardware.nix
     ./host-packages.nix
   ];
 
-  modules.hyprland = {
-    enable = true;
-    terminal = "kitty";
-    launcher = "walker";
-    monitor = [
-      ",preferred,auto,1"
-    ];
+  virtualisation.vmVariant = {
+    virtualisation = {
+      memorySize = 8192;
+      cores = 8;
+    };
   };
-  modules.plasma.enable = false;
-  modules.displayManager.displayManager = "gdm";
 
-  modules.zsh.enable = true;
-  modules.shell.defaultShell = "zsh";
-
-  modules.pipewire.enable = true;
+  # drivers.amdgpu.enable = false;
+  # drivers.nvidia.enable = false;
+  # drivers.nvidia-prime.enable = false;
+  # drivers.intel.enable = false;
+  vm.guest-services.enable = true;
 }

profiles/desktop/default.nix

@@ -2,9 +2,23 @@
   ...
 }:
 {
-  imports = [ ../../modules/options ];
+  imports = [
+    ../../modules/options
+  ];
 
   modules.hyprland = {
     enable = true;
+    terminal = "kitty";
+    launcher = "walker";
+    monitor = [
+      ",preferred,auto,auto"
+    ];
   };
+  modules.plasma.enable = false;
+  modules.displayManager.displayManager = "gdm";
+
+  modules.zsh.enable = true;
+  modules.shell.defaultShell = "zsh";
+
+  modules.pipewire.enable = true;
 }

profiles/vm/default.nix

@@ -1,21 +0,0 @@
-{
-  ...
-}:
-{
-  imports = [
-    ../../modules/drivers
-  ];
-
-  virtualisation.vmVariant = {
-    virtualisation = {
-      memorySize = 8192;
-      cores = 8;
-    };
-  };
-
-  # drivers.amdgpu.enable = false;
-  # drivers.nvidia.enable = false;
-  # drivers.nvidia-prime.enable = false;
-  # drivers.intel.enable = false;
-  vm.guest-services.enable = true;
-}