From ab20593c264114890901d3c15982f2a6daef9656 Mon Sep 17 00:00:00 2001 From: Florent Nuttens Date: Sat, 14 Sep 2024 00:44:32 +0200 Subject: [PATCH 1/4] feat(navigation_vim): map C-rght/lft to [T]/[B] - A-rght/lft in the case of macOS --- kanata/defalias/azerty_pc.kbd | 2 ++ kanata/defalias/bepo_pc.kbd | 2 ++ kanata/defalias/ergol_pc.kbd | 2 ++ kanata/defalias/optimot_pc.kbd | 2 ++ kanata/defalias/qwerty-lafayette_pc.kbd | 2 ++ kanata/defalias/qwerty_mac.kbd | 2 ++ kanata/defalias/qwerty_pc.kbd | 2 ++ kanata/defalias/qwertz_pc.kbd | 2 ++ kanata/deflayer/navigation_vim.kbd | 6 +++--- 9 files changed, 19 insertions(+), 3 deletions(-) diff --git a/kanata/defalias/azerty_pc.kbd b/kanata/defalias/azerty_pc.kbd index 4c6dfee..ee89e51 100644 --- a/kanata/defalias/azerty_pc.kbd +++ b/kanata/defalias/azerty_pc.kbd @@ -11,6 +11,8 @@ cut C-x cpy C-c pst C-v + nwd C-rght + pwd C-lft 0 S-0 1 S-1 diff --git a/kanata/defalias/bepo_pc.kbd b/kanata/defalias/bepo_pc.kbd index d45996e..2704c7f 100644 --- a/kanata/defalias/bepo_pc.kbd +++ b/kanata/defalias/bepo_pc.kbd @@ -10,6 +10,8 @@ cut C-c cpy C-h pst C-u + nwd C-rght + pwd C-lft 0 S-0 1 S-1 diff --git a/kanata/defalias/ergol_pc.kbd b/kanata/defalias/ergol_pc.kbd index 0fd2abb..09f1318 100644 --- a/kanata/defalias/ergol_pc.kbd +++ b/kanata/defalias/ergol_pc.kbd @@ -10,6 +10,8 @@ cut C-x cpy C-w pst C-v + nwd C-rght + pwd C-lft 0 0 1 1 diff --git a/kanata/defalias/optimot_pc.kbd b/kanata/defalias/optimot_pc.kbd index eacb2a6..8829040 100644 --- a/kanata/defalias/optimot_pc.kbd +++ b/kanata/defalias/optimot_pc.kbd @@ -10,6 +10,8 @@ cut C-[ cpy C-m pst C-/ + nwd C-rght + pwd C-lft 0 S-0 1 S-1 diff --git a/kanata/defalias/qwerty-lafayette_pc.kbd b/kanata/defalias/qwerty-lafayette_pc.kbd index b218fa2..cc7c134 100644 --- a/kanata/defalias/qwerty-lafayette_pc.kbd +++ b/kanata/defalias/qwerty-lafayette_pc.kbd @@ -10,6 +10,8 @@ cut C-x cpy C-c pst C-v + nwd C-rght + pwd C-lft 0 0 1 1 diff --git a/kanata/defalias/qwerty_mac.kbd b/kanata/defalias/qwerty_mac.kbd index ae8027d..ada141b 100644 --- a/kanata/defalias/qwerty_mac.kbd +++ b/kanata/defalias/qwerty_mac.kbd @@ -10,6 +10,8 @@ cut M-x cpy M-c pst M-v + nwd A-rght + pwd A-lft 0 0 1 1 diff --git a/kanata/defalias/qwerty_pc.kbd b/kanata/defalias/qwerty_pc.kbd index ecdbaf8..2eed6d8 100644 --- a/kanata/defalias/qwerty_pc.kbd +++ b/kanata/defalias/qwerty_pc.kbd @@ -11,6 +11,8 @@ cut C-x cpy C-c pst C-v + nwd C-rght + pwd C-lft 0 0 1 1 diff --git a/kanata/defalias/qwertz_pc.kbd b/kanata/defalias/qwertz_pc.kbd index c2b4df0..98c5d21 100644 --- a/kanata/defalias/qwertz_pc.kbd +++ b/kanata/defalias/qwertz_pc.kbd @@ -11,6 +11,8 @@ cut C-x cpy C-c pst C-v + nwd C-rght + pwd C-lft 0 0 1 1 diff --git a/kanata/deflayer/navigation_vim.kbd b/kanata/deflayer/navigation_vim.kbd index dfc8742..411fc86 100644 --- a/kanata/deflayer/navigation_vim.kbd +++ b/kanata/deflayer/navigation_vim.kbd @@ -1,6 +1,6 @@ ;; Vim-Navigation layer: ;; - right: Vim-like arrows on HJKL, home/end page up/down, mouse scroll -;; - left: one-hand shortcuts (Cmd/Ctrl-WASZXCV), Tab/Shift-Tab, prev/next +;; - left: one-hand shortcuts (Cmd/Ctrl-WASZXCV), Tab/Shift-Tab, prev/next, Ctrl/Alt-Left/Right ;; - top: Super-num (i3/sway) or Alt-num (browser), zoom in/out ;; The `lrld` action stands for "live reload". This will re-parse everything @@ -8,9 +8,9 @@ (deflayer navigation M-1 M-2 M-3 M-4 M-5 lrld M-6 M-7 M-8 M-9 M-0 - @pad @cls bck fwd XX home pgdn pgup end @run + @pad @cls bck fwd @nwd home pgdn pgup end @run @all @sav S-tab tab XX lft down up rght @fun - @ndo @cut @cpy @pst XX _ @mwl @mwd @mwu @mwr XX + @ndo @cut @cpy @pst @pwd _ @mwl @mwd @mwu @mwr XX del _ esc ) From 246d1c4622221610351caed54de4f954be9c414e Mon Sep 17 00:00:00 2001 From: Florent Nuttens Date: Fri, 27 Sep 2024 23:41:43 +0200 Subject: [PATCH 2/4] feat(navigation_vim): map A-tab to [G] - M-tab in the case of macOS --- kanata/defalias/azerty_pc.kbd | 1 + kanata/defalias/bepo_pc.kbd | 1 + kanata/defalias/ergol_pc.kbd | 1 + kanata/defalias/optimot_pc.kbd | 1 + kanata/defalias/qwerty-lafayette_pc.kbd | 1 + kanata/defalias/qwerty_mac.kbd | 1 + kanata/defalias/qwerty_pc.kbd | 1 + kanata/defalias/qwertz_pc.kbd | 1 + kanata/deflayer/navigation_vim.kbd | 4 ++-- 9 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kanata/defalias/azerty_pc.kbd b/kanata/defalias/azerty_pc.kbd index ee89e51..9ae8895 100644 --- a/kanata/defalias/azerty_pc.kbd +++ b/kanata/defalias/azerty_pc.kbd @@ -13,6 +13,7 @@ pst C-v nwd C-rght pwd C-lft + swp A-tab 0 S-0 1 S-1 diff --git a/kanata/defalias/bepo_pc.kbd b/kanata/defalias/bepo_pc.kbd index 2704c7f..b382f54 100644 --- a/kanata/defalias/bepo_pc.kbd +++ b/kanata/defalias/bepo_pc.kbd @@ -12,6 +12,7 @@ pst C-u nwd C-rght pwd C-lft + swp A-tab 0 S-0 1 S-1 diff --git a/kanata/defalias/ergol_pc.kbd b/kanata/defalias/ergol_pc.kbd index 09f1318..29b3106 100644 --- a/kanata/defalias/ergol_pc.kbd +++ b/kanata/defalias/ergol_pc.kbd @@ -12,6 +12,7 @@ pst C-v nwd C-rght pwd C-lft + swp A-tab 0 0 1 1 diff --git a/kanata/defalias/optimot_pc.kbd b/kanata/defalias/optimot_pc.kbd index 8829040..d0aefcc 100644 --- a/kanata/defalias/optimot_pc.kbd +++ b/kanata/defalias/optimot_pc.kbd @@ -12,6 +12,7 @@ pst C-/ nwd C-rght pwd C-lft + swp A-tab 0 S-0 1 S-1 diff --git a/kanata/defalias/qwerty-lafayette_pc.kbd b/kanata/defalias/qwerty-lafayette_pc.kbd index cc7c134..a02e862 100644 --- a/kanata/defalias/qwerty-lafayette_pc.kbd +++ b/kanata/defalias/qwerty-lafayette_pc.kbd @@ -12,6 +12,7 @@ pst C-v nwd C-rght pwd C-lft + swp A-tab 0 0 1 1 diff --git a/kanata/defalias/qwerty_mac.kbd b/kanata/defalias/qwerty_mac.kbd index ada141b..c7a8a82 100644 --- a/kanata/defalias/qwerty_mac.kbd +++ b/kanata/defalias/qwerty_mac.kbd @@ -12,6 +12,7 @@ pst M-v nwd A-rght pwd A-lft + swp M-tab 0 0 1 1 diff --git a/kanata/defalias/qwerty_pc.kbd b/kanata/defalias/qwerty_pc.kbd index 2eed6d8..e3e8143 100644 --- a/kanata/defalias/qwerty_pc.kbd +++ b/kanata/defalias/qwerty_pc.kbd @@ -13,6 +13,7 @@ pst C-v nwd C-rght pwd C-lft + swp A-tab 0 0 1 1 diff --git a/kanata/defalias/qwertz_pc.kbd b/kanata/defalias/qwertz_pc.kbd index 98c5d21..08f9df7 100644 --- a/kanata/defalias/qwertz_pc.kbd +++ b/kanata/defalias/qwertz_pc.kbd @@ -13,6 +13,7 @@ pst C-v nwd C-rght pwd C-lft + swp A-tab 0 0 1 1 diff --git a/kanata/deflayer/navigation_vim.kbd b/kanata/deflayer/navigation_vim.kbd index 411fc86..d83bb46 100644 --- a/kanata/deflayer/navigation_vim.kbd +++ b/kanata/deflayer/navigation_vim.kbd @@ -1,6 +1,6 @@ ;; Vim-Navigation layer: ;; - right: Vim-like arrows on HJKL, home/end page up/down, mouse scroll -;; - left: one-hand shortcuts (Cmd/Ctrl-WASZXCV), Tab/Shift-Tab, prev/next, Ctrl/Alt-Left/Right +;; - left: one-hand shortcuts (Cmd/Ctrl-WASZXCV), Tab/Shift-Tab, Alt-Tab, prev/next, Ctrl/Alt-Left/Right ;; - top: Super-num (i3/sway) or Alt-num (browser), zoom in/out ;; The `lrld` action stands for "live reload". This will re-parse everything @@ -9,7 +9,7 @@ (deflayer navigation M-1 M-2 M-3 M-4 M-5 lrld M-6 M-7 M-8 M-9 M-0 @pad @cls bck fwd @nwd home pgdn pgup end @run - @all @sav S-tab tab XX lft down up rght @fun + @all @sav S-tab tab @swp lft down up rght @fun @ndo @cut @cpy @pst @pwd _ @mwl @mwd @mwu @mwr XX del _ esc ) From 1d4092587c50a13b704d201b8861c1e22accd9ec Mon Sep 17 00:00:00 2001 From: Florent Nuttens Date: Sun, 22 Sep 2024 13:09:51 +0200 Subject: [PATCH 3/4] feat(navigation_vim): map C-y to [/] - M-y in the case of macOS --- kanata/defalias/azerty_pc.kbd | 1 + kanata/defalias/bepo_pc.kbd | 1 + kanata/defalias/ergol_pc.kbd | 1 + kanata/defalias/optimot_pc.kbd | 1 + kanata/defalias/qwerty-lafayette_pc.kbd | 1 + kanata/defalias/qwerty_mac.kbd | 1 + kanata/defalias/qwerty_pc.kbd | 1 + kanata/defalias/qwertz_pc.kbd | 1 + kanata/deflayer/navigation_vim.kbd | 4 ++-- 9 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kanata/defalias/azerty_pc.kbd b/kanata/defalias/azerty_pc.kbd index 9ae8895..e6d8d10 100644 --- a/kanata/defalias/azerty_pc.kbd +++ b/kanata/defalias/azerty_pc.kbd @@ -8,6 +8,7 @@ sav C-s cls C-z ndo C-w + rdo C-y cut C-x cpy C-c pst C-v diff --git a/kanata/defalias/bepo_pc.kbd b/kanata/defalias/bepo_pc.kbd index b382f54..7b1e6e0 100644 --- a/kanata/defalias/bepo_pc.kbd +++ b/kanata/defalias/bepo_pc.kbd @@ -7,6 +7,7 @@ sav C-k cls C-] ndo C-[ + rdo C-x cut C-c cpy C-h pst C-u diff --git a/kanata/defalias/ergol_pc.kbd b/kanata/defalias/ergol_pc.kbd index 29b3106..d01e30b 100644 --- a/kanata/defalias/ergol_pc.kbd +++ b/kanata/defalias/ergol_pc.kbd @@ -7,6 +7,7 @@ sav C-s cls C-t ndo C-z + rdo C-p cut C-x cpy C-w pst C-v diff --git a/kanata/defalias/optimot_pc.kbd b/kanata/defalias/optimot_pc.kbd index d0aefcc..7a9503f 100644 --- a/kanata/defalias/optimot_pc.kbd +++ b/kanata/defalias/optimot_pc.kbd @@ -7,6 +7,7 @@ sav C-k cls C-v ndo C-] + rdo C-z cut C-[ cpy C-m pst C-/ diff --git a/kanata/defalias/qwerty-lafayette_pc.kbd b/kanata/defalias/qwerty-lafayette_pc.kbd index a02e862..52ceb83 100644 --- a/kanata/defalias/qwerty-lafayette_pc.kbd +++ b/kanata/defalias/qwerty-lafayette_pc.kbd @@ -7,6 +7,7 @@ sav C-s cls C-w ndo C-z + rdo C-y cut C-x cpy C-c pst C-v diff --git a/kanata/defalias/qwerty_mac.kbd b/kanata/defalias/qwerty_mac.kbd index c7a8a82..d37273f 100644 --- a/kanata/defalias/qwerty_mac.kbd +++ b/kanata/defalias/qwerty_mac.kbd @@ -7,6 +7,7 @@ sav M-s cls M-w ndo M-z + rdo M-y cut M-x cpy M-c pst M-v diff --git a/kanata/defalias/qwerty_pc.kbd b/kanata/defalias/qwerty_pc.kbd index e3e8143..02abd98 100644 --- a/kanata/defalias/qwerty_pc.kbd +++ b/kanata/defalias/qwerty_pc.kbd @@ -8,6 +8,7 @@ sav C-s cls C-w ndo C-z + rdo C-y cut C-x cpy C-c pst C-v diff --git a/kanata/defalias/qwertz_pc.kbd b/kanata/defalias/qwertz_pc.kbd index 08f9df7..ded44fc 100644 --- a/kanata/defalias/qwertz_pc.kbd +++ b/kanata/defalias/qwertz_pc.kbd @@ -8,6 +8,7 @@ sav C-s cls C-w ndo C-y + rdo C-z cut C-x cpy C-c pst C-v diff --git a/kanata/deflayer/navigation_vim.kbd b/kanata/deflayer/navigation_vim.kbd index d83bb46..4694a39 100644 --- a/kanata/deflayer/navigation_vim.kbd +++ b/kanata/deflayer/navigation_vim.kbd @@ -1,5 +1,5 @@ ;; Vim-Navigation layer: -;; - right: Vim-like arrows on HJKL, home/end page up/down, mouse scroll +;; - right: Vim-like arrows on HJKL, home/end page up/down, mouse scroll, Cmd/Ctrl-Y ;; - left: one-hand shortcuts (Cmd/Ctrl-WASZXCV), Tab/Shift-Tab, Alt-Tab, prev/next, Ctrl/Alt-Left/Right ;; - top: Super-num (i3/sway) or Alt-num (browser), zoom in/out @@ -10,7 +10,7 @@ M-1 M-2 M-3 M-4 M-5 lrld M-6 M-7 M-8 M-9 M-0 @pad @cls bck fwd @nwd home pgdn pgup end @run @all @sav S-tab tab @swp lft down up rght @fun - @ndo @cut @cpy @pst @pwd _ @mwl @mwd @mwu @mwr XX + @ndo @cut @cpy @pst @pwd _ @mwl @mwd @mwu @mwr @rdo del _ esc ) From 412fab4a34cf12f031b2d93805d9d5f14e18ebdc Mon Sep 17 00:00:00 2001 From: Florent Nuttens Date: Thu, 24 Oct 2024 00:34:20 +0200 Subject: [PATCH 4/4] doc(img): update vim_nagivation.svg --- img/vim_navigation.svg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/img/vim_navigation.svg b/img/vim_navigation.svg index 6ceeb7b..3532f5e 100644 --- a/img/vim_navigation.svg +++ b/img/vim_navigation.svg @@ -72,6 +72,7 @@ T + ↦ @@ -127,6 +128,7 @@ G + ⎌ @@ -194,6 +196,7 @@ B + ↤ @@ -228,6 +231,7 @@ / ? + redo