fix(gtk): removed catppuccin.gtk option

Wittano · Jun 23, 2024 · 1797047 · 1797047
1 parent 5df6537
commit 1797047
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/desktop/submodules/gtk.nix b/modules/desktop/submodules/gtk.nix
@@ -21,6 +21,13 @@ let
     "gtk-modules" = "gail:atk-bridge";
     "gtk-application-prefer-dark-theme" = true;
   };
+  catppuccinTheme = pkgs.catppuccin-gtk.override {
+    accents = [ "blue" ];
+    size = "standard";
+    tweaks = [ "normal" ];
+    variant = "frappe";
+  };
+  catppuccinThemeName = "Catppuccin-Frappe-Standard-Blue-Dark";
   cursorTheme = {
     name = "Bibata-Modern-Ice";
     package = pkgs.bibata-cursors;
@@ -49,11 +56,6 @@ in
         inherit cursorTheme;
 
         enable = true;
-        catppuccin = {
-          enable = true;
-          flavor = "frappe";
-          accent = "blue";
-        };
         font = {
           name = "JetBrains Mono NL";
           size = 12;
@@ -63,6 +65,10 @@ in
           name = "Colloid-${colloidSchemaVariant}-dark";
           package = colloidIconTheme;
         };
+        theme = {
+          name = catppuccinThemeName;
+          package = catppuccinTheme;
+        };
         gtk3 = {
           extraConfig = gtkSettings;
           bookmarks = [
@@ -79,6 +85,12 @@ in
         };
         gtk4.extraConfig = gtkSettings;
       };
+
+      xdg.configFile = {
+        "gtk-4.0/assets".source = "${catppuccinTheme}/share/themes/${catppuccinThemeName}/gtk-4.0/assets";
+        "gtk-4.0/gtk.css".source = "${catppuccinTheme}/share/themes/${catppuccinThemeName}/gtk-4.0/gtk.css";
+        "gtk-4.0/gtk-dark.css".source = "${catppuccinTheme}/share/themes/${catppuccinThemeName}/gtk-4.0/gtk-dark.css";
+      };
     };
   };
 }