From 9d92db698341314b3d2340f0ca253390dc827e56 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@neon.ai>
Date: Fri, 11 Jul 2025 08:35:11 -0700
Subject: [PATCH 1/2] Add back KEYTIMEOUT to more quickly enter visual mode

---
 .zshrc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.zshrc b/.zshrc
index 2ff7fd6..fa03e16 100644
--- a/.zshrc
+++ b/.zshrc
@@ -147,7 +147,6 @@ zinit light zsh-users/zsh-autosuggestions
 zinit light zsh-users/zsh-syntax-highlighting
 
 # Key bindings config
-#KEYTIMEOUT=5
+KEYTIMEOUT=5
 # ^[ for esc; ^I for tab
 bindkey '^a' autosuggest-accept
-

From 96e73349281b1d827747fc3d8b9b98600a7e4df5 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@neon.ai>
Date: Fri, 11 Jul 2025 09:44:14 -0700
Subject: [PATCH 2/2] Update navigation to use M-hjkl and M-HJKL in nvim and
 tmux

---
 .config/nvim/init.lua                          | 18 ++++++++++++++++--
 .../nvim/lua/plugins/nvim-tmux-navigator.lua   |  4 ++++
 .config/tmux/tmux.conf                         | 16 ++++++++--------
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 4231707..2e2f2d1 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -68,14 +68,28 @@ vim.keymap.set("n", "<leader>cx", ":CopilotChatReset<CR>", { desc = "Reset Copil
 -- Configure Buffer Navigation
 vim.keymap.set("n", "<A-left>", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
 vim.keymap.set("n", "<A-right>", ":BufferNext<CR>", { desc = "Next Buffer" })
-vim.keymap.set("n", "<A-h>", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
-vim.keymap.set("n", "<A-l>", ":BufferNext<CR>", { desc = "Next Buffer" })
+vim.keymap.set("n", "<c-h>", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
+vim.keymap.set("n", "<c-l>", ":BufferNext<CR>", { desc = "Next Buffer" })
 vim.keymap.set("n", "<leader>bq", ":BufferClose<CR>", { desc = "Close Buffer" })
 vim.keymap.set("n", "<leader>bQ", ":BufferWipeout<CR>", { desc = "Wipeout Buffer" })
 vim.keymap.set("n", "<A-q>", ":BufferClose<CR>", { desc = "Close Buffer" })
 vim.keymap.set("n", "<leader>bp", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
 vim.keymap.set("n", "<leader>bn", ":BufferNext<CR>", { desc = "Next Buffer" })
 
+-- Configure Pane Navigation
+vim.keymap.set("n", "<C-h>", "<Nop>")
+vim.keymap.set("n", "<C-j>", "<Nop>")
+vim.keymap.set("n", "<C-k>", "<Nop>")
+vim.keymap.set("n", "<C-l>", "<Nop>")
+vim.keymap.set("n", "<A-h>", ":wincmd h<CR>", { desc = "Navigate Left" })
+vim.keymap.set("n", "<A-j>", ":wincmd j<CR>", { desc = "Navigate Down" })
+vim.keymap.set("n", "<A-k>", ":wincmd k<CR>", { desc = "Navigate Up" })
+vim.keymap.set("n", "<A-l>", ":wincmd l<CR>", { desc = "Navigate Right" })
+vim.keymap.set("i", "<A-h>", ":wincmd h<CR>", { desc = "Navigate Left" })
+vim.keymap.set("i", "<A-j>", ":wincmd j<CR>", { desc = "Navigate Down" })
+vim.keymap.set("i", "<A-k>", ":wincmd k<CR>", { desc = "Navigate Up" })
+vim.keymap.set("i", "<A-l>", ":wincmd l<CR>", { desc = "Navigate Right" })
+
 -- Configure f-key shortcuts
 vim.keymap.set("n", "<F1>", vim.lsp.buf.hover)
 vim.keymap.set("i", "<F1>", vim.lsp.buf.hover)
diff --git a/.config/nvim/lua/plugins/nvim-tmux-navigator.lua b/.config/nvim/lua/plugins/nvim-tmux-navigator.lua
index 1e7cbc3..d67bdb5 100644
--- a/.config/nvim/lua/plugins/nvim-tmux-navigator.lua
+++ b/.config/nvim/lua/plugins/nvim-tmux-navigator.lua
@@ -4,4 +4,8 @@ return {
   vim.keymap.set('n', '<c-Right>', ':TmuxNavigateRight<CR>'),
   vim.keymap.set('n', '<c-Up>', ':TmuxNavigateUp<CR>'),
   vim.keymap.set('n', '<c-Down>', ':TmuxNavigateDown<CR>'),
+  vim.keymap.set('n', '<A-h>', ':TmuxNavigateLeft<CR>'),
+  vim.keymap.set('n', '<A-l>', ':TmuxNavigateRight<CR>'),
+  vim.keymap.set('n', '<A-k>', ':TmuxNavigateUp<CR>'),
+  vim.keymap.set('n', '<A-j>', ':TmuxNavigateDown<CR>'),
 }
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 1be3077..a3fb9fc 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -38,10 +38,10 @@ bind -n C-Up select-pane -U
 bind -n C-Down select-pane -D
 
 
-bind -n C-H select-pane -L
-bind -n C-J select-pane -D
-bind -n C-K select-pane -U
-bind -n C-L select-pane -R
+bind -n M-h select-pane -L
+bind -n M-j select-pane -D
+bind -n M-k select-pane -U
+bind -n M-l select-pane -R
 
 bind -n C-S-Left previous-window
 bind -n C-S-Right next-window
@@ -83,10 +83,10 @@ set -g @open-S 'https://search.brave.com/search?q='
 
 # Integrate with nvim navigation
 set -g @plugin 'christoomey/vim-tmux-navigator'
-set -g @vim_navigator_mapping_left "C-Left" # C-h"
-set -g @vim_navigator_mapping_right "C-Right" # C-l"
-set -g @vim_navigator_mapping_up "C-Up" # C-k"
-set -g @vim_navigator_mapping_down "C-Down" # C-j"
+set -g @vim_navigator_mapping_left "M-h"  #C-Left" # C-h"
+set -g @vim_navigator_mapping_right "M-l"  #C-Right" # C-l"
+set -g @vim_navigator_mapping_up "M-k"  #C-Up" # C-k"
+set -g @vim_navigator_mapping_down "M-j"  #C-Down" # C-j"
 
 # Load Plugins
 run '~/.tmux/plugins/tpm/tpm'