feat: Remove gui-programs import and make imports normal

home/apps/default.nix

@@ -2,7 +2,8 @@
   lib,
   device,
   ...
-}: {
+}:
+lib.optionalAttrs device.hasGui {
   imports = [
     ./bambu-studio.nix
     ./cursor.nix

home/default.nix

@@ -6,19 +6,16 @@
   device,
   ...
 }: {
-  imports =
-    [
-      inputs.nix-index-database.hmModules.nix-index
-      ../modules
-      ./auth.nix
-      ./programs
-      ./scripts.nix
-      ./services
-    ]
-    ++ lib.optionals device.isLinux [./linux]
-    ++ lib.optionals device.hasGui [./gui-programs ./apps];
-
-  # ++ lib.optionals.device.isDarwin [./macos];
+  imports = [
+    inputs.nix-index-database.hmModules.nix-index
+    ../modules
+    ./apps
+    ./auth.nix
+    ./linux
+    ./programs
+    ./scripts.nix
+    ./services
+  ];
 
   xdg.enable = true;
   xdg.userDirs = {

home/linux/default.nix

@@ -1,19 +1,19 @@
 {
   lib,
   device,
+  pkgs,
   ...
-}: {
-  imports =
-    []
-    ++ (lib.optionals device.hasGui [
-      ./hyprland.nix
-      ./gtk.nix
-      ./anyrun.nix
-      ./ironbar
-      ./foot.nix
-      ./mpd.nix
-      ./gui.nix
-    ]);
+}:
+lib.optionalAttrs (pkgs.stdenv.isLinux && device.hasGui) {
+  imports = [
+    ./hyprland.nix
+    ./gtk.nix
+    ./anyrun.nix
+    ./ironbar
+    ./foot.nix
+    ./mpd.nix
+    ./gui.nix
+  ];
 
   services.kdeconnect.enable = device.hasGui;
   services.kdeconnect.indicator = device.hasGui;