From 05e2f3ea8d5f386231a58ef77b9dddd2ae181f3b Mon Sep 17 00:00:00 2001
From: Andrei Stoica <andrei.stoica.365@gmail.com>
Date: Sat, 3 Feb 2024 21:28:55 -0500
Subject: [PATCH] more tmux and vim navigation and color

---
 .nvchad-custom/mappings.lua |  7 +------
 .nvchad-custom/plugins.lua  |  7 +++++++
 .tmux.conf##default         | 33 ++++++++++++++++-----------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.nvchad-custom/mappings.lua b/.nvchad-custom/mappings.lua
index 4d263b2..4aa4cee 100644
--- a/.nvchad-custom/mappings.lua
+++ b/.nvchad-custom/mappings.lua
@@ -17,12 +17,7 @@ M.general = {
     ["n"] = {"nzz", "find next"},
     ["N"] = {"Nzz", "find prev"},
 
-    -- navigation
-    ["<c-h>"] = {"<cmd> TmuxNavigateLeft<cr>", "window left" },
-    ["<c-j>"] = {"<cmd> TmuxNavigateDown<cr>", "window down" },
-    ["<c-k>"] = {"<cmd> TmuxNavigateUp<cr>", "window up" },
-    ["<c-l>"] = {"<cmd> TmuxNavigateRight<cr>", "window right" },
-    ["<c-\\>"] = {"<cmd> TmuxNavigatePrevious<cr>", "window previous" },
+    ["Zm"] = {":ZenMode<CR>", "Enter ZenMode"}
 
   },
 }
diff --git a/.nvchad-custom/plugins.lua b/.nvchad-custom/plugins.lua
index 8a0f07c..2492e06 100644
--- a/.nvchad-custom/plugins.lua
+++ b/.nvchad-custom/plugins.lua
@@ -29,6 +29,13 @@ local plugins = {
 			"TmuxNavigateRight",
 			"TmuxNavigatePrevious",
 		},
+		kesy = {
+			{ "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
+			{ "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
+			{ "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
+			{ "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
+			{ "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
+		},
 		lazy = false,
 	},
 	-- Override plugin definition options
diff --git a/.tmux.conf##default b/.tmux.conf##default
index 4dd3bde..5cc1dc2 100644
--- a/.tmux.conf##default
+++ b/.tmux.conf##default
@@ -3,7 +3,6 @@ set -g @plugin 'alexghergh/nvim-tmux-navigation'
 
 run '~/.tmux/plugins/tpm/tpm'
 
-
 # remap prefix from 'C-b' to 'C-a'
 unbind C-b
 set-option -g prefix C-a
@@ -33,9 +32,9 @@ unbind h
 bind h attach-session -t . -c "#{pane_current_path}"
 
 # status bar
-set -g status-right '#[fg=black]#[bg=black fg=colour135]  %H:%m #[fg=default]%b %d %Y'
+set -g status-right '#[fg=black]◢#[bg=black fg=colour135]  %H:%m #[fg=default]%b %d %Y'
 if-shell 'test "$(acpi -t)"' {
-  set -g status-right '#[fg=black]#[bg=black fg=colour135]  %H:%m #[fg=default]%b %d %Y #[fg=pink] ♥#(acpi | cut -d ',' -f 2)'
+  set -g status-right '#[fg=black]◢#[bg=black fg=colour135]  %H:%m #[fg=default]%b %d %Y #[fg=pink] ♥#(acpi | cut -d ',' -f 2)'
 }
 
 # Start windows and panes at 1, not 0
@@ -48,40 +47,40 @@ set-option -g renumber-windows on
 # See: https://github.com/christoomey/vim-tmux-navigator
 is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
     | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?|fzf)(diff)?$'"
-bind-key -n -r 'C-h' if-shell "$is_vim" 'send-keys C-h'  'select-pane -L'
-bind-key -n -r 'C-j' if-shell "$is_vim" 'send-keys C-j'  'select-pane -D'
-bind-key -n -r 'C-k' if-shell "$is_vim" 'send-keys C-k'  'select-pane -U'
-bind-key -n -r 'C-l' if-shell "$is_vim" 'send-keys C-l'  'select-pane -R'
-tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
+bind-key -n -r 'C-h' if-shell "${is_vim}" 'send-keys C-h' 'select-pane -L'
+bind-key -n -r 'C-j' if-shell "${is_vim}" 'send-keys C-j' 'select-pane -D'
+bind-key -n -r 'C-k' if-shell "${is_vim}" 'send-keys C-k' 'select-pane -U'
+bind-key -n -r 'C-l' if-shell "${is_vim}" 'send-keys C-l' 'select-pane -R'
 if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
     "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\'  'select-pane -l'"
 if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
     "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\'  'select-pane -l'"
 
-bind-key -T copy-mode-vi 'C-h' select-pane -L
-bind-key -T copy-mode-vi 'C-j' select-pane -D
-bind-key -T copy-mode-vi 'C-k' select-pane -U
-bind-key -T copy-mode-vi 'C-l' select-pane -R
-bind-key -T copy-mode-vi 'C-\' select-pane -l
-
 # resize
 bind-key -r -T prefix M-k resize-pane -U
 bind-key -r -T prefix M-j resize-pane -D
 bind-key -r -T prefix M-h resize-pane -L
 bind-key -r -T prefix M-l resize-pane -R
 
+bind-key -r -T prefix k select-pane -U
+bind-key -r -T prefix j select-pane -D
+bind-key -r -T prefix h select-pane -L
+bind-key -r -T prefix l select-pane -R
+
 bind C-l send-keys 'C-l'
-bind C-\\ send-keys 'C-\'
 
 set-option -g allow-passthrough on
 
 set -g default-terminal "xterm-256color"
 set-option -ga terminal-overrides "xterm-256color"
 
+# status and culors
 set -g status-left-length 85
-set -g status-left "#[bg=black]working on#[fg=colour135] #S #[bg=default fg=black]"
+set -g status-left "#[bg=black]working on#[fg=colour135] #S #[bg=default fg=black]◣"
 set -g window-status-current-format "#[fg=colour135]#W"
 set -g status-style bg=default
 set -g pane-active-border-style fg=colour135
 set -g status-justify centre
-
+set-option -s status-interval 1
+set-option -g clock-mode-color colour135
+set-option -g message-style fg=colour135,bg=black