diff --git a/users/richie/home.nix b/users/richie/home.nix
index e54b39e..9ac2351 100644
--- a/users/richie/home.nix
+++ b/users/richie/home.nix
@@ -1,10 +1,10 @@
+{ lib, machineConfig, ... }:
 {
   imports = [
     ./home/programs.nix
     ./home/sshconfig.nix
     ./home/cli
-    ./home/vscode
-  ];
+  ] ++ lib.optionals (!machineConfig.server) [ ./home/gui.nix ];
 
   nixpkgs.config.allowUnfree = true;
 
diff --git a/users/richie/home/gui.nix b/users/richie/home/gui.nix
new file mode 100644
index 0000000..dbb35f2
--- /dev/null
+++ b/users/richie/home/gui.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+{
+  imports = [ ./vscode ];
+
+  home.packages = with pkgs; [
+    beeper
+    candy-icons
+    cinnamon.nemo
+    cinnamon.nemo-fileroller
+    discord-canary
+    firefox
+    gimp
+    obs-studio
+    obsidian
+    sweet-nova
+  ];
+}
diff --git a/users/richie/home/programs.nix b/users/richie/home/programs.nix
index a2bff59..a26b261 100644
--- a/users/richie/home/programs.nix
+++ b/users/richie/home/programs.nix
@@ -24,17 +24,6 @@
     iperf3
     nmap
     wget
-    # GUI
-    beeper
-    candy-icons
-    cinnamon.nemo
-    cinnamon.nemo-fileroller
-    discord-canary
-    firefox
-    gimp
-    obs-studio
-    obsidian
-    sweet-nova
     # python
     python3
     ruff