Compare commits

...

2 commits

Author SHA1 Message Date
Daniel McKnight
96e7334928 Update navigation to use M-hjkl and M-HJKL in nvim and tmux 2025-07-11 09:44:14 -07:00
Daniel McKnight
9d92db6983 Add back KEYTIMEOUT to more quickly enter visual mode 2025-07-11 08:35:11 -07:00
4 changed files with 29 additions and 12 deletions

View file

@ -68,14 +68,28 @@ vim.keymap.set("n", "<leader>cx", ":CopilotChatReset<CR>", { desc = "Reset Copil
-- Configure Buffer Navigation -- Configure Buffer Navigation
vim.keymap.set("n", "<A-left>", ":BufferPrevious<CR>", { desc = "Previous Buffer" }) 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-right>", ":BufferNext<CR>", { desc = "Next Buffer" })
vim.keymap.set("n", "<A-h>", ":BufferPrevious<CR>", { desc = "Previous Buffer" }) vim.keymap.set("n", "<c-h>", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
vim.keymap.set("n", "<A-l>", ":BufferNext<CR>", { desc = "Next 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", ":BufferClose<CR>", { desc = "Close Buffer" })
vim.keymap.set("n", "<leader>bQ", ":BufferWipeout<CR>", { desc = "Wipeout 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", "<A-q>", ":BufferClose<CR>", { desc = "Close Buffer" })
vim.keymap.set("n", "<leader>bp", ":BufferPrevious<CR>", { desc = "Previous Buffer" }) vim.keymap.set("n", "<leader>bp", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
vim.keymap.set("n", "<leader>bn", ":BufferNext<CR>", { desc = "Next 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 -- Configure f-key shortcuts
vim.keymap.set("n", "<F1>", vim.lsp.buf.hover) vim.keymap.set("n", "<F1>", vim.lsp.buf.hover)
vim.keymap.set("i", "<F1>", vim.lsp.buf.hover) vim.keymap.set("i", "<F1>", vim.lsp.buf.hover)

View file

@ -4,4 +4,8 @@ return {
vim.keymap.set('n', '<c-Right>', ':TmuxNavigateRight<CR>'), vim.keymap.set('n', '<c-Right>', ':TmuxNavigateRight<CR>'),
vim.keymap.set('n', '<c-Up>', ':TmuxNavigateUp<CR>'), vim.keymap.set('n', '<c-Up>', ':TmuxNavigateUp<CR>'),
vim.keymap.set('n', '<c-Down>', ':TmuxNavigateDown<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>'),
} }

View file

@ -38,10 +38,10 @@ bind -n C-Up select-pane -U
bind -n C-Down select-pane -D bind -n C-Down select-pane -D
bind -n C-H select-pane -L bind -n M-h select-pane -L
bind -n C-J select-pane -D bind -n M-j select-pane -D
bind -n C-K select-pane -U bind -n M-k select-pane -U
bind -n C-L select-pane -R bind -n M-l select-pane -R
bind -n C-S-Left previous-window bind -n C-S-Left previous-window
bind -n C-S-Right next-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 # Integrate with nvim navigation
set -g @plugin 'christoomey/vim-tmux-navigator' set -g @plugin 'christoomey/vim-tmux-navigator'
set -g @vim_navigator_mapping_left "C-Left" # C-h" set -g @vim_navigator_mapping_left "M-h" #C-Left" # C-h"
set -g @vim_navigator_mapping_right "C-Right" # C-l" set -g @vim_navigator_mapping_right "M-l" #C-Right" # C-l"
set -g @vim_navigator_mapping_up "C-Up" # C-k" set -g @vim_navigator_mapping_up "M-k" #C-Up" # C-k"
set -g @vim_navigator_mapping_down "C-Down" # C-j" set -g @vim_navigator_mapping_down "M-j" #C-Down" # C-j"
# Load Plugins # Load Plugins
run '~/.tmux/plugins/tpm/tpm' run '~/.tmux/plugins/tpm/tpm'

3
.zshrc
View file

@ -147,7 +147,6 @@ zinit light zsh-users/zsh-autosuggestions
zinit light zsh-users/zsh-syntax-highlighting zinit light zsh-users/zsh-syntax-highlighting
# Key bindings config # Key bindings config
#KEYTIMEOUT=5 KEYTIMEOUT=5
# ^[ for esc; ^I for tab # ^[ for esc; ^I for tab
bindkey '^a' autosuggest-accept bindkey '^a' autosuggest-accept