From e6037d27d3e9041d4e576c6d797cf357349e3aec Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Wed, 5 Feb 2025 17:42:08 +0530
Subject: [PATCH] fix: Linux packages were being ignored

---
 home/linux/default.nix          |  1 +
 home/linux/gtk.nix              |  6 +++++-
 linux.nix => home/linux/gui.nix | 14 +-------------
 3 files changed, 7 insertions(+), 14 deletions(-)
 rename linux.nix => home/linux/gui.nix (77%)

diff --git a/home/linux/default.nix b/home/linux/default.nix
index 80022071..95c26b31 100644
--- a/home/linux/default.nix
+++ b/home/linux/default.nix
@@ -12,6 +12,7 @@
       ./ironbar
       ./foot.nix
       ./mpd.nix
+      ./gui.nix
     ]);
 
   services.kdeconnect.enable = device.hasGui;
diff --git a/home/linux/gtk.nix b/home/linux/gtk.nix
index e4efb74d..df280b07 100644
--- a/home/linux/gtk.nix
+++ b/home/linux/gtk.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   gtk = {
-    enable = device.hasGui;
+    enable = true;
     theme = {
       name = "catppuccin-mocha-mauve-standard+normal";
       package = pkgs.adwaita-icon-theme;
@@ -32,4 +32,8 @@
     gtk3.extraConfig = {gtk-application-prefer-dark-theme = 1;};
     gtk4.extraConfig = {gtk-application-prefer-dark-theme = 1;};
   };
+  home.packages = [
+    pkgs.catppuccinThemes.gtk
+    pkgs.catppuccinThemes.papirus-folders
+  ];
 }
diff --git a/linux.nix b/home/linux/gui.nix
similarity index 77%
rename from linux.nix
rename to home/linux/gui.nix
index 712f93d5..c090ee1d 100644
--- a/linux.nix
+++ b/home/linux/gui.nix
@@ -20,23 +20,13 @@ lib.attrsets.optionalAttrs device.hasGui {
       WantedBy = ["graphical-session.target"];
     };
   };
-  imports = [
-    ./kitty.nix
-    ./firefox.nix
-    ./ghostty.nix
-    ./cursor.nix
-    ./vscodium.nix
-    ./wezterm.nix
-  ];
 
   home.packages = with pkgs;
     []
-    ++ lib.optionals pkgs.stdenv.isLinux [
+    ++ lib.optionals device.hasGui [
       discord
       (mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};})
       abaddon
-      catppuccinThemes.gtk
-      catppuccinThemes.papirus-folders
       ferdium
       gparted
       jdk
@@ -55,7 +45,5 @@ lib.attrsets.optionalAttrs device.hasGui {
       via
       wl-clipboard
       zed-editor
-    ]
-    ++ lib.optionals pkgs.stdenv.isDarwin [
     ];
 }