nvim: neovim 0.7 keymaps, plugins

2 files changed, 111 insertions, 97 deletions

diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index 3a37584..a324d90 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -5,168 +5,168 @@
 -- │▘▝ ▘▝▀▘▌  ▌  ▀▘▘ ▘▗▄▘▀▀ │
 -- └────────────────────────┘
 
--- map helper
-local function map(mode, lhs, rhs, opts)
-  local options = {noremap = true, silent = true}
-  if opts then options = vim.tbl_extend('force', options, opts) end
-  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-end
+-- -- map helper
+-- local function map(mode, lhs, rhs, opts)
+--   local options = {noremap = true, silent = true}
+--   if opts then options = vim.tbl_extend('force', options, opts) end
+--   vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+-- end
 
-local cmd = vim.cmd
-local M = {}
+-- local cmd = vim.cmd
+-- local M = {}
 
 -- brute force deasciify everything
-map('n', '<Leader>tc', 'TurkishDeasciifyForce()', {expr = true})
-map('x', '<Leader>tc', 'TurkishDeasciifyForce()', {expr = true})
-map('n', '<Leader>tctc', "TurkishDeasciifyForce() .. '_'", {expr = true})
+vim.keymap.set("n", "<leader>tc", "TurkishDeasciifyForce()", { expr = true })
+vim.keymap.set("n", "<leader>tctc", "TurkishDeasciifyForce() .. '_'", { expr = true })
+vim.keymap.set("x", "<leader>tc", "TurkishDeasciifyForce()", { expr = true })
 
 -- use turkish-mode to selectively deasciify
-map('n', '<Leader>tr', 'TurkishDeasciify()', {expr = true})
-map('x', '<Leader>tr', 'TurkishDeasciify()', {expr = true})
-map('n', '<Leader>trtr', "TurkishDeasciify() .. '_'", {expr = true})
+vim.keymap.set("n", "<Leader>tr", "TurkishDeasciify()", {expr = true})
+vim.keymap.set("n", "<Leader>trtr", "TurkishDeasciify() .. '_'", {expr = true})
+vim.keymap.set("x", "<Leader>tr", "TurkishDeasciify()", {expr = true})
 
 -- ascii everything
-map('n', '<Leader>rt', 'TurkishAsciify()', {expr = true})
-map('x', '<Leader>rt', 'TurkishAsciify()', {expr = true})
-map('n', '<Leader>rtrt', "TurkishAsciify() .. '_'", {expr = true})
+vim.keymap.set("n", "<Leader>rt", "TurkishAsciify()", {expr = true})
+vim.keymap.set("n", "<Leader>rtrt", "TurkishAsciify() .. '_'", {expr = true})
+vim.keymap.set("x", "<Leader>rt", "TurkishAsciify()", {expr = true})
 
 -- https://stackoverflow.com/questions/4256697/vim-search-and-highlight-but-do-not-jump
 -- search & highlight but do not jump
-map('n', '*', ':keepjumps normal! mi*`i<CR>')
-map('n', '#', ':keepjumps normal! mi#`i<CR> ')
+vim.keymap.set("n", "*", ":keepjumps normal! mi*`i<CR>")
+vim.keymap.set("n", "#", ":keepjumps normal! mi#`i<CR>")
 
 -- save file as sudo on files that require root permission
-map('c', 'w!!', 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!<CR>', { silent = false })
+vim.keymap.set("c", "w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!<CR>', { silent = false })
 
 -- replace ex mode with gq (format lines)
-map('n', 'Q', 'gq')
+vim.keymap.set('n', 'Q', 'gq')
 
 -- set formatprg to sentences, for prose
-map('n', '<Leader>fp', ":set formatprg=~/.local/bin/sentences<CR>", { silent = false })
+vim.keymap.set('n', '<Leader>fp', ":set formatprg=~/.local/bin/sentences<CR>", { silent = false })
 
 -- replace all is aliased to S.
-map('n', 'S', ':%s//g<Left><Left>', { silent = false })
-map('v', 'S', ':s//g<Left><Left>', { silent = false })
+vim.keymap.set('n', 'S', ':%s//g<Left><Left>', { silent = false })
+vim.keymap.set('v', 'S', ':s//g<Left><Left>', { silent = false })
 
 -- jump to buffer
-map('n', '<Leader>b', ':ls<cr>:b<space>')
+vim.keymap.set('n', '<Leader>b', ':ls<cr>:b<space>')
 
 -- up and down are more logical with g..
-map('n', 'k', '(v:count == 0 ? "gk" : "k")', { expr = true })
-map('n', 'j', '(v:count == 0 ? "gj" : "j")', { expr = true })
-map('i', '<Up>', '<Esc>gka')
-map('i', '<Down>', '<Esc>gja')
+vim.keymap.set('n', 'k', '(v:count == 0 ? "gk" : "k")', { expr = true })
+vim.keymap.set('n', 'j', '(v:count == 0 ? "gj" : "j")', { expr = true })
+vim.keymap.set('i', '<Up>', '<Esc>gka')
+vim.keymap.set('i', '<Down>', '<Esc>gja')
 
--- disable highlight when <leader><cr> is pressed
-map('n', '<Leader><Cr>', ':noh<Cr>')
 -- space used to toggle folds, now it's x (because x is d)
-map('n', '<Space>', '"_x')
+vim.keymap.set('n', '<Space>', '"_x')
 
 -- separate cut and delete
-map('n', 'x', 'd')
-map('x', 'x', 'd')
-map('n', 'xx', 'dd')
-map('n', 'X', 'D')
+vim.keymap.set('n', 'x', 'd')
+vim.keymap.set('x', 'x', 'd')
+vim.keymap.set('n', 'xx', 'dd')
+vim.keymap.set('n', 'X', 'D')
 
 -- change into pwd of current directory
-map('n', '<Leader>cd', ':lcd %:p:h<CR>:pwd<CR>')
+vim.keymap.set('n', '<Leader>cd', ':lcd %:p:h<CR>:pwd<CR>')
 
 -- press \g and start writing prose
-map('n', '<Leader>g', ':Goyo<CR>')
+vim.keymap.set('n', '<Leader>g', ':Goyo<CR>')
 
 -- call CreatePaper on word below cursor
-map('n', '<leader>np', 'gewi[[/papers/<ESC>Ea]]<ESC>bb:call CreatePaper(expand("<cword>"))<CR>')
+vim.keymap.set('n', '<leader>np', 'gewi[[/papers/<ESC>Ea]]<ESC>bb:call CreatePaper(expand("<cword>"))<CR>')
 
 -- link paper
-map('n', '<leader>lp', 'gewi[[/papers/<ESC>Ea]]<ESC>')
+vim.keymap.set('n', '<leader>lp', 'gewi[[/papers/<ESC>Ea]]<ESC>')
 
 -- call CreateReference on word below cursor
-map('n', '<leader>nr', ':call CreateReference(expand("<cword>"))<CR>')
+vim.keymap.set('n', '<leader>nr', ':call CreateReference(expand("<cword>"))<CR>')
 
 -- create a new note
-map('n', '<leader>nn', ':call CreateNote()<CR>')
+vim.keymap.set('n', '<leader>nn', ':call CreateNote()<CR>')
 
 -- :%% to get current file path
-map('c', '%%', "getcmdtype() == ':' ? expand('%:h').'/' : '%%'", { expr = true, silent = false })
+vim.keymap.set('c', '%%', "getcmdtype() == ':' ? expand('%:h').'/' : '%%'", { expr = true, silent = false })
 
 -- reselect visual selection after indent
-map('v', '>', '>gv')
-map('v', '<', '<gv')
+vim.keymap.set('v', '>', '>gv')
+vim.keymap.set('v', '<', '<gv')
 
 -- keep cursor position after visual yank
-map('v', 'y', 'myy`y')
-map('v', 'Y', 'myY`y')
+vim.keymap.set('v', 'y', 'myy`y')
+vim.keymap.set('v', 'Y', 'myY`y')
 
 -- plug mappings {{{ --
-
--- <Plug> mappings should not be noremap
--- https://www.reddit.com/r/vim/comments/78izt4/please_help_understand_how_to_use_plug_mapping/
-local function plugmap(mode, lhs, rhs, opts)
-  local options = {noremap = false, silent = true}
-  if opts then options = vim.tbl_extend('force', options, opts) end
-  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-end
-
--- open the TagBar Plugin
-plugmap('n', '<F3>', ':TagbarToggle<CR>')
+-- New vim.keymap.set handles Plug mappings, I think, remove this paragraph if nothing breaks in the upcoming days
+-- -- <Plug> mappings should not be noremap
+-- -- https://www.reddit.com/r/vim/comments/78izt4/please_help_understand_how_to_use_plug_mapping/
+-- local function plugmap(mode, lhs, rhs, opts)
+--   local options = {noremap = false, silent = true}
+--   if opts then options = vim.tbl_extend('force', options, opts) end
+--   vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+-- end
 
 -- sneak using grave, s is for sandwich
-plugmap('n', '`', '<Plug>Sneak_s')
-plugmap('n', '`', '<Plug>Sneak_s')
-plugmap('n', '<Leader>`', '<Plug>Sneak_S')
-map('n', "'", '`')
+vim.keymap.set('n', '`', '<Plug>Sneak_s')
+vim.keymap.set('n', '`', '<Plug>Sneak_s')
+vim.keymap.set('n', '<Leader>`', '<Plug>Sneak_S')
+vim.keymap.set('n', "'", '`')
 
 -- use the special yoink paste that rotates
-plugmap('n', 'p', '<Plug>(YoinkPaste_p)')
-plugmap('n', 'P', '<Plug>(YoinkPaste_P)')
+vim.keymap.set('n', 'p', '<Plug>(YoinkPaste_p)')
+vim.keymap.set('n', 'P', '<Plug>(YoinkPaste_P)')
 
 -- substitute from yank
-plugmap('n', '<Leader>ys', '<plug>(SubversiveSubstitute)')
-plugmap('n', '<Leader>yss', '<plug>(SubversiveSubstituteLine)')
-plugmap('n', '<Leader>yS', '<plug>(SubversiveSubstituteToEndOfLine)')
+vim.keymap.set('n', '<Leader>ys', '<plug>(SubversiveSubstitute)')
+vim.keymap.set('n', '<Leader>yss', '<plug>(SubversiveSubstituteLine)')
+vim.keymap.set('n', '<Leader>yS', '<plug>(SubversiveSubstituteToEndOfLine)')
 
 -- substitute over range
-plugmap('n', '<Leader>s', '<plug>(SubversiveSubstituteRange)')
-plugmap('x', '<Leader>s', '<plug>(SubversiveSubstituteRange)')
-plugmap('n', '<Leader>ss', '<plug>(SubversiveSubstituteWordRange)')
+vim.keymap.set('n', '<Leader>s', '<plug>(SubversiveSubstituteRange)')
+vim.keymap.set('x', '<Leader>s', '<plug>(SubversiveSubstituteRange)')
+vim.keymap.set('n', '<Leader>ss', '<plug>(SubversiveSubstituteWordRange)')
 
 -- subvert over range
-plugmap('n', '<Leader><Leader>s', '<plug>(SubversiveSubvertRange)')
-plugmap('x', '<Leader><Leader>s', '<plug>(SubversiveSubvertRange)')
-plugmap('n', '<Leader><Leader>ss', '<plug>(SubversiveSubvertWordRange)')
+vim.keymap.set('n', '<Leader><Leader>s', '<plug>(SubversiveSubvertRange)')
+vim.keymap.set('x', '<Leader><Leader>s', '<plug>(SubversiveSubvertRange)')
+vim.keymap.set('n', '<Leader><Leader>ss', '<plug>(SubversiveSubvertWordRange)')
 
 -- iterate over yank list
-plugmap('n', '<c-n>', '<Plug>(YoinkPostPasteSwapBack)')
-plugmap('n', '<c-p>', '<Plug>(YoinkPostPasteSwapForward)')
+vim.keymap.set('n', '<c-n>', '<Plug>(YoinkPostPasteSwapBack)')
+vim.keymap.set('n', '<c-p>', '<Plug>(YoinkPostPasteSwapForward)')
 
 -- checkmarks on vimwiki
-plugmap('n', '<leader>v', '<Plug>VimwikiToggleListItem')
+vim.keymap.set('n', '<leader>v', '<Plug>VimwikiToggleListItem')
 -- add/increase header level
-plugmap('n', '<leader>a', '<Plug>VimwikiAddHeaderLevel')
+vim.keymap.set('n', '<leader>a', '<Plug>VimwikiAddHeaderLevel')
 
 -- vim-test bindings
-map('n', 't<C-n>', ':TestNearest<CR>')
-map('n', 't<C-f>', ':TestFile<CR>')
-map('n', 't<C-s>', ':TestSuite<CR>')
-map('n', 't<C-l>', ':TestLast<CR>')
-map('n', 't<C-g>', ':TestVisit<CR>')
+vim.keymap.set('n', 't<C-n>', ':TestNearest<CR>')
+vim.keymap.set('n', 't<C-f>', ':TestFile<CR>')
+vim.keymap.set('n', 't<C-s>', ':TestSuite<CR>')
+vim.keymap.set('n', 't<C-l>', ':TestLast<CR>')
+vim.keymap.set('n', 't<C-g>', ':TestVisit<CR>')
 
 -- telescope bindings
-map('n', '<leader>ff', "<cmd>lua require('telescope.builtin').find_files()<cr>")
-map('n', '<leader>fg', "<cmd>lua require('telescope.builtin').live_grep()<cr>")
-map('n', '<leader>fb', "<cmd>lua require('telescope.builtin').buffers()<cr>")
-map('n', '<leader>fh', "<cmd>lua require('telescope.builtin').help_tags()<cr>")
+vim.keymap.set('n', '<leader>ff', "<cmd>lua require('telescope.builtin').find_files()<cr>")
+vim.keymap.set('n', '<leader>fg', "<cmd>lua require('telescope.builtin').live_grep()<cr>")
+vim.keymap.set('n', '<leader>fb', "<cmd>lua require('telescope.builtin').buffers()<cr>")
+vim.keymap.set('n', '<leader>fh', "<cmd>lua require('telescope.builtin').help_tags()<cr>")
 
 -- vista
-map('n', '<F3>', ":Vista focus<cr>")
-map('n', '<F4>', ":Vista finder<cr>")
-
--- toggle rose pine theme
-map('n', '<F5>', [[<cmd>lua require('rose-pine.functions').toggle_variant({'dawn', 'base'})<cr>]], { noremap = true, silent = true })
+vim.keymap.set('n', '<F3>', ":Vista focus<cr>")
+vim.keymap.set('n', '<F4>', ":Vista finder<cr>")
 
 -- nvim tree mappings
-map('n', 'vt', ':NvimTreeToggle<CR>')
-map('n', 'vr', ':NvimTreeRefresh<CR>')
-map('n', 'vs', ':NvimTreeFindFile<CR>')
+vim.keymap.set('n', 'vt', ':NvimTreeToggle<CR>')
+vim.keymap.set('n', 'vr', ':NvimTreeRefresh<CR>')
+vim.keymap.set('n', 'vs', ':NvimTreeFindFile<CR>')
+
+-- dial.nvim mappings
+vim.keymap.set("n", "<C-a>", require("dial.map").inc_normal(), {noremap = true})
+vim.keymap.set("n", "<C-x>", require("dial.map").dec_normal(), {noremap = true})
+vim.keymap.set("v", "<C-a>", require("dial.map").inc_visual(), {noremap = true})
+vim.keymap.set("v", "<C-x>", require("dial.map").dec_visual(), {noremap = true})
+vim.keymap.set("v", "g<C-a>", require("dial.map").inc_gvisual(), {noremap = true})
+vim.keymap.set("v", "g<C-x>", require("dial.map").dec_gvisual(), {noremap = true})
 
 -- }}} plug mappings --
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 3266aeb..a217616 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -19,6 +19,18 @@ return require('packer').startup(function()
     }
     -- quickstart lsp config
     use 'neovim/nvim-lspconfig'
+
+    -- annotation generator
+    -- learn to use it 2022-05-17 00:44
+    -- https://github.com/danymat/neogen
+    use {
+        "danymat/neogen",
+        config = function()
+            require('neogen').setup {}
+        end,
+        requires = "nvim-treesitter/nvim-treesitter",
+    }
+
     -- dashboard
     use {
         'goolord/alpha-nvim',
@@ -67,7 +79,6 @@ return require('packer').startup(function()
 
     -- file explorer
     use 'kyazdani42/nvim-tree.lua'
-
     -- viewer & finder for lsp symbols and tags
     use 'liuchengxu/vista.vim'
 
@@ -77,6 +88,7 @@ return require('packer').startup(function()
         cmd = 'UndotreeToggle',
         config = [[vim.g.undotree_SetFocusWhenToggle = 1]],
     }
+
     -- highlight colors
     use 'norcalli/nvim-colorizer.lua'
 
@@ -112,6 +124,8 @@ return require('packer').startup(function()
     use 'justinmk/vim-sneak'
     -- additional text objects, don't remove this ever again you fuck
     use 'wellle/targets.vim'
+    -- enhanced increment/decrement plugin ala speeddating
+    use 'monaqa/dial.nvim'
 
     -- statusline of the $CURRENT_YEAR
     use {
@@ -121,6 +135,8 @@ return require('packer').startup(function()
     -- colour theme of the $CURRENT_YEAR
     use 'rose-pine/neovim'
 
+    -- search for, substitute, and abbreviate multiple variants of a word
+    use 'tpope/vim-abolish'
     -- enable repeating supported plugin maps with '.'
     use 'tpope/vim-repeat'
     -- pairs of handy bracket mappings
@@ -129,8 +145,6 @@ return require('packer').startup(function()
     use {
         'tpope/vim-fugitive', cmd = {'Git', 'Gstatus', 'Gblame', 'Gpush', 'Gpull'}
     }
-    -- increment dates, times & more
-    use 'tpope/vim-speeddating'
     -- provides ga, show unicode stuff of char under cursor
     use 'tpope/vim-characterize'
     -- comment helper