GTK GTK GTK

Droidnix/generated/system/core/theme.nix

@@ -1,30 +1,57 @@
-{ pkgs, ...}:
-{
-  environment.systemPackages = with pkgs; [
-        magnetic-catppuccin-gtk
-  ];
+{ pkgs, ... }:
 
+{
   gtk = {
     enable = true;
-        theme = {
-      name = "Catppuccin-Mocha-Standard-Blue-Dark";
-      package = pkgs.magnetic-catppuccin-gtk;
-    };
-        iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
-    };
-    gtk4.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
+    colorScheme = "dark";
+    theme = {
+      name = "Catppuccin-GTK-Grey-Dark-Compact";
+      package = (pkgs.magnetic-catppuccin-gtk.override {
+        accent = [ "grey" ];
+        shade = "dark";
+        tweaks = [ "black" ];
+        size = "compact";
+      });
     };
+    iconTheme.name = "Papirus-Dark";
   };
 
-  catppuccin.enable = true;
-  catppuccin.flavor = "mocha";
-  catppuccin.accent = "blue";
-  catppuccin.gtk.icon.enable = true;
-  catppuccin.cursors.enable = true;
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+    accent = "blue";
+    gtk = {
+      icon.enable = true;
+    };
+    cursors.enable = true;
+  };
+}
+
+{ pkgs, ... }:
+
+{
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    theme = {
+      name = "Catppuccin-GTK-Grey-Dark-Compact";
+      package = (pkgs.magnetic-catppuccin-gtk.override {
+        accent = [ "grey" ];
+        shade = "dark";
+        tweaks = [ "black" ];
+        size = "compact";
+      });
+    };
+    iconTheme.name = "Papirus-Dark";
+  };
+
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+    accent = "blue";
+    gtk = {
+      icon.enable = true;
+    };
+    cursors.enable = true;
+  };
 }

Droidnix/generated/system/core/top.nix

@@ -7,6 +7,5 @@
     ./login-tuigreeter.nix
     #./login-lightdm.nix
     ./fonts.nix
-    ./gtk.nix
   ];
 }