diff --git a/modules/home-manager/gtk.nix b/modules/home-manager/gtk.nix index 7cf96fef..45d9066c 100644 --- a/modules/home-manager/gtk.nix +++ b/modules/home-manager/gtk.nix @@ -72,15 +72,15 @@ in gtk = { theme = let - flavorUpper = ctp.mkUpper cfg.flavor; - accentUpper = ctp.mkUpper cfg.accent; - sizeUpper = ctp.mkUpper cfg.size; - - # use the light gtk theme for latte - gtkTheme = if cfg.flavor == "latte" then "Light" else "Dark"; + tweaks = lib.concatStringsSep "+" ( + builtins.replaceStrings [ + "normal" + "default" + ] cfg.tweaks + ); in { - name = "Catppuccin-${flavorUpper}-${sizeUpper}-${accentUpper}-${gtkTheme}"; + name = "catppuccin-${cfg.flavor}-${cfg.accent}-${cfg.size}+${tweaks}"; package = pkgs.catppuccin-gtk.override { inherit (cfg) size tweaks; accents = [ cfg.accent ];