diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix
index ff99776..7f72133 100644
--- a/hosts/desktop1/configuration.nix
+++ b/hosts/desktop1/configuration.nix
@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, ... }:
+{ inputs, config, ... }:
 
 {
   imports = [
@@ -81,8 +81,6 @@
     virt.enable = true;
     hyprland.enable = true;
     kde.enable = true;
-    gui-utilities.enable = true;
-    mouse.enable = true;
     docker.enable = true;
     steam.enable = true;
     office.enable = true;
@@ -108,35 +106,6 @@
       };
     };
   };
-  environment.systemPackages = with pkgs; [
-      wireshark
-      librewolf
-      prismlauncher
-      obsidian
-      komikku
-      inkscape
-      blender
-      aegisub
-      kdePackages.kdenlive
-      freecad-wayland
-      fritzing
-      element-desktop
-      thunderbird
-      kicad
-      ghidra
-      calibre
-      arduino-ide
-      arduino-cli
-      qbittorrent
-      gdb
-      chromium
-      rpi-imager
-  ];
-
-  programs = {
-    firefox.enable = true;
-    wireshark.enable = true;
-  };
 
   home-manager = {
     extraSpecialArgs = {
diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix
index b18e9ec..ce76c67 100644
--- a/modules/nix/groups/desktop.nix
+++ b/modules/nix/groups/desktop.nix
@@ -21,11 +21,37 @@ in
       audio.enable = true;
       sddm.enable = true;
       wireguard.enable = true;
+      gui-utilities.enable = true;
+      mouse.enable = true;
       tor.enable = true;
     };
+    programs.firefox.enable = true;
+    programs.wireshark.enable = true;
     environment.systemPackages = with pkgs; [
+      wireshark
+      librewolf
+      prismlauncher
+      obsidian
+      komikku
+      inkscape
+      blender
+      aegisub
+      kdePackages.kdenlive
+      freecad-wayland
+      fritzing
+      element-desktop
+      thunderbird
+      kicad
+      ghidra
+      calibre
+      arduino-ide
+      arduino-cli
       firejail
+      qbittorrent
       android-tools
+      gdb
+      chromium
+      rpi-imager
     ];
   };
 }