Refactor directory structure

hosts/desktop/default.nix

@@ -3,21 +3,20 @@
 {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
-#    ../../modules/system/desktop/hyprland.nix
-     ../../modules/system/desktop/plasma.nix
-#    ../../modules/system/desktop/noisetorch.nix
-    ../../modules/system/desktop/nvidia.nix
-#    ../../modules/system/programs/syncthing.nix
-#    ../../modules/system/programs/thunar.nix
-#    ../../modules/system/programs/steam.nix
-#    ../../modules/system/utils/common.nix
-#    ../../modules/system/utils/docker.nix
-#    ../../modules/system/utils/firewall.nix
-    #../../modules/system/utils/fprint.nix
-    ../../modules/system/utils/garbage-collection.nix
-    ../../modules/system/utils/locale.nix
-#    ../../modules/system/utils/printing.nix
-    ../../modules/system/programs/sunshine.nix
+
+    # GUI
+    ../../modules/system/gui/plasma.nix
+    ../../modules/system/gui/steam.nix
+    ../../modules/system/gui/sunshine.nix
+
+    # CLI
+    ../../modules/system/cli/common.nix
+
+    # Hardware
+    ../../modules/system/hardware/firewall.nix
+    ../../modules/system/hardware/garbage-collection.nix
+    ../../modules/system/hardware/locale.nix
+    ../../modules/system/hardware/nvidia.nix
   ];
 
   nix.settings = {

hosts/desktop/home.nix

@@ -2,18 +2,11 @@
 
 {
   imports = [
-#    ../../modules/home/desktop/hyprland
-#    ../../modules/home/programs/barrier.nix
-#    ../../modules/home/programs/common.nix
-#    ../../modules/home/programs/develop.nix
-     ../../modules/home/programs/firefox.nix
-#    ../../modules/home/programs/modrinth.nix
-#    ../../modules/home/programs/neovim
-#    ../../modules/home/programs/git.nix
-#    ../../modules/home/programs/ssh.nix
-#    ../../modules/home/theme
-#    ../../modules/home/theme/blueish.nix
-#    ../../modules/home/utils/fonts.nix
+    # GUI
+    ../../modules/home/gui/common
+
+    # CLI
+    ../../modules/home/cli/common
   ];
 
   home = {
@@ -22,22 +15,8 @@
   };
 
   home.packages = with pkgs; [
-   # Desktop Applications
- #   kdenlive
- #   gthumb
-     unstable.bitwarden
      unstable.prismlauncher
- #   blender
-
-#    unstable.surrealist
   ];
 
-#  home.sessionVariables = {
-#    LIBVA_DRIVER_NAME = "nvidia";
-#    XDG_SESSION_TYPE = "wayland";
-#    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-#    WLR_NO_HARDWARE_CURSORS = 1;
-#  };
-
   home.stateVersion = "24.05";
 }