diff --git a/modules/home-manager/gtk.nix b/modules/home-manager/gtk.nix index 2f02c9b4..fb31b342 100644 --- 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 ];