From 4c2394d97105b19a1d60f396d2a04f9be51b5ebf Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Fri, 29 Aug 2025 06:46:32 -0500
Subject: [PATCH] home/common | catppuccin homemanager module settings vs in
 tmux.conf

---
 home/common/catppuccin.nix | 24 +++++++++++++++++++-----
 home/common/tmux.nix       | 18 +-----------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/home/common/catppuccin.nix b/home/common/catppuccin.nix
index da5d546..7fe121f 100644
--- a/home/common/catppuccin.nix
+++ b/home/common/catppuccin.nix
@@ -1,10 +1,10 @@
-{ ... }: {
-  gtk = { };
-  qt = { style = { }; };
+{...}: {
+  gtk = {};
+  qt = {style = {};};
   catppuccin = {
     enable = true;
     flavor = "mocha";
-    aerc = { enable = false; };
+    aerc = {enable = false;};
     alacritty = {
       enable = true;
       flavor = "mocha";
@@ -45,7 +45,7 @@
       enable = true;
       flavor = "mocha";
     };
-    mako = { enable = false; };
+    mako = {enable = false;};
     newsboat = {
       enable = true;
       flavor = "mocha";
@@ -57,6 +57,20 @@
     tmux = {
       enable = true;
       flavor = "mocha";
+      extraConfig = ''
+        set -g @catppuccin_date_time_text "%_m/%e %l:%M %p"
+        set -g @catppuccin_window_status_style "rounded"
+        set -g @catppuccin_window_default_text "#W"
+        set -g @catppuccin_window_text " #[italics]#{window_name}"
+        set -g @catppuccin_window_status "no"
+        set -g @catppuccin_window_default_fill "number"
+        set -g @catppuccin_window_number_position "left"
+        set -g  status-style "bg=terminal"
+        set -g  status-left  "#{E:@catppuccin_status_session}"
+        set -gF status-right "#{E:@catppuccin_status_cpu}"
+        set -ag status-right "#{E:@catppuccin_status_mem}"
+        set -ag status-right "#{E:@catppuccin_status_date_time}"
+      '';
     };
     waybar = {
       enable = true;
diff --git a/home/common/tmux.nix b/home/common/tmux.nix
index 7f7055c..8d1cc34 100644
--- a/home/common/tmux.nix
+++ b/home/common/tmux.nix
@@ -14,23 +14,7 @@
       pkgs.tmuxPlugins.battery
       pkgs.tmuxPlugins.cpu
       pkgs.tmuxPlugins.vim-tmux-navigator
-      {
-        plugin = pkgs.tmuxPlugins.catppuccin;
-        extraConfig = ''
-          set -g @catppuccin_date_time_text "%_m/%e %l:%M %p"
-          set -g @catppuccin_window_status_style "rounded"
-          set -g @catppuccin_window_default_text "#W"
-          set -g @catppuccin_window_text " #[italics]#{window_name}"
-          set -g @catppuccin_window_status "no"
-          set -g @catppuccin_window_default_fill "number"
-          set -g @catppuccin_window_number_position "left"
-          set -g  status-style "bg=terminal"
-          set -g  status-left  "#{E:@catppuccin_status_session}"
-          set -gF status-right "#{E:@catppuccin_status_cpu}"
-          set -ag status-right "#{E:@catppuccin_status_mem}"
-          set -ag status-right "#{E:@catppuccin_status_date_time}"
-        '';
-      }
+      # tmuxPlugins.catppuccin configured home/common/catppuccin.nix
     ];
     extraConfig = ''
       bind '~' split-window "exec btop"