Refactor directory structure

hosts/laptop/default.nix

@@ -1,20 +1,26 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ # Include the results of the hardware scan.
+  imports = [
     ./hardware-configuration.nix
-    ../../modules/system/desktop/amd.nix
-    ../../modules/system/desktop/hyprland.nix
-    ../../modules/system/desktop/bluetooth.nix
-    ../../modules/system/programs/steam.nix
-    ../../modules/system/programs/syncthing.nix
-    ../../modules/system/programs/thunar.nix
-    ../../modules/system/utils/common.nix
-    ../../modules/system/utils/docker.nix
-#    ../../modules/system/utils/fprint.nix
-    ../../modules/system/utils/garbage-collection.nix
-    ../../modules/system/utils/locale.nix
-    ../../modules/system/utils/printing.nix
+
+    # GUI
+    ../../modules/system/gui/hyprland.nix
+    ../../modules/system/gui/steam.nix
+    ../../modules/system/gui/thunar.nix
+    
+    # CLI
+    ../../modules/system/cli/common.nix
+    ../../modules/system/cli/docker.nix
+
+    # Hardware
+    ../../modules/system/hardware/amd.nix
+    ../../modules/system/hardware/bluetooth.nix
+    ../../modules/system/hardware/firewall.nix
+    ../../modules/system/hardware/garbage-collection.nix
+    ../../modules/system/hardware/laptop.nix
+    ../../modules/system/hardware/locale.nix
+    ../../modules/system/hardware/printing.nix
   ];
 
   nix.settings = {
@@ -41,8 +47,6 @@
     extraGroups = [ "networkmanager" "wheel" "dialout" ];
   };
 
-  services.printing.enable = true;
-
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   system.stateVersion = "24.05";