From 07d6d7fc166d613f9c60b28d0d64b7950ad2931b Mon Sep 17 00:00:00 2001
From: Joshua Yuen <joshuayuen99@gmail.com>
Date: Fri, 19 Jun 2026 19:01:24 -0400
Subject: [PATCH] Shift around configuration so that non-machine specific
 settings live under profiles instead of hosts

---
 hosts/installation-iso/default.nix | 16 +++-------------
 hosts/vm/default.nix               | 27 +++++++++++++--------------
 profiles/desktop/default.nix       | 16 +++++++++++++++-
 profiles/vm/default.nix            | 21 ---------------------
 4 files changed, 31 insertions(+), 49 deletions(-)
 delete mode 100644 profiles/vm/default.nix

diff --git a/hosts/installation-iso/default.nix b/hosts/installation-iso/default.nix
index ec5a949..c82a518 100644
--- a/hosts/installation-iso/default.nix
+++ b/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;
 }
diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix
index ff19aee..bb31c4f 100644
--- a/hosts/vm/default.nix
+++ b/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;
 }
diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix
index 816ea91..98d6003 100644
--- a/profiles/desktop/default.nix
+++ b/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;
 }
\ No newline at end of file
diff --git a/profiles/vm/default.nix b/profiles/vm/default.nix
deleted file mode 100644
index ed322f7..0000000
--- a/profiles/vm/default.nix
+++ /dev/null
@@ -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;
-}