From d0555640118bda467e75ace2e4e0ea360dd647dc Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 14 Sep 2016 20:14:25 -0700 Subject: [PATCH 1/3] replace hnei with neio as it fits kinesis Advantage better --- README.markdown | 19 ++++++++++--------- plugin/colemak.vim | 11 ++++++----- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.markdown b/README.markdown index 187d521..9849a51 100644 --- a/README.markdown +++ b/README.markdown @@ -26,11 +26,11 @@ Key mappings ``` Colemak layout: | QWERTY layout: `12345 67890-= Move around: | (instead of) `12345 67890-= - qwfpg jluy;[]\ e | k qwert yuiop[]\ - arstd HNEIo' h i | h l asdfg HJKL;' - zxcvb km,./ n | j zxcvb nm,./ + qwfpg jluy;[]\ i | k qwert yuiop[]\ + arstd hNEIO' n o | h l asdfg HJKL;' + zxcvb km,./ e | j zxcvb nm,./ -( novx) h = h (Left) i = l (Right) e = k (Up) n = j (Down) +( novx) n = h (Left) o = l (Right) i = k (Up) e = j (Down) ( novx) l = b (Back word) L = B (Back WORD) ( novx) y = w (Forward word) Y = W (Forward WORD) @@ -39,11 +39,12 @@ Colemak layout: | QWERTY layout: (c ) = (Back WORD) (c ) = (Seems to equal forward WORD minus 1 character) -( n x) a = v (Visual) A = V (Visual line) -( n ) r = r (Replace) R = R (Replace) -( n ) s = i (Insert) S = I (Insert before first non-blank of line) -( n ) t = a (Append) T = A (Append at end of line) -( n ) w = c (Change) W = C (Change to end of line) ww = cc (Change line) +( n x) a = v (Visual) A = V (Visual line) +( n ) r = r (Replace) R = R (Replace) +( n ) s = i (Insert) S = I (Insert before first non-blank of line) +( n ) h = o (Insert new line below) H = O (Insert new line above) +( n ) t = a (Append) T = A (Append at end of line) +( n ) w = c (Change) W = C (Change to end of line) ww = cc (Change line) ( n x) z = u (Undo) Z = (Redo) gz = U (Undo all latest changes on line) ( n x) x = x (Cut) X = dd (Cut line) diff --git a/plugin/colemak.vim b/plugin/colemak.vim index 81b43cb..9fcc905 100755 --- a/plugin/colemak.vim +++ b/plugin/colemak.vim @@ -10,10 +10,10 @@ if v:version < 700 | echohl WarningMsg | echo "colemak.vim: You need Vim version 7.0 or later." | echohl None | finish | endif " }}} " Up/down/left/right {{{ - nnoremap h h|xnoremap h h|onoremap h h| - nnoremap n j|xnoremap n j|onoremap n j| - nnoremap e k|xnoremap e k|onoremap e k| - nnoremap i l|xnoremap i l|onoremap i l| + nnoremap n h|xnoremap n h|onoremap n h| + nnoremap e j|xnoremap e j|onoremap e j| + nnoremap i k|xnoremap i k|onoremap i k| + nnoremap o l|xnoremap o l|onoremap o l| " }}} " Words forward/backward {{{ " l/L = back word/WORD @@ -28,11 +28,12 @@ cnoremap cnoremap " }}} -" inSert/Replace/append (T) {{{ +" inSert/Replace/append (T)/new line {{{ nnoremap s i| nnoremap S I| nnoremap t a| nnoremap T A| + nnoremap h o| " }}} " Change {{{ nnoremap w c|xnoremap w c| From a105c14bb1e86529ef36d35ce9bf7d0f7a7c83ba Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 20 Sep 2016 10:28:58 -0700 Subject: [PATCH 2/3] improve window handling --- README.markdown => README.md | 8 ++++---- plugin/colemak.vim | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) rename README.markdown => README.md (96%) diff --git a/README.markdown b/README.md similarity index 96% rename from README.markdown rename to README.md index 9849a51..c9470db 100644 --- a/README.markdown +++ b/README.md @@ -66,10 +66,10 @@ Colemak layout: | QWERTY layout: ( n x) gK = K (Lookup) ( n x) gL = L (To line [count] from bottom of window) -( n x) h = h (Window left) -( n x) n = j (Window down) -( n x) e = k (Window up) -( n x) i = l (Window right) +( n x) n = h (Window left) +( n x) e = j (Window down) +( n x) i = k (Window up) +( n x) o = l (Window right) Lost: ( n x) H (To line [count] from top of window) diff --git a/plugin/colemak.vim b/plugin/colemak.vim index 9fcc905..369c903 100755 --- a/plugin/colemak.vim +++ b/plugin/colemak.vim @@ -89,8 +89,8 @@ nnoremap gL L|xnoremap gL L| " }}} " Window handling {{{ - nnoremap h h|xnoremap h h| - nnoremap n j|xnoremap n j| - nnoremap e k|xnoremap e k| - nnoremap i l|xnoremap i l| + nnoremap n h|xnoremap n h| + nnoremap e j|xnoremap e j| + nnoremap i k|xnoremap i k| + nnoremap o l|xnoremap o l| " }}} From 6ac1c0bf362845355c65dfeab9a9987c1b4dc7ec Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Sun, 16 Oct 2016 11:00:14 -0700 Subject: [PATCH 3/3] bind H to open a new line above the current line --- plugin/colemak.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin/colemak.vim b/plugin/colemak.vim index 369c903..599aa1e 100755 --- a/plugin/colemak.vim +++ b/plugin/colemak.vim @@ -34,6 +34,7 @@ nnoremap t a| nnoremap T A| nnoremap h o| + nnoremap H O| " }}} " Change {{{ nnoremap w c|xnoremap w c|