From b3f51faeb15b8be3367cd5849e38105999455cdd Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Wed, 19 Mar 2025 22:37:46 -0500
Subject: [PATCH] theming | upstream changes

---
 home/common/catppuccin.nix | 124 +++++++++++++++++--------------------
 hosts/themes.nix           |   8 +--
 2 files changed, 61 insertions(+), 71 deletions(-)

diff --git a/home/common/catppuccin.nix b/home/common/catppuccin.nix
index fa15f19..0cc77f5 100644
--- a/home/common/catppuccin.nix
+++ b/home/common/catppuccin.nix
@@ -1,14 +1,34 @@
 { pkgs, config, ... }: {
+  gtk = { };
+  qt = { style = { }; };
   catppuccin = {
     enable = true;
     flavor = "mocha";
-    # pointerCursor = {
-    #   enable = true;
-    #   flavor = "mocha";
-    # };
-  };
-  gtk = {
-    catppuccin = {
+    alacritty = {
+      enable = true;
+      flavor = "mocha";
+    };
+    btop = {
+      enable = true;
+      flavor = "mocha";
+    };
+    foot = {
+      enable = true;
+      flavor = "mocha";
+    };
+    fuzzel = {
+      enable = true;
+      flavor = "mocha";
+    };
+    fzf = {
+      enable = true;
+      flavor = "mocha";
+    };
+    gitui = {
+      enable = true;
+      flavor = "mocha";
+    };
+    gtk = {
       enable = true;
       flavor = "mocha";
       icon = {
@@ -17,75 +37,45 @@
       };
       size = "compact";
     };
-  };
-  qt = {
-    style = {
-      catppuccin = {
-        enable = true;
-        flavor = "mocha";
-      };
-    };
-  };
-  catppuccin = {
-    alacritty = {
-        enable = true;
-        flavor = "mocha";
-    };
-    btop = {
-        enable = true;
-        flavor = "mocha";
-    };
-    foot = {
-        enable = true;
-        flavor = "mocha";
-    };
-    fuzzel = {
-        enable = true;
-        flavor = "mocha";
-    };
-    fzf = {
-        enable = true;
-        flavor = "mocha";
-    };
-    gitui = {
-        enable = true;
-        flavor = "mocha";
-    };
     imv = {
-        enable = true;
-        flavor = "mocha";
+      enable = true;
+      flavor = "mocha";
     };
     kitty = {
-        enable = true;
-        flavor = "mocha";
+      enable = true;
+      flavor = "mocha";
+    };
+    kvantum = {
+      enable = true;
+      flavor = "mocha";
     };
     lazygit = {
-        enable = true;
-        flavor = "mocha";
+      enable = true;
+      flavor = "mocha";
+    };
+    newsboat = {
+      enable = true;
+      flavor = "mocha";
+    };
+    swaylock = {
+      enable = true;
+      flavor = "mocha";
+    };
+    tmux = {
+      enable = true;
+      flavor = "mocha";
+    };
+    waybar = {
+      enable = true;
+      flavor = "mocha";
+    };
+    zathura = {
+      enable = true;
+      flavor = "mocha";
     };
     # neovim = {
     #     enable = true;
     #     flavor = "mocha";
     # };
-    newsboat = {
-        enable = true;
-        flavor = "mocha";
-    };
-    swaylock = {
-        enable = true;
-        flavor = "mocha";
-    };
-    tmux = {
-        enable = true;
-        flavor = "mocha";
-    };
-    waybar = {
-        enable = true;
-        flavor = "mocha";
-    };
-    zathura = {
-        enable = true;
-        flavor = "mocha";
-    };
   };
 }
diff --git a/hosts/themes.nix b/hosts/themes.nix
index 1505515..855677f 100644
--- a/hosts/themes.nix
+++ b/hosts/themes.nix
@@ -2,9 +2,9 @@
   catppuccin = {
     enable = true;
     flavor = "mocha";
-  };
-  console.catppuccin = {
-    enable = true;
-    flavor = "mocha";
+    tty = {
+      enable = true;
+      flavor = "mocha";
+    };
   };
 }