From f935ee0a9ce98e63e2bbbc11f2ccd00a81aaf6b2 Mon Sep 17 00:00:00 2001
From: Steve Beaulac <steve@beaulac.me>
Date: Thu, 19 Mar 2026 08:32:07 -0400
Subject: [PATCH] fix(theme): catppuccin theme for neovim and tmux

---
 themes/catppuccin-latte/neovim.lua | 26 +++++----------
 themes/catppuccin-latte/tmux       | 53 ++++++++++++++++++++++++++++--
 themes/catppuccin/neovim.lua       | 15 +++++----
 themes/catppuccin/tmux             | 53 ++++++++++++++++++++++++++++--
 4 files changed, 118 insertions(+), 29 deletions(-)

diff --git a/themes/catppuccin-latte/neovim.lua b/themes/catppuccin-latte/neovim.lua
index 07a53cf..2001f47 100644
--- a/themes/catppuccin-latte/neovim.lua
+++ b/themes/catppuccin-latte/neovim.lua
@@ -1,19 +1,11 @@
 return {
-	{
-		"catppuccin/nvim",
-		name = "catppuccin",
-		priority = 1000,
-		config = function()
-			require("catppuccin").setup({
-				flavour = "latte", -- other options: "mocha", "frappe", "macchiato"
-			})
-			vim.cmd.colorscheme("catppuccin-latte")
-		end,
-	},
-	{
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "catppuccin-latte",
-		},
-	},
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        lazy = false,
+        priority = 1000,
+        config = function()
+            vim.cmd("colorscheme catppuccin-latte")
+        end,
+    },
 }
diff --git a/themes/catppuccin-latte/tmux b/themes/catppuccin-latte/tmux
index df36dd8..9c05bee 100644
--- a/themes/catppuccin-latte/tmux
+++ b/themes/catppuccin-latte/tmux
@@ -1,3 +1,50 @@
-set -g @plugin 'catppuccin/tmux#v2.1.3'
-set -g @catppuccin_flavor 'latte'
-set -g @catppuccin_window_status_style 'rounded'
+theme_bg0="#eff1f5"
+theme_bg0_soft="#e6e9ef"
+theme_bg3="#ccd0da"
+theme_fg0="#4c4f69"
+theme_fg1="#5c5f77"
+theme_red_dark="#d20f39"
+theme_red_light="#8839ef"
+theme_yellow_dark="#df8e1d"
+theme_yellow_light="#df8e1d"
+theme_gray="#9ca0b0"
+
+set -g @prefix_highlight_fg "${theme_bg0}"
+set -g @prefix_highlight_bg "${theme_yellow_light}"
+
+# Status bar settings
+set -g status-style "bg=${theme_bg0},fg=${theme_fg0}"
+set -g status "on"
+set -g status-bg "${theme_bg0}"
+set -g status-justify "left"
+set -g status-left-length "100"
+set -g status-right-length "100"
+
+# Messages
+set -g message-style "fg=${theme_yellow_light},bg=${theme_bg3},align=centre"
+set -g message-command-style "fg=${theme_yellow_light},bg=${theme_bg3},align=centre"
+
+# Panes
+set -g pane-border-style "fg=${theme_gray},bg=${theme_bg0}"
+set -g pane-active-border-style "fg=${theme_fg1},bg=${theme_bg0}"
+
+# Windows
+set -g window-status-activity-style "fg=${theme_fg0},bg=${theme_bg0},none"
+set -g window-status-separator ""
+set -g window-status-style "fg=${theme_fg0},bg=${theme_bg0},none"
+
+# Statusline - current window
+set -g window-status-current-format "#[fg=${theme_red_light},bg=${theme_bg0}] #I: #[fg=${theme_fg1},bg=${theme_bg0}](✓) #[fg=${theme_yellow_dark},bg=${theme_bg0}]#(echo '#{pane_current_path}' | rev | cut -d'/' -f-2 | rev) #[fg=${theme_fg1},bg=${theme_bg0}]"
+
+# Statusline - other windows
+set -g window-status-format "#[fg=${theme_red_dark},bg=${theme_bg0}] #I: #[fg=${theme_fg0},bg=${theme_bg0}]#W"
+
+# Statusline - right side
+set -g status-right "#[fg=${theme_fg1},bg=${theme_bg0},nobold,nounderscore,noitalics]%Y-%m-%d %H:%M #[fg=${theme_red_dark},bg=${theme_bg0},nobold,nounderscore,noitalics]#[fg=${theme_bg0},bg=${theme_red_dark},nobold,nounderscore,noitalics] #[fg=${theme_fg0},bg=${theme_bg0_soft}] #W #{?client_prefix,#[fg=${theme_red_dark}],#[fg=${theme_yellow_dark}]}#[bg=${theme_bg0_soft}]#{?client_prefix,#[bg=${theme_red_dark}],#[bg=${theme_yellow_dark}]}#[fg=${theme_bg0}] #[fg=${theme_fg0},bg=${theme_bg0_soft}] #S "
+
+# Statusline - left side (empty)
+set -g status-left ""
+
+# Modes
+set -g clock-mode-colour "${theme_yellow_light}"
+set -g mode-style "fg=${theme_red_light} bg=${theme_bg3} bold"
diff --git a/themes/catppuccin/neovim.lua b/themes/catppuccin/neovim.lua
index dbe34f5..c07a46c 100644
--- a/themes/catppuccin/neovim.lua
+++ b/themes/catppuccin/neovim.lua
@@ -1,8 +1,11 @@
 return {
-	{
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "catppuccin",
-		},
-	},
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        lazy = false,
+        priority = 1000,
+        config = function()
+            vim.cmd("colorscheme catppuccin")
+        end,
+    },
 }
diff --git a/themes/catppuccin/tmux b/themes/catppuccin/tmux
index 4fa1ac0..0fe6dcb 100644
--- a/themes/catppuccin/tmux
+++ b/themes/catppuccin/tmux
@@ -1,3 +1,50 @@
-set -g @plugin 'catppuccin/tmux#v2.1.3'
-set -g @catppuccin_flavor 'mocha'
-set -g @catppuccin_window_status_style 'rounded'
+theme_bg0="#1e1e2e"
+theme_bg0_soft="#313244"
+theme_bg3="#45475a"
+theme_fg0="#cdd6f4"
+theme_fg1="#bac2de"
+theme_red_dark="#f38ba8"
+theme_red_light="#cba6f7"
+theme_yellow_dark="#f9e2af"
+theme_yellow_light="#f9e2af"
+theme_gray="#585b70"
+
+set -g @prefix_highlight_fg "${theme_bg0}"
+set -g @prefix_highlight_bg "${theme_yellow_light}"
+
+# Status bar settings
+set -g status-style "bg=${theme_bg0},fg=${theme_fg0}"
+set -g status "on"
+set -g status-bg "${theme_bg0}"
+set -g status-justify "left"
+set -g status-left-length "100"
+set -g status-right-length "100"
+
+# Messages
+set -g message-style "fg=${theme_yellow_light},bg=${theme_bg3},align=centre"
+set -g message-command-style "fg=${theme_yellow_light},bg=${theme_bg3},align=centre"
+
+# Panes
+set -g pane-border-style "fg=${theme_gray},bg=${theme_bg0}"
+set -g pane-active-border-style "fg=${theme_fg1},bg=${theme_bg0}"
+
+# Windows
+set -g window-status-activity-style "fg=${theme_fg0},bg=${theme_bg0},none"
+set -g window-status-separator ""
+set -g window-status-style "fg=${theme_fg0},bg=${theme_bg0},none"
+
+# Statusline - current window
+set -g window-status-current-format "#[fg=${theme_red_light},bg=${theme_bg0}] #I: #[fg=${theme_fg1},bg=${theme_bg0}](✓) #[fg=${theme_yellow_dark},bg=${theme_bg0}]#(echo '#{pane_current_path}' | rev | cut -d'/' -f-2 | rev) #[fg=${theme_fg1},bg=${theme_bg0}]"
+
+# Statusline - other windows
+set -g window-status-format "#[fg=${theme_red_dark},bg=${theme_bg0}] #I: #[fg=${theme_fg0},bg=${theme_bg0}]#W"
+
+# Statusline - right side
+set -g status-right "#[fg=${theme_fg1},bg=${theme_bg0},nobold,nounderscore,noitalics]%Y-%m-%d %H:%M #[fg=${theme_red_dark},bg=${theme_bg0},nobold,nounderscore,noitalics]#[fg=${theme_bg0},bg=${theme_red_dark},nobold,nounderscore,noitalics] #[fg=${theme_fg0},bg=${theme_bg0_soft}] #W #{?client_prefix,#[fg=${theme_red_dark}],#[fg=${theme_yellow_dark}]}#[bg=${theme_bg0_soft}]#{?client_prefix,#[bg=${theme_red_dark}],#[bg=${theme_yellow_dark}]}#[fg=${theme_bg0}] #[fg=${theme_fg0},bg=${theme_bg0_soft}] #S "
+
+# Statusline - left side (empty)
+set -g status-left ""
+
+# Modes
+set -g clock-mode-colour "${theme_yellow_light}"
+set -g mode-style "fg=${theme_red_light} bg=${theme_bg3} bold"