From d8beb7892e78474511899202972a145e8fbb9762 Mon Sep 17 00:00:00 2001
From: Tom van der Lee <t0m.vd.l33@gmail.com>
Date: Thu, 10 Sep 2026 22:25:18 +0200
Subject: Make <C-hjkl> window nav work from terminal buffers too

<C-w><direction> only works in Normal mode; a terminal buffer (e.g.
claude-code.nvim's split) is in Terminal mode by default, where
keystrokes go straight to the running process instead of Neovim.

Add terminal-mode versions of the existing <C-hjkl> mappings that
escape to Normal mode (<C-\><C-n>) before running the window command,
so leaving a terminal split works the same one-chord way as moving
between any other windows.

Deliberately not mapping <Esc> to escape terminal mode (the vimrc had
this commented out too) - many programs run inside a terminal buffer
(claude included) and need to receive a real Escape keypress.
---
 neovim/.config/nvim/lua/config/keymaps.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'neovim')

diff --git a/neovim/.config/nvim/lua/config/keymaps.lua b/neovim/.config/nvim/lua/config/keymaps.lua
index f0bfbec..66e97a0 100644
--- a/neovim/.config/nvim/lua/config/keymaps.lua
+++ b/neovim/.config/nvim/lua/config/keymaps.lua
@@ -1,10 +1,18 @@
 local map = vim.keymap.set
 
--- Switch windows with <C-[direction]>
+-- Switch windows with <C-[direction]>, from Normal mode or from inside a
+-- terminal buffer (e.g. claude-code.nvim's split) without leaving it first.
+-- Terminal mode passes keys straight to the running process by default, so
+-- <C-w><direction> alone never reaches Neovim there - <C-\><C-n> escapes to
+-- Normal mode before running the window command.
 map("n", "<C-j>", "<C-w>j")
 map("n", "<C-k>", "<C-w>k")
 map("n", "<C-h>", "<C-w>h")
 map("n", "<C-l>", "<C-w>l")
+map("t", "<C-j>", [[<C-\><C-n><C-w>j]])
+map("t", "<C-k>", [[<C-\><C-n><C-w>k]])
+map("t", "<C-h>", [[<C-\><C-n><C-w>h]])
+map("t", "<C-l>", [[<C-\><C-n><C-w>l]])
 
 -- Never use the arrow keys
 for _, key in ipairs({ "<Up>", "<Down>", "<Left>", "<Right>" }) do
-- 
cgit v1.3