From ab67f6be5a9393472e5a8fc16b6e2edab507f90b Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Thu, 13 Nov 2025 00:25:40 +0200
Subject: [PATCH] chore(tmux): fix catppuccin submodule

---
 .gitignore                          | 44 ++++++++++++++---------------
 .gitmodules                         |  3 ++
 add-submodules.sh                   |  2 ++
 config/tmux/plugins/catppuccin      |  1 +
 config/tmux/plugins/catppuccin/tmux |  1 -
 config/tmux/tmux.conf               |  2 +-
 6 files changed, 29 insertions(+), 24 deletions(-)
 create mode 160000 config/tmux/plugins/catppuccin
 delete mode 160000 config/tmux/plugins/catppuccin/tmux

diff --git a/.gitignore b/.gitignore
index 426979f..7cbbb7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,48 +11,48 @@
 .nfs*
 .scannerwork
 .vscode
+!config/git/local.d/.gitkeep
+!config/nvim/spell/.gitkeep
+!config/zed/settings.json
+!ssh/local.d/.gitkeep
+**/exports-secret.fish
+**/exports.secret.fish
+*.tmp.*
 Brewfile.lock.json
 antidote_plugins.zsh
 config/alacritty/theme-active.toml
 config/cheat/cheatsheets/pure-bash-bible/*
 config/cheat/cheatsheets/tldr/*
+config/fish/completions/asdf.fish
+config/fish/fish_variables
+config/fish/fish_variables.*
+config/gh/hosts.yml
 config/git/credentials
+config/git/local.d/*
 config/gnupg/S.*
 config/gnupg/private-keys-v1.d
 config/gnupg/s
 config/iterm2/AppSupport
+config/karabiner/automatic_backups
 config/npm/npmrc
 config/nvim/lazy-lock.json
 config/nvim/spell/*
-!config/nvim/spell/.gitkeep
-config/git/local.d/*
-!config/git/local.d/.gitkeep
+config/op/plugins/gh.json
+config/op/plugins/used_items/gh.json
+config/vim/.netrwhist
+config/vim/extra/*
 config/vim/fzf
 config/vim/plugged/*
 config/zed/*
-!config/zed/settings.json
+config/zed/settings.json
 config/zsh/.zcompdump
+dependency-check-report.html
 iTermServer-*
 lazy-lock.json
-local/share/fonts/*
 local/bin/asdf/plugins/*
+local/bin/yabai
+local/man/yabai.1
+local/share/fonts/*
 lock
 node_modules
 ssh/local.d/*
-!ssh/local.d/.gitkeep
-config/fish/fish_variables
-**/exports.secret.fish
-**/exports-secret.fish
-config/fish/completions/asdf.fish
-config/vim/.netrwhist
-config/vim/extra/*
-config/gh/hosts.yml
-dependency-check-report.html
-local/bin/yabai
-local/man/yabai.1
-config/op/plugins/used_items/gh.json
-config/zed/settings.json
-*.tmp.*
-config/op/plugins/gh.json
-config/fish/fish_variables.*
-config/karabiner/automatic_backups
diff --git a/.gitmodules b/.gitmodules
index 51a655e..21c48eb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -83,3 +83,6 @@
 [submodule "tmux/tmux-resurrect"]
 	path = config/tmux/plugins/tmux-resurrect
 	url = https://github.com/tmux-plugins/tmux-resurrect.git
+[submodule "tmux/catppuccin"]
+	path = config/tmux/plugins/catppuccin
+	url = https://github.com/catppuccin/tmux.git
diff --git a/add-submodules.sh b/add-submodules.sh
index 21b2426..d22de4b 100755
--- a/add-submodules.sh
+++ b/add-submodules.sh
@@ -42,6 +42,8 @@ git submodule add --name tmux/tmux-current-pane-hostname \
   -f https://github.com/soyuka/tmux-current-pane-hostname.git config/tmux/plugins/tmux-current-pane-hostname
 git submodule add --name tmux/tmux-dark-notify \
   -f https://github.com/ivuorinen/tmux-dark-notify.git config/tmux/plugins/tmux-dark-notify
+git submodule add --name tmux/catppuccin \
+  -f https://github.com/catppuccin/tmux.git config/tmux/plugins/catppuccin
 
 # Takes submodules and sets them to ignore all changes
 for MODULE in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }'); do
diff --git a/config/tmux/plugins/catppuccin b/config/tmux/plugins/catppuccin
new file mode 160000
index 0000000..38932bd
--- /dev/null
+++ b/config/tmux/plugins/catppuccin
@@ -0,0 +1 @@
+Subproject commit 38932bddfcabfe3b2bc4e8c71e273c3505f9be95
diff --git a/config/tmux/plugins/catppuccin/tmux b/config/tmux/plugins/catppuccin/tmux
deleted file mode 160000
index b2f219c..0000000
--- a/config/tmux/plugins/catppuccin/tmux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b2f219c00609ea1772bcfbdae0697807184743e4
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index ca0465c..f4ae588 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -176,6 +176,6 @@ run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-current-pane-hostname/curren
 run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-fzf-url/fzf-url.tmux"
 run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux"
 run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux"
-run-shell "$HOME/.dotfiles/config/tmux/plugins/catppuccin/tmux/catppuccin.tmux"
+run-shell "$HOME/.dotfiles/config/tmux/plugins/catppuccin/catppuccin.tmux"
 
 run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-dark-notify/main.tmux"