diff --git a/home/default.nix b/home/default.nix
index 7f266e71..77166839 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -11,12 +11,13 @@
       inputs.nix-index-database.hmModules.nix-index
       ../modules
       ./auth.nix
-      ./gui-programs
       ./programs
       ./scripts.nix
       ./services
     ]
-    ++ lib.optionals device.isLinux [./linux];
+    ++ lib.optionals device.isLinux [./linux]
+    ++ lib.optionals device.hasGui [./gui-programs];
+
   # ++ lib.optionals.device.isMac [./macos];
 
   xdg.enable = true;
diff --git a/home/gui-programs/default.nix b/home/gui-programs/default.nix
index 709da380..2dbd8891 100644
--- a/home/gui-programs/default.nix
+++ b/home/gui-programs/default.nix
@@ -3,15 +3,13 @@
   device,
   ...
 }: {
-  imports =
-    []
-    ++ (lib.optionals device.hasGui [
-      ./cursor.nix
-      ./firefox.nix
-      ./ghostty.nix
-      ./kitty.nix
-      ./vscode.nix
-      ./wezterm.nix
-      ./mpv.nix
-    ]);
+  imports = [
+    ./cursor.nix
+    ./firefox.nix
+    ./ghostty.nix
+    ./kitty.nix
+    ./vscode.nix
+    ./wezterm.nix
+    ./mpv.nix
+  ];
 }