Neovim: worked more on completions, and changed a few other things in keymaps and options

1 files changed, 18 insertions, 8 deletions

diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index 6772f0f..a48679e 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -1,18 +1,26 @@
 local set = vim.keymap.set
 local silent = { silent = true }
+---@param mode string|table
+---@param keymap string
+local function unbind(mode, keymap)
+    set(mode, keymap, function() end)
+end
 
 -- Misc
 set({ 'n', 'i' }, '<C-a>', '<Esc>ggVG', { desc = 'Visually Highlight [A]ll' })
-set('n', '<Esc>', ':nohlsearch<CR>', silent)
-set({ 'i', 'c' }, '<C-v>', '<C-r>+')
+set('n', '<Esc>', '<cmd>nohlsearch<CR>', silent)
+set({ 'i', 'c' }, '<C-v>', function()
+    vim.fn.getreg('+')
+end)
 set('n', '<leader>z', function()
     vim.cmd('Neotree close')
     vim.cmd('Trouble todo close')
     vim.cmd('UndotreeHide')
 end, { desc = '[Z]en Mode', silent = true })
+unbind({ 'i', 'n', 'v' }, '<C-r>')
 
-set('n', 'U', ':redo<cr>')
-set('i', '<C-z>', ':undo<cr>')
+set('n', 'U', '<cmd>redo<cr>')
+set('i', '<C-z>', '<cmd>undo<cr>')
 
 -- Window Navigation
 set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
@@ -22,10 +30,10 @@ set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
 
 -- Window resizing
 local resize = 2
-set({ 'n', 't' }, '<C-Left>', string.format(':vertical resize -%d<CR>', resize), { desc = 'Resize Left' })
-set({ 'n', 't' }, '<C-Up>', string.format(':resize -%d<CR>', resize), { desc = 'Resize Up' })
-set({ 'n', 't' }, '<C-Down>', string.format(':resize +%d<CR>', resize), { desc = 'Resize Down' })
-set({ 'n', 't' }, '<C-Right>', string.format(':vertical resize +%d<CR>', resize), { desc = 'Resize Right' })
+set({ 'n', 't' }, '<C-Left>', string.format('<cmd>vertical resize -%d<CR>', resize), { desc = 'Resize Left' })
+set({ 'n', 't' }, '<C-Up>', string.format('<cmd>resize -%d<CR>', resize), { desc = 'Resize Up' })
+set({ 'n', 't' }, '<C-Down>', string.format('<cmd>resize +%d<CR>', resize), { desc = 'Resize Down' })
+set({ 'n', 't' }, '<C-Right>', string.format('<cmd>vertical resize +%d<CR>', resize), { desc = 'Resize Right' })
 
 -- Keep selection after < and > in visual mode
 set('v', '<', '<gv')
@@ -34,3 +42,5 @@ set('v', '>', '>gv')
 -- Execute lua file or line
 set('n', '<leader>x', '<cmd>.lua<CR>', { desc = 'Execute the current line' })
 set('n', '<leader><leader>x', '<cmd>source %<CR>', { desc = 'Execute the current file' })
+
+print('Sourced keymaps.lua')