From 2fb16f2d6ffb2759f14fbcbd1f1e242f5fb662c7 Mon Sep 17 00:00:00 2001
From: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>
Date: Sun, 23 Jun 2024 01:05:49 +0000
Subject: [PATCH] fix(home-manager): use correct gtk theme name (#239)

- Theme name is all lowercase now
- Change order from `flavor-size-accent-gtkTheme` to
`flavor-accent-size+gtkTweaks`
---
 modules/home-manager/gtk.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/home-manager/gtk.nix b/modules/home-manager/gtk.nix
index 7cf96fe..ed5c526 100644
--- a/modules/home-manager/gtk.nix
+++ b/modules/home-manager/gtk.nix
@@ -72,15 +72,10 @@ 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";
+          gtkTweaks = lib.concatStringsSep "," cfg.tweaks;
         in
         {
-          name = "Catppuccin-${flavorUpper}-${sizeUpper}-${accentUpper}-${gtkTheme}";
+          name = "catppuccin-${cfg.flavor}-${cfg.accent}-${cfg.size}+${gtkTweaks}";
           package = pkgs.catppuccin-gtk.override {
             inherit (cfg) size tweaks;
             accents = [ cfg.accent ];