diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix
index 554b220..ac6a6c8 100644
--- a/home/features/cli/default.nix
+++ b/home/features/cli/default.nix
@@ -27,12 +27,8 @@
     ntfy-sh # Push notifications to other devices
     ipinfo # IP geolocation
     ranger # TUI file manager
-    protonup-rs
     trickle # cli network limiter
     du-dust # disk usage visualizer
-    rofi-audio-switcher
-
-    mpv # Video player
 
     nvd # Differ
     nix-output-monitor
diff --git a/home/features/desktop/common/default.nix b/home/features/desktop/common/default.nix
index 8c4e596..a0c1b31 100644
--- a/home/features/desktop/common/default.nix
+++ b/home/features/desktop/common/default.nix
@@ -18,5 +18,8 @@
     signal-desktop # secure messenger
     webcord-vencord # more "privacy friendly" discord client
     anki
+
+    rofi-audio-switcher # Script to switch default audio sinks/sources
+    mpv # Video player
   ];
 }
diff --git a/home/features/games/default.nix b/home/features/games/default.nix
index c446968..a669bbe 100644
--- a/home/features/games/default.nix
+++ b/home/features/games/default.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
+    protonup-rs
     heroic
     (lutris.override {
       extraLibraries = pkgs: [
diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
index 1981e29..92d802f 100644
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@@ -27,8 +27,6 @@
     };
   };
 
-  # Fix for qt6 plugins
-  environment.profileRelativeSessionVariables = {
-    QT_PLUGIN_PATH = ["/lib/qt-6/plugins"];
-  };
+  # Enable networking
+  networking.networkmanager.enable = true;
 }
diff --git a/hosts/common/optional/desktop/global.nix b/hosts/common/optional/desktop/global.nix
index e45c40c..764d7ae 100644
--- a/hosts/common/optional/desktop/global.nix
+++ b/hosts/common/optional/desktop/global.nix
@@ -6,12 +6,14 @@
 }: {
   imports = [./pipewire.nix ../printing.nix ./flatpak.nix ./xremap.nix];
 
-  # Enable networking
-  networking.networkmanager.enable = true;
-
   # Enable for GTK
   programs.dconf.enable = true;
 
+  # Fix for qt6 plugins
+  environment.profileRelativeSessionVariables = {
+    QT_PLUGIN_PATH = ["/lib/qt-6/plugins"];
+  };
+
   services.xserver = {
     displayManager.sddm.enable = true;
   };