From 0e8a1e954481b0458fc546a135753db358d214e1 Mon Sep 17 00:00:00 2001 From: isabel Date: Wed, 3 Jul 2024 10:24:54 +0100 Subject: [PATCH] fix(home-manager/gtk): support all tweaks --- modules/home-manager/gtk.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/home-manager/gtk.nix b/modules/home-manager/gtk.nix index 2f02c9b4..d026b30d 100644 --- a/modules/home-manager/gtk.nix +++ b/modules/home-manager/gtk.nix @@ -42,9 +42,10 @@ in "black" "rimless" "normal" + "float" ] ); - default = [ "normal" ]; + default = [ ]; description = "Catppuccin tweaks for gtk"; }; @@ -121,10 +122,12 @@ in (mkIf enable { gtk.theme = let - gtkTweaks = concatStringsSep "," cfg.tweaks; + gtkTweaks = "+" + concatStringsSep "," cfg.tweaks; in { - name = "catppuccin-${cfg.flavor}-${cfg.accent}-${cfg.size}+${gtkTweaks}"; + name = + "catppuccin-${cfg.flavor}-${cfg.accent}-${cfg.size}" + + lib.optionalString (cfg.tweaks != [ ]) gtkTweaks; package = pkgs.catppuccin-gtk.override { inherit (cfg) size tweaks; accents = [ cfg.accent ];