From f278e9f3b61b9eea3677a30130a4427237624107 Mon Sep 17 00:00:00 2001
From: m1ngsama <contact@m1ng.space>
Date: Wed, 13 May 2026 13:56:28 +0800
Subject: [PATCH] Restore native Ctrl window keys (#38)

---
 QUICKSTART.md          | 2 +-
 README.md              | 2 +-
 modules/navigation.vim | 9 ---------
 modules/tools.vim      | 2 +-
 scripts/test.sh        | 4 +++-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/QUICKSTART.md b/QUICKSTART.md
index a5422f8..56ec4ee 100644
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -92,7 +92,7 @@ Alt+j / Alt+k   move line
 ## Navigate
 
 ```
-Ctrl+h/j/k/l   splits + tmux panes
+<C-w>h/j/k/l   splits
 ,h / ,l         prev / next buffer
 ,z              maximize window
 ,tv / ,th       terminal
diff --git a/README.md b/README.md
index 4e29559..fabcae7 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ jk        exit insert mode         ,?    cheat sheet
 
 ### Windows
 
-`Ctrl+hjkl` navigate (+ tmux) | `,z` maximize | `,h` `,l` buffers | `,bd` close buffer | `,=` `,−` resize | `,tv` `,th` terminal | `Esc Esc` exit terminal
+`<C-w>hjkl` navigate | `,z` maximize | `,h` `,l` buffers | `,bd` close buffer | `,=` `,−` resize | `,tv` `,th` terminal | `Esc Esc` exit terminal
 
 ### Markdown
 
diff --git a/modules/navigation.vim b/modules/navigation.vim
index 0841534..5cd36d0 100644
--- a/modules/navigation.vim
+++ b/modules/navigation.vim
@@ -86,15 +86,6 @@ command! -bang -nargs=* RgWord
     \   .shellescape(expand('<cword>')), 1, s:Preview(), <bang>0)
 command! -bang -nargs=? GFiles call fzf#vim#gitfiles(<q-args>, s:Preview(), <bang>0)
 
-" ── Window Navigation ───────────────────────────────────────────────────────
-
-if empty($TMUX)
-    nnoremap <C-h> <C-w>h
-    nnoremap <C-j> <C-w>j
-    nnoremap <C-k> <C-w>k
-    nnoremap <C-l> <C-w>l
-endif
-
 " ── Window Maximize Toggle ──────────────────────────────────────────────────
 
 function! s:ToggleMaximize() abort
diff --git a/modules/tools.vim b/modules/tools.vim
index ae434c4..8daebc8 100644
--- a/modules/tools.vim
+++ b/modules/tools.vim
@@ -402,7 +402,7 @@ function! s:CheatSheet() abort
         \ '  [x ]x     conflict markers',
         \ '',
         \ '  ── windows ───────────────',
-        \ '  Ctrl+hjkl navigate splits',
+        \ '  <C-w>hjkl navigate splits',
         \ '  ,h ,l     prev / next buf',
         \ '  ,bd       close buffer',
         \ '  ,z        maximize toggle',
diff --git a/scripts/test.sh b/scripts/test.sh
index a9639f5..2e5b11a 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -203,6 +203,7 @@ check_vim() {
 
     XDG_CONFIG_HOME="$EMPTY_XDG" vim -u .vimrc -i NONE -es -N \
         -c 'if maparg("0", "n") !=# "" || maparg("0", "v") !=# "" || maparg("Y", "n") !=# "" || maparg("Q", "n") !=# "" || maparg("<Space>", "n") !=# "" | cquit | endif' \
+        -c 'if maparg("<C-h>", "n") !=# "" || maparg("<C-j>", "n") !=# "" || maparg("<C-k>", "n") !=# "" || maparg("<C-l>", "n") !=# "" | cquit | endif' \
         -c 'if maparg("<C-p>", "n") !=# "" | cquit | endif' \
         -c 'if maparg(",ff", "n") !~# "SmartFiles" | cquit | endif' \
         -c 'qa!' 2>&1
@@ -266,7 +267,8 @@ check_vim() {
     grep -Fq ',dd       definition' "$TMP_ROOT/cheat-default.txt"
     grep -Fq ',dk       hover docs' "$TMP_ROOT/cheat-default.txt"
     grep -Fq ',dp ,dn   LSP diagnostics' "$TMP_ROOT/cheat-default.txt"
-    if grep -Eq 'Ctrl\\+p    find file|gd        definition|K         hover docs|\\[g \\]g     LSP diagnostics' "$TMP_ROOT/cheat-default.txt"; then
+    grep -Fq '<C-w>hjkl navigate splits' "$TMP_ROOT/cheat-default.txt"
+    if grep -Eq 'Ctrl\\+p    find file|Ctrl\\+hjkl navigate splits|gd        definition|K         hover docs|\\[g \\]g     LSP diagnostics' "$TMP_ROOT/cheat-default.txt"; then
         cat "$TMP_ROOT/cheat-default.txt"
         exit 1
     fi