fix(home-manager/gtk): support all tweaks

catppuccin · Jul 3, 2024 · ee65d39 · ee65d39
1 parent 9345073
commit ee65d39
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/modules/home-manager/gtk.nix b/modules/home-manager/gtk.nix
@@ -6,6 +6,7 @@
 }:
 let
   inherit (lib)
+    concatStrings
     concatStringsSep
     ctp
     mkIf
@@ -42,9 +43,10 @@ in
             "black"
             "rimless"
             "normal"
+            "float"
           ]
         );
-        default = [ "normal" ];
+        default = [ ];
         description = "Catppuccin tweaks for gtk";
       };
 
@@ -121,10 +123,17 @@ in
     (mkIf enable {
       gtk.theme =
         let
-          gtkTweaks = concatStringsSep "," cfg.tweaks;
+          gtkTweaks =
+            if cfg.tweaks == [ ] then
+              ""
+            else
+              (concatStrings [
+                "+"
+                (concatStringsSep "," cfg.tweaks)
+              ]);
         in
         {
-          name = "catppuccin-${cfg.flavor}-${cfg.accent}-${cfg.size}+${gtkTweaks}";
+          name = "catppuccin-${cfg.flavor}-${cfg.accent}-${cfg.size}${gtkTweaks}";
           package = pkgs.catppuccin-gtk.override {
             inherit (cfg) size tweaks;
             accents = [ cfg.accent ];