From 2026b6adfe2e71125bb37da02411b639479931a5 Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Tue, 15 Aug 2023 11:55:07 +0300
Subject: [PATCH] fix(tmux): catppuccin submodule and tpm names

---
 .gitmodules              |  2 +-
 add-submodules.sh        |  2 +-
 config/tmux/plugins/tmux |  1 +
 config/tmux/tmux.conf    | 29 ++++++++++++++++++++++++++---
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 160000 config/tmux/plugins/tmux

diff --git a/.gitmodules b/.gitmodules
index 895b8bf..b99ad29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,7 +30,7 @@
 	url = https://github.com/tmux-plugins/tpm.git
 	ignore = dirty
 [submodule "tmux/catppuccin"]
-	path = config/tmux/plugins/catppuccin
+	path = config/tmux/plugins/tmux
 	url = https://github.com/catppuccin/tmux.git
 [submodule "tmux/tmux-1password"]
 	path = config/tmux/plugins/tmux-1password
diff --git a/add-submodules.sh b/add-submodules.sh
index 367597a..d6d5540 100755
--- a/add-submodules.sh
+++ b/add-submodules.sh
@@ -9,7 +9,7 @@ git submodule add --name cheat-community -f https://github.com/cheat/cheatsheets
 git submodule add --name tmux/tpm \
   -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm
 git submodule add --name tmux/catppuccin \
-  -f https://github.com/catppuccin/tmux.git config/tmux/plugins/catppuccin
+  -f https://github.com/catppuccin/tmux.git config/tmux/plugins/tmux
 git submodule add --name tmux/tmux-1password \
   -f https://github.com/yardnsm/tmux-1password.git config/tmux/plugins/tmux-1password
 git submodule add --name tmux/tmux-autoreload \
diff --git a/config/tmux/plugins/tmux b/config/tmux/plugins/tmux
new file mode 160000
index 0000000..38932bd
--- /dev/null
+++ b/config/tmux/plugins/tmux
@@ -0,0 +1 @@
+Subproject commit 38932bddfcabfe3b2bc4e8c71e273c3505f9be95
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index 2e4c83f..5ae6e03 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -4,6 +4,9 @@
 # - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html
 # - https://github.com/dreamsofcode-io/tmux/blob/main/tmux.conf
 
+# Set plugins install dir
+set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.dotfiles/config/tmux/plugins'
+
 ## Install plugins, starting with plugin manager
 set -g @tpm_plugins '           \
   tmux-plugins/tpm               \
@@ -22,9 +25,6 @@ set -g @tpm_plugins '           \
   tmux-plugins/tmux-yank         \
 '
 
-# Set plugins install dir
-set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.dotfiles/config/tmux/plugins'
-
 set-option -sa terminal-overrides ",xterm*:Tc"
 
 # Mouse support
@@ -81,6 +81,29 @@ set -g @1password-key 'x'
 ## https://github.com/catppuccin/tmux
 set -g @catppuccin_flavour 'mocha' # latte/frappe/macchiato/mocha
 set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs
+set -g @catppuccin_window_status_enable "yes"
+
+set -g @catppuccin_window_left_separator ""
+set -g @catppuccin_window_right_separator " "
+set -g @catppuccin_window_middle_separator " █"
+set -g @catppuccin_window_number_position "right"
+
+set -g @catppuccin_window_default_fill "number"
+set -g @catppuccin_window_default_text "#W"
+
+set -g @catppuccin_window_current_fill "number"
+set -g @catppuccin_window_current_text "#W"
+
+set -g @catppuccin_status_modules "application session date_time"
+set -g @catppuccin_date_time_text "%Y-%m-%d %H:%M"
+
+set -g @catppuccin_status_left_separator  " "
+set -g @catppuccin_status_right_separator ""
+set -g @catppuccin_status_right_separator_inverse "no"
+set -g @catppuccin_status_fill "icon"
+set -g @catppuccin_status_connect_separator "no"
+set -g @catppuccin_directory_text "#{pane_current_path}"
+
 
 ## https://github.com/MunifTanjim/tmux-mode-indicator
 set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}'