nvim: update plugins

.config/nvim/lazy-lock.json

@@ -12,7 +12,7 @@
   "fterm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
   "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" },
   "git-blame.nvim": { "branch": "master", "commit": "f07e913b7143f19edd6787229f2d51759b478600" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6e05045fb1a4845fe44f5c54aafe024444c422ba" },
+  "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
   "knap": { "branch": "main", "commit": "503010f541696e99ed5c62f658620e546cebf8b0" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
@@ -20,6 +20,7 @@
   "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
   "luasnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" },
+  "mapx.nvim": { "branch": "main", "commit": "c3dd43474a5fc2f266309bc04a69b74eb2524671" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "d1f7258f80867f718d643d88eee66959671a4bef" },
   "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
@@ -28,12 +29,12 @@
   "nvim-cmp": { "branch": "main", "commit": "41d7633e4146dce1072de32cea31ee31b056a131" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
   "nvim-hlslens": { "branch": "main", "commit": "9bd8d6b155fafc59da18291858c39f115464287c" },
-  "nvim-lspconfig": { "branch": "master", "commit": "bd405e45c5fb122c16af8f87fa2dd7ab1981b243" },
+  "nvim-lspconfig": { "branch": "master", "commit": "f451052bd6804e9e5ccd0ac874d7df8d3d4c55b9" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
   "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
   "nvim-tree.lua": { "branch": "master", "commit": "141c0f97c35f274031294267808ada59bb5fb08e" },
-  "nvim-treesitter": { "branch": "master", "commit": "a6c655629cad421e432aa84af32cbfe35375113a" },
+  "nvim-treesitter": { "branch": "master", "commit": "78d75bce03f218ee30aedb6e24e3ec1189a3e9ff" },
   "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
   "nvim-ufo": { "branch": "main", "commit": "9fa77fb7e4365a053a5303b773aaf5eaf806d1f4" },
@@ -45,7 +46,7 @@
   "renamer.nvim": { "branch": "develop", "commit": "1614d466df53899f11dd5395eaac3c09a275c384" },
   "spelunker.vim": { "branch": "master", "commit": "a0bc530f62798bbe053905555a4aa9ed713485eb" },
   "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
-  "tccs.nvim": { "branch": "master", "commit": "5033d196105edf35c09f02beaa9b56d57f998618" },
+  "tccs.nvim": { "branch": "master", "commit": "fa75ae924ac0131c6f4c68b9ad4d18e0a8f5e14d" },
   "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
   "tidy.nvim": { "branch": "main", "commit": "e564b500f20a52bf668c309807908edebf0bc652" },
   "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
@@ -54,5 +55,6 @@
   "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" },
   "vim-markdown": { "branch": "master", "commit": "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a" },
   "vim-renamer": { "branch": "master", "commit": "9c6346eb4556cf2d8ca55de6969247ab14fe2383" },
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
   "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
 }

.config/nvim/lua/keymap.lua

@@ -1,34 +1,3 @@
--- unmap unwanted commands
-vim.keymap.set({ 'n', 'v' }, '<Space>', '<NOP>', { silent = true })
-vim.keymap.set({ 'n', 'i' }, '<F1>', '<NOP>', { noremap = true })
-vim.keymap.set('i', '<F2>', '<NOP>', { noremap = true })
-vim.keymap.set('i', '<F3>', '<NOP>', { noremap = true })
-vim.keymap.set('i', '<F4>', '<NOP>', { noremap = true })
-vim.keymap.set('i', '<F5>', '<NOP>', { noremap = true })
-vim.keymap.set('i', '<F6>', '<NOP>', { noremap = true })
-vim.keymap.set('i', '<F8>', '<NOP>', { noremap = true })
-vim.keymap.set({ 'n', 'i' }, '<F9>', '<NOP>', { noremap = true })
-vim.keymap.set({ 'n', 'i' }, '<F10>', '<NOP>', { noremap = true })
-vim.keymap.set({ 'n', 'i' }, '<F11>', '<NOP>', { noremap = true })
-vim.keymap.set({ 'n', 'i' }, '<F12>', '<NOP>', { noremap = true })
-
--- shortcut for split navigation
-vim.keymap.set('n', '<C-h>', '<C-w>h', { noremap = true })
-vim.keymap.set('n', '<C-j>', '<C-w>j', { noremap = true })
-vim.keymap.set('n', '<C-k>', '<C-w>k', { noremap = true })
-vim.keymap.set('n', '<C-l>', '<C-w>l', { noremap = true })
-
--- compiler for languages
-vim.keymap.set('n', '<leader>c', ':w! | !compiler <c-r>%<CR>', { noremap = true })
-
--- save file as sudo on files that require root permission
-vim.keymap.set('c', 'w!!', 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!', { noremap = true })
-
--- easy substitution for whole file and line, visual mode
-vim.keymap.set('n', '<leader>ss', ':%s/\\<<C-r><C-w>\\>//g<Left><Left>', { noremap = true })
-vim.keymap.set({ 'n', 'v' }, '<leader>sl', ':s//g<Left><Left>', { noremap = true })
-vim.keymap.set('n', '<leader>sa', ':%s//g<Left><Left>', { noremap = true })
-
 -- highlighting yanked regions
 local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
 vim.api.nvim_create_autocmd('TextYankPost', {
@@ -38,75 +7,111 @@ vim.api.nvim_create_autocmd('TextYankPost', {
   group = highlight_group,
 })
 
--- remap for dealing with word wrap
-vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'",
-  {
-    expr = true,
-    silent = true
-  })
+-- setup keymap function
+local m = require 'mapx'.setup { global = true, whichkey = true }
 
-vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'",
-  {
-    expr = true,
-    silent = true
-  })
+-- setup keymap groups
+m.nname("g", "LSP: goto")
+m.cname("w", "Write")
+m.cname("w!", "Write: overwrite")
+m.nname("<leader>g", "Git")
+m.nname("<leader>gd", "Git: diff")
+m.nname("<leader>s", "Substitute")
+m.nname("<leader>t", "Terminal")
+
+-- unmap unwanted commands
+m.nnoremap("Zt",  '<NOP>')
+m.nnoremap("ZT",  '<NOP>')
+m.nnoremap("<Space>",  '<NOP>')
+m.inoremap("<F1>",  '<NOP>')
+m.nnoremap("<F1>",  '<NOP>')
+m.inoremap("<F2>",  '<NOP>')
+m.inoremap("<F3>",  '<NOP>')
+m.inoremap("<F4>",  '<NOP>')
+m.inoremap("<F5>",  '<NOP>')
+m.inoremap("<F6>",  '<NOP>')
+m.inoremap("<F8>",  '<NOP>')
+m.inoremap("<F9>",  '<NOP>')
+m.nnoremap("<F9>",  '<NOP>')
+m.inoremap("<F10>",  '<NOP>')
+m.nnoremap("<F10>",  '<NOP>')
+m.inoremap("<F11>",  '<NOP>')
+m.nnoremap("<F11>",  '<NOP>')
+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')
+
+-- remap for dealing with word wrap
+m.nmap('j', "v:count == 0 ? 'gj' : 'j'", { "expr", "silent" }, 'Navigation: go down in wrapped lines')
+m.nmap('k', "v:count == 0 ? 'gk' : 'k'", { "expr", "silent" }, 'Navigation: go up in wrapped lines')
+
+-- compiler for languages
+m.nnoremap("<leader>c",   ':w! | !compiler <c-r>%<CR>', 'Compile: current file')
+
+-- save file as sudo on files that require root permission
+m.cnoremap("w!!",    'execute "silent! write !sudo tee % >/dev/null" <bar> edit!', 'Write: overwrite file over with sudo')
+
+-- easy substitution for whole file and line, visual mode
+m.nnoremap("<leader>sa",     ':%s//g<Left><Left>', 'Substitute: free form')
+m.nnoremap("<leader>ss",    ':%s/\\<<C-r><C-w>\\>//g<Left><Left>', 'Substitute: word under cursor')
 
 -- stevearc/aerial.nvim
-vim.keymap.set('n', '<F3>', ':AerialToggle!<CR>', {})
+m.nmap('<F3>', ':AerialToggle!<CR>', 'CTags: toggle')
 
 -- nvim-tree/nvim-tree.lua
-vim.keymap.set('n', '<F2>', ':NvimTreeToggle toggle<CR>', {})
+m.nmap("<F2>", ':NvimTreeToggle toggle<CR>', 'File tree: toggle')
 
 -- numtostr/fterm.nvim
-vim.keymap.set({ 'n', 't' }, '<leader>t', require("FTerm").toggle, { noremap = true })
+m.nnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: open')
+m.tnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: open')
 local lazygit = require("FTerm"):new({
   cmd = 'lazygit',
 })
-vim.keymap.set({ 'n', 't' }, '<leader>gt', function() lazygit:toggle() end)
+m.nnoremap("<leader>gt", function() lazygit:toggle() end, 'Git: open lazygit')
+m.tnoremap("<leader>gt", function() lazygit:toggle() end, 'Git: open lazygit')
+m.nnoremap("<leader>tg", function() lazygit:toggle() end, 'Terminal: open lazygit')
+m.tnoremap("<leader>tg", function() lazygit:toggle() end, 'Terminal: open lazygit')
 
 -- sindrets/diffview.nvim
-vim.keymap.set('n', '<leader>gdo', ":DiffviewOpen<CR>")
-vim.keymap.set('n', '<leader>gdc', ":DiffviewClose<CR>")
+m.nmap("<leader>gdo", ":DiffviewOpen<CR>", "Git: open diff")
+m.nmap("<leader>gdc", ":DiffviewClose<CR>", "Git: close diff")
 
 -- folke/trouble.nvim
-vim.keymap.set('n', '<leader>x', ":TroubleToggle<CR>")
+m.nmap("<leader>x", ":TroubleToggle<CR>", "LSP: toggle error list")
 
 -- hrsh7th/nvim-cmp
-vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true })
-vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true })
-vim.keymap.set('n', 'gy', vim.lsp.buf.type_definition, { noremap = true })
-vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { noremap = true })
-vim.keymap.set('n', 'gr', vim.lsp.buf.references, { noremap = true })
-vim.keymap.set('n', 'K', vim.lsp.buf.hover, { noremap = true })
-vim.keymap.set('n', '<F8>', function()
-  require("conform").format({ async = true, lsp_fallback = true })
-end, { noremap = true })
+m.nnoremap("gd", vim.lsp.buf.definition, "LSP: goto definition")
+m.nnoremap("gD", vim.lsp.buf.declaration, "LSP: goto declaration")
+m.nnoremap("gi", vim.lsp.buf.implementation, "LSP: list implementation")
+m.nnoremap("gr", vim.lsp.buf.references, "LSP: list references")
+m.nnoremap("gy", vim.lsp.buf.type_definition, "LSP: goto type definition")
+m.nnoremap("K", vim.lsp.buf.hover, "LSP: show documentation")
+m.nnoremap("<F8>", function() require("conform").format({ async = true, lsp_fallback = true }) end, "LSP: format")
 
 -- filipdutescu/renamer.nvim
-vim.keymap.set('n', '<F5>', require("renamer").rename, { noremap = true })
+m.nnoremap("<F5>", require("renamer").rename, "LSP: rename")
 
 -- nvim-telescope/telescope.nvim
-vim.keymap.set('n', '<F4>', ':Telescope find_files<CR>', { noremap = true })
+m.nnoremap("<F4>",  ':Telescope find_files<CR>', "Telescope: find files")
 
 -- kamykn/spelunker.vim
-vim.keymap.set('n', '<F6>', ':call spelunker#toggle()<CR>', { noremap = true })
-vim.keymap.set('n', 'ZT', '<NOP>', { noremap = true })
-vim.keymap.set('n', 'Zt', '<NOP>', { noremap = true })
+m.nnoremap("<F6>",  ':call spelunker#toggle()<CR>', "Spelling: toggle spell check")
 
 -- kevinhwang91/nvim-ufo
-vim.keymap.set('n', 'K', function()
+m.nnoremap("K", function()
   local winid = require('ufo').peekFoldedLinesUnderCursor()
   if not winid then
     vim.lsp.buf.hover()
   end
-end)
+end, "LSP: peek folded section")
 
 -- kevinhwang91/nvim-hlslens
-local kopts = {noremap = true, silent = true}
-
-vim.api.nvim_set_keymap('n', 'n',
-    [[<Cmd>execute('normal! ' . v:count1 . 'n')<CR><Cmd>lua require('hlslens').start()<CR>]],
-    kopts)
-vim.api.nvim_set_keymap('n', 'N',
-    [[<Cmd>execute('normal! ' . v:count1 . 'N')<CR><Cmd>lua require('hlslens').start()<CR>]],
-    kopts)
+m.nnoremap("n", [[<Cmd>execute('normal! ' . v:count1 . 'n')<CR><Cmd>lua require('hlslens').start()<CR>]],
+  'silent', "Search: search forward")
+m.nnoremap("N", [[<Cmd>execute('normal! ' . v:count1 . 'N')<CR><Cmd>lua require('hlslens').start()<CR>]],
+  'silent', "Search: search backwards")

.config/nvim/lua/plugins/mapx.lua

@@ -0,0 +1,9 @@
+return {
+  -- improved keybindings, previewing them
+  {
+    "b0o/mapx.nvim",
+    dependencies = {
+      "folke/which-key.nvim",
+      }
+    }
+  }