tons of theme tweaks, +gruvbox

modules/desktop/themes/catppuccin/default.nix

@@ -4,14 +4,16 @@ with lib;
 let
   cfg = config.modules.desktop.themes;
   accent = "pink";
+  accentBase = "base17";
   variant = "mocha";
 
   dark = variant != "latte";
-  colorScheme = inputs.nix-colors.colorSchemes.${"catppuccin-${variant}"};
+  darkString = if dark then "dark" else "light";
+  scheme = "${inputs.tt-schemes}/base24/catppuccin-${variant}.yaml";
   pascalCase = s: (toUpper (substring 0 1 s)) + (toLower (substring 1 (stringLength s) s));
 in {
   config = mkIf (cfg.active == "catppuccin") {
-    colorScheme = colorScheme;
+    scheme = scheme;
 
     modules.desktop.themes = {
       dark = dark;
@@ -35,14 +37,13 @@ in {
       };
 
       iconTheme = {
-        name = "WhiteSur-${if dark then "dark" else "light"}";
+        name = "WhiteSur-${darkString}";
         package = pkgs.whitesur-icon-theme;
       };
 
       cursorTheme = {
-        name = "graphite-${if dark then "dark" else "light"}";
-        package = pkgs.graphite-cursors;
-        size = 24;
+        name = "macOS";
+        package = pkgs.apple-cursor;
       };
 
       editor = {
@@ -68,36 +69,24 @@ in {
         };
       };
 
-      niri = with colorScheme.palette; {
-        # TODO: make more dynamic
-        # catppuccin pink
-        accent = "#f5c2e7";
-        inactive = "#${base02}";
-        # catppuccin crust
-        shadow = "#11111b";
-        # catppuccin crust
-        background = "#11111b";
+      niri = let
+        colors = config.scheme.withHashtag;
+      in with colors; {
+        accent = colors.${accentBase};
+        inactive = "${base02}";
+        shadow = "${base11}";
+        background = if dark then "${base11}" else "${base05}";
       };
 
-      waybar = builtins.concatStringsSep "\n" [
-        "@import \"${inputs.waybar-catppuccin}/themes/${variant}.css\";"
-        "@define-color accent @${accent};"
-        (lib.readFile ./waybar.css)
-      ];
+      waybarTop = "@define-color accent @${accentBase};";
 
-      wob = with colorScheme.palette; {
+      wob = with config.scheme; {
         borderColor = "${base04}FF";
         backgroundColor = "${base01}CC";
         barColor = "${base05}FF";
       };
 
-      rofi = builtins.concatStringsSep "\n" [
-        "@theme \"${inputs.rofi-catppuccin}/themes/catppuccin-${variant}.rasi\""
-        "* { accent: @${accent}; }"
-        (lib.readFile ./rofi.rasi)
-      ];
-
-      fuzzel = "${inputs.fuzzel-catppuccin}/themes/catppuccin-${variant}/${accent}.ini";
+      rofiTop = "* { accent: @${accentBase}; }";
 
       wezterm = ''
         config.color_scheme = 'Catppuccin ${pascalCase variant}'