From 11ade0d1924c4a27f9be2e3293bef3c98fbeea34 Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Wed, 26 Mar 2025 01:20:55 +0530
Subject: [PATCH] feat: Remove gui-programs import and make imports normal

---
 home/apps/default.nix  |  3 ++-
 home/default.nix       | 23 ++++++++++-------------
 home/linux/default.nix | 24 ++++++++++++------------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/home/apps/default.nix b/home/apps/default.nix
index 00f05791..ea3e21ae 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -2,7 +2,8 @@
   lib,
   device,
   ...
-}: {
+}:
+lib.optionalAttrs device.hasGui {
   imports = [
     ./bambu-studio.nix
     ./cursor.nix
diff --git a/home/default.nix b/home/default.nix
index 6f5fc834..38f0c5fb 100644
--- a/home/default.nix
+++ b/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 = {
diff --git a/home/linux/default.nix b/home/linux/default.nix
index b325975b..9f8c5cc7 100644
--- a/home/linux/default.nix
+++ b/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;