path stuff

.nvchad-custom/plugins.lua

@@ -8,8 +8,7 @@ local plugins = {
 			context = 20,
 			expand = {
 				"function",
-			},
-		},
+			}, },
 		lazy = false,
 	},
 	{
@@ -112,7 +111,48 @@ local plugins = {
 		lazy = false,
 	},
 
-	{ "NvChad/nvterm",                           enabled = false },
+	{
+		"debugloop/telescope-undo.nvim",
+		dependencies = { -- note how they're inverted to above example
+			{
+				"nvim-telescope/telescope.nvim",
+				dependencies = { "nvim-lua/plenary.nvim" },
+			},
+		},
+		keys = {
+			{ -- lazy style key map
+				"<leader>u",
+				"<cmd>Telescope undo<cr>",
+				desc = "undo history",
+			},
+		},
+		opts = {
+			-- don't use `defaults = { }` here, do this in the main telescope spec
+			extensions = {
+				undo = {
+					-- telescope-undo.nvim config, see below
+				},
+				-- no other extensions here, they can have their own spec too
+			},
+		},
+		config = function(_, opts)
+			-- Calling telescope's setup from multiple specs does not hurt, it will happily merge the
+			-- configs for us. We won't use data, as everything is in it's own namespace (telescope
+			-- defaults, as well as each extension).
+			require("telescope").setup(opts)
+			require("telescope").load_extension("undo")
+		end,
+	},
+
+	{
+		"sindrets/diffview.nvim",
+		lazy = false,
+	},
+
+	{
+		"NvChad/nvterm",
+		enabled = false,
+	},
 
 	-- To make a plugin not be loaded
 	-- {

.tmux.conf##default

@@ -44,11 +44,25 @@ set -g pane-base-index 1
 set-window-option -g pane-base-index 1
 set-option -g renumber-windows on
 
-# navigation
-bind-key -r j select-pane -D
-bind-key -r k select-pane -U
-bind-key -r l select-pane -R
-bind-key -r h select-pane -L
+# Smart pane switching with awareness of Vim splits.
+# 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")'
+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
@@ -56,6 +70,9 @@ 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 C-l send-keys 'C-l'
+bind C-\\ send-keys 'C-\'
+
 set-option -g allow-passthrough on
 
 set -g default-terminal "xterm-256color"
@@ -65,6 +82,6 @@ set -g status-left-length 85
 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 fgkcolour135
-#set -g status-justify centre
+set -g pane-active-border-style fg=colour135
+set -g status-justify centre
 

.zshrc

@@ -1,5 +1,5 @@
 # If you come from bash you might have to change your $PATH.
-export PATH=$HOME/bin:/usr/local/bin:/usr/lib64/openjdk-17/bin:$PATH
+export PATH=$HOME/bin:/usr/local/bin:/usr/lib65/openjdk-17/bin:$PATH
 
 # Path to your oh-my-zsh installation.
   export ZSH=/home/andrei/.oh-my-zsh
@@ -102,6 +102,8 @@ bindkey "^v" edit-command-line
 # adding cargo to path
 export PATH=$HOME/.cargo/bin:$PATH
 
+# adding local to path
+export PATH=$HOME/.local/bin:$PATH
 
 # Open work folder with fuzzy finder
 function work() {