core: move harware and software to desktop

46 files changed, 2 insertions, 2 deletions

diff --git a/modules/core/default.nix b/modules/core/default.nix
index ef9131a..f44e8ff 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -1,9 +1,7 @@
 {
   imports = [
-    ./hardware
     ./networking
     ./nix
     ./security
-    ./software
   ];
 }
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index e4fe30d..e9e2a80 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,7 +1,9 @@
 { config, ... }:
 {
   imports = [
+    ./hardware
     ./networking
+    ./software
     ./variables
     ./virtualisation
   ];
diff --git a/modules/core/hardware/bluetooth.nix b/modules/desktop/hardware/bluetooth.nix
index 9737504..9737504 100644
--- a/modules/core/hardware/bluetooth.nix
+++ b/modules/desktop/hardware/bluetooth.nix
diff --git a/modules/core/hardware/cpu.nix b/modules/desktop/hardware/cpu.nix
index 1ac3a27..1ac3a27 100644
--- a/modules/core/hardware/cpu.nix
+++ b/modules/desktop/hardware/cpu.nix
diff --git a/modules/core/hardware/default.nix b/modules/desktop/hardware/default.nix
index 167e7c7..167e7c7 100644
--- a/modules/core/hardware/default.nix
+++ b/modules/desktop/hardware/default.nix
diff --git a/modules/core/hardware/tpm.nix b/modules/desktop/hardware/tpm.nix
index b84551e..b84551e 100644
--- a/modules/core/hardware/tpm.nix
+++ b/modules/desktop/hardware/tpm.nix
diff --git a/modules/core/hardware/usb.nix b/modules/desktop/hardware/usb.nix
index f697761..f697761 100644
--- a/modules/core/hardware/usb.nix
+++ b/modules/desktop/hardware/usb.nix
diff --git a/modules/core/hardware/yubikey.nix b/modules/desktop/hardware/yubikey.nix
index 6bd4a5c..6bd4a5c 100644
--- a/modules/core/hardware/yubikey.nix
+++ b/modules/desktop/hardware/yubikey.nix
diff --git a/modules/core/software/aagl.nix b/modules/desktop/software/aagl.nix
index b164edb..b164edb 100644
--- a/modules/core/software/aagl.nix
+++ b/modules/desktop/software/aagl.nix
diff --git a/modules/core/software/access/default.nix b/modules/desktop/software/access/default.nix
index 7db7629..7db7629 100644
--- a/modules/core/software/access/default.nix
+++ b/modules/desktop/software/access/default.nix
diff --git a/modules/core/software/access/gnupg.nix b/modules/desktop/software/access/gnupg.nix
index e60da30..e60da30 100644
--- a/modules/core/software/access/gnupg.nix
+++ b/modules/desktop/software/access/gnupg.nix
diff --git a/modules/core/software/access/mosh.nix b/modules/desktop/software/access/mosh.nix
index c9af5bf..c9af5bf 100644
--- a/modules/core/software/access/mosh.nix
+++ b/modules/desktop/software/access/mosh.nix
diff --git a/modules/core/software/access/ssh.nix b/modules/desktop/software/access/ssh.nix
index 665532f..665532f 100644
--- a/modules/core/software/access/ssh.nix
+++ b/modules/desktop/software/access/ssh.nix
diff --git a/modules/core/software/boot/default.nix b/modules/desktop/software/boot/default.nix
index 9fe77a0..9fe77a0 100644
--- a/modules/core/software/boot/default.nix
+++ b/modules/desktop/software/boot/default.nix
diff --git a/modules/core/software/boot/grub.nix b/modules/desktop/software/boot/grub.nix
index 3932713..3932713 100644
--- a/modules/core/software/boot/grub.nix
+++ b/modules/desktop/software/boot/grub.nix
diff --git a/modules/core/software/boot/systemd-boot.nix b/modules/desktop/software/boot/systemd-boot.nix
index b51a896..b51a896 100644
--- a/modules/core/software/boot/systemd-boot.nix
+++ b/modules/desktop/software/boot/systemd-boot.nix
diff --git a/modules/core/software/default.nix b/modules/desktop/software/default.nix
index f0de576..f0de576 100644
--- a/modules/core/software/default.nix
+++ b/modules/desktop/software/default.nix
diff --git a/modules/core/software/desktop/default.nix b/modules/desktop/software/desktop/default.nix
index bd2c811..bd2c811 100644
--- a/modules/core/software/desktop/default.nix
+++ b/modules/desktop/software/desktop/default.nix
diff --git a/modules/core/software/desktop/gtk.nix b/modules/desktop/software/desktop/gtk.nix
index 4357e75..4357e75 100644
--- a/modules/core/software/desktop/gtk.nix
+++ b/modules/desktop/software/desktop/gtk.nix
diff --git a/modules/core/software/desktop/xdg-portal.nix b/modules/desktop/software/desktop/xdg-portal.nix
index 72bcb97..72bcb97 100644
--- a/modules/core/software/desktop/xdg-portal.nix
+++ b/modules/desktop/software/desktop/xdg-portal.nix
diff --git a/modules/core/software/encryption.nix b/modules/desktop/software/encryption.nix
index 53a24bb..53a24bb 100644
--- a/modules/core/software/encryption.nix
+++ b/modules/desktop/software/encryption.nix
diff --git a/modules/core/software/gaming.nix b/modules/desktop/software/gaming.nix
index 675aee9..675aee9 100644
--- a/modules/core/software/gaming.nix
+++ b/modules/desktop/software/gaming.nix
diff --git a/modules/core/software/input.nix b/modules/desktop/software/input.nix
index 2d9f651..2d9f651 100644
--- a/modules/core/software/input.nix
+++ b/modules/desktop/software/input.nix
diff --git a/modules/core/software/locale.nix b/modules/desktop/software/locale.nix
index 8ebd49b..8ebd49b 100644
--- a/modules/core/software/locale.nix
+++ b/modules/desktop/software/locale.nix
diff --git a/modules/core/software/multimedia/audio/default.nix b/modules/desktop/software/multimedia/audio/default.nix
index f4e7f0a..f4e7f0a 100644
--- a/modules/core/software/multimedia/audio/default.nix
+++ b/modules/desktop/software/multimedia/audio/default.nix
diff --git a/modules/core/software/multimedia/audio/pipewire.nix b/modules/desktop/software/multimedia/audio/pipewire.nix
index 2824176..2824176 100644
--- a/modules/core/software/multimedia/audio/pipewire.nix
+++ b/modules/desktop/software/multimedia/audio/pipewire.nix
diff --git a/modules/core/software/multimedia/audio/wireplumber.nix b/modules/desktop/software/multimedia/audio/wireplumber.nix
index 970396f..970396f 100644
--- a/modules/core/software/multimedia/audio/wireplumber.nix
+++ b/modules/desktop/software/multimedia/audio/wireplumber.nix
diff --git a/modules/core/software/multimedia/default.nix b/modules/desktop/software/multimedia/default.nix
index 7bf261a..7bf261a 100644
--- a/modules/core/software/multimedia/default.nix
+++ b/modules/desktop/software/multimedia/default.nix
diff --git a/modules/core/software/multimedia/video/default.nix b/modules/desktop/software/multimedia/video/default.nix
index 31cdfd5..31cdfd5 100644
--- a/modules/core/software/multimedia/video/default.nix
+++ b/modules/desktop/software/multimedia/video/default.nix
diff --git a/modules/core/software/multimedia/video/graphics.nix b/modules/desktop/software/multimedia/video/graphics.nix
index 13da295..13da295 100644
--- a/modules/core/software/multimedia/video/graphics.nix
+++ b/modules/desktop/software/multimedia/video/graphics.nix
diff --git a/modules/core/software/multimedia/video/libva.nix b/modules/desktop/software/multimedia/video/libva.nix
index d420495..d420495 100644
--- a/modules/core/software/multimedia/video/libva.nix
+++ b/modules/desktop/software/multimedia/video/libva.nix
diff --git a/modules/core/software/multimedia/video/nvidia.nix b/modules/desktop/software/multimedia/video/nvidia.nix
index c133bc2..c133bc2 100644
--- a/modules/core/software/multimedia/video/nvidia.nix
+++ b/modules/desktop/software/multimedia/video/nvidia.nix
diff --git a/modules/core/software/multimedia/video/vulkan.nix b/modules/desktop/software/multimedia/video/vulkan.nix
index be37e0e..be37e0e 100644
--- a/modules/core/software/multimedia/video/vulkan.nix
+++ b/modules/desktop/software/multimedia/video/vulkan.nix
diff --git a/modules/core/software/programs.nix b/modules/desktop/software/programs.nix
index a1025fb..a1025fb 100644
--- a/modules/core/software/programs.nix
+++ b/modules/desktop/software/programs.nix
diff --git a/modules/core/software/services/adb.nix b/modules/desktop/software/services/adb.nix
index d106ead..d106ead 100644
--- a/modules/core/software/services/adb.nix
+++ b/modules/desktop/software/services/adb.nix
diff --git a/modules/core/software/services/ananicy.nix b/modules/desktop/software/services/ananicy.nix
index bdc9bbd..bdc9bbd 100644
--- a/modules/core/software/services/ananicy.nix
+++ b/modules/desktop/software/services/ananicy.nix
diff --git a/modules/core/software/services/dbus.nix b/modules/desktop/software/services/dbus.nix
index 8b25bf9..8b25bf9 100644
--- a/modules/core/software/services/dbus.nix
+++ b/modules/desktop/software/services/dbus.nix
diff --git a/modules/core/software/services/default.nix b/modules/desktop/software/services/default.nix
index 4b9ccf6..4b9ccf6 100644
--- a/modules/core/software/services/default.nix
+++ b/modules/desktop/software/services/default.nix
diff --git a/modules/core/software/services/libinput.nix b/modules/desktop/software/services/libinput.nix
index 643f814..643f814 100644
--- a/modules/core/software/services/libinput.nix
+++ b/modules/desktop/software/services/libinput.nix
diff --git a/modules/core/software/services/logrotate.nix b/modules/desktop/software/services/logrotate.nix
index 2dedf2e..2dedf2e 100644
--- a/modules/core/software/services/logrotate.nix
+++ b/modules/desktop/software/services/logrotate.nix
diff --git a/modules/core/software/services/ollama.nix b/modules/desktop/software/services/ollama.nix
index d737250..d737250 100644
--- a/modules/core/software/services/ollama.nix
+++ b/modules/desktop/software/services/ollama.nix
diff --git a/modules/core/software/services/printing.nix b/modules/desktop/software/services/printing.nix
index f7a38de..f7a38de 100644
--- a/modules/core/software/services/printing.nix
+++ b/modules/desktop/software/services/printing.nix
diff --git a/modules/core/software/services/xserver.nix b/modules/desktop/software/services/xserver.nix
index f1833a4..f1833a4 100644
--- a/modules/core/software/services/xserver.nix
+++ b/modules/desktop/software/services/xserver.nix
diff --git a/modules/core/software/shell.nix b/modules/desktop/software/shell.nix
index 0b3508f..0b3508f 100644
--- a/modules/core/software/shell.nix
+++ b/modules/desktop/software/shell.nix
diff --git a/modules/core/software/systemd.nix b/modules/desktop/software/systemd.nix
index c475d96..c475d96 100644
--- a/modules/core/software/systemd.nix
+++ b/modules/desktop/software/systemd.nix
diff --git a/modules/core/software/users.nix b/modules/desktop/software/users.nix
index ab3fe03..ab3fe03 100644
--- a/modules/core/software/users.nix
+++ b/modules/desktop/software/users.nix