nvim: added leap for improved movement

.config/nvim/lazy-lock.json

@@ -17,6 +17,7 @@
   "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
   "knap": { "branch": "main", "commit": "d4ea571d2d4e139d288b758c5bab31788d30eea3" },
   "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
+  "leap.nvim": { "branch": "main", "commit": "25753d8a16b69fbbce5d392702c21dbc79d86bd1" },
   "lsp_signature.nvim": { "branch": "master", "commit": "e92b4e7073345b2a30a56b20db3d541a9aa2771e" },
   "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" },
@@ -61,5 +62,6 @@
   "vim-markdown": { "branch": "master", "commit": "a657e697376909c41475a686eeef7fc7a4972d94" },
   "vim-renamer": { "branch": "master", "commit": "9c6346eb4556cf2d8ca55de6969247ab14fe2383" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
-  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
+  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" },
+  "winshift.nvim": { "branch": "main", "commit": "37468ed6f385dfb50402368669766504c0e15583" }
 }

.config/nvim/lua/keymap.lua

@@ -19,6 +19,7 @@ m.nname("<leader>g", "Git")
 m.nname("<leader>gd", "Git: diff")
 m.nname("<leader>s", "Substitute")
 m.nname("<leader>t", "Terminal")
+m.nname("<C-W>", "Navigation")
 
 -- unmap unwanted commands
 m.nnoremap("Zt", '<NOP>')
@@ -40,10 +41,10 @@ m.inoremap("<F12>", '<NOP>')
 m.nnoremap("<F12>", '<NOP>')
 
 -- shortcut for split navigation
-m.nnoremap("<C-h>", '<C-w>h', 'Navigation: go to left split')
-m.nnoremap("<C-j>", '<C-w>j', 'Navigation: go to lower split')
-m.nnoremap("<C-k>", '<C-w>k', 'Navigation: go to upper split')
-m.nnoremap("<C-l>", '<C-w>l', 'Navigation: go to right split')
+m.nnoremap("<C-h>", '<C-w>h', 'Navigation: go to left window')
+m.nnoremap("<C-j>", '<C-w>j', 'Navigation: go to lower window')
+m.nnoremap("<C-k>", '<C-w>k', 'Navigation: go to upper window')
+m.nnoremap("<C-l>", '<C-w>l', 'Navigation: go to right window')
 
 -- remap for dealing with word wrap
 m.nmap('j', "v:count == 0 ? 'gj' : 'j'", { "expr", "silent" }, 'Navigation: go down in wrapped lines')
@@ -128,3 +129,11 @@ m.nnoremap("n", [[<Cmd>execute('normal! ' . v:count1 . 'n')<CR><Cmd>lua require(
   'silent', "Search: search forward")
 m.nnoremap("N", [[<Cmd>execute('normal! ' . v:count1 . 'N')<CR><Cmd>lua require('hlslens').start()<CR>]],
   'silent', "Search: search backwards")
+
+-- sindrets/winshift.nvim
+m.nnoremap("<C-W>m", ":WinShift<CR>", "Navigation: enter window shift mode")
+
+-- ggandor/leap.nvim
+m.nnoremap("s", "<Plug>(leap-forward)", "Navigation: enter leap mode for forward movement")
+m.nnoremap("S", "<Plug>(leap-backward)", "Navigation: enter leap mode for backwards movement")
+m.nnoremap("gs", "<Plug>(leap-from-window", "Navigation: enter leap mode for other windows")

.config/nvim/lua/plugins/leap.lua

@@ -0,0 +1,15 @@
+return {
+  -- improved movement
+  {
+    "ggandor/leap.nvim",
+    config = function()
+      require("leap").opts.highlight_unlabeled_phase_one_targets = true
+      require("leap").opts.equivalence_classes = { " \t\r\n", "([{", ")]}", "'\"`" }
+      require("leap").opts.special_keys.prev_target = "<backspace>"
+      require("leap").opts.special_keys.prev_group = "<backspace>"
+      require("leap.user").set_repeat_keys("<enter>", "<backspace>")
+      require("leap").opts.safe_labels = "sfnut/SFNLHMUGTZ?"
+      require("leap").opts.labels = "sfnjklhodweimbuyvrgtaqpcxz/SFNJKLHODWEIMBUYVRGTAQPCXZ?"
+    end,
+  },
+}

.config/nvim/lua/plugins/winshift.lua

@@ -0,0 +1,7 @@
+return {
+  -- improved movement of windows
+  {
+    "sindrets/winshift.nvim",
+    opts = {},
+  },
+}