Neovim: started rework on the conifg, changed a bunch of stuff

1 files changed, 25 insertions, 19 deletions

diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index e8e2b29..f6d67ec 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -1,29 +1,35 @@
+local set = vim.keymap.set
+local silent = { silent = true }
+
 -- Misc
-vim.keymap.set({ 'n', 'i' }, '<C-a>', '<Esc>ggVG', { desc = 'Visually Highlight [A]ll' })
-vim.keymap.set('n', '<Esc>', ':nohlsearch<CR>')
-vim.keymap.set('n', '<leader>z', function()
+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', '<leader>z', function()
     vim.cmd('Neotree close')
     vim.cmd('Trouble todo close')
-end, { desc = '[Z]en Mode' })
-vim.keymap.set({ 'i', 'c' }, '<C-v>', '<C-r>+')
+end, { desc = '[Z]en Mode', silent = true })
 
--- Undo/Redo
-vim.keymap.set('n', 'U', ':redo<cr>')
-vim.keymap.set('i', '<C-z>', ':undo<cr>')
+set('n', 'U', ':redo<cr>')
+set('i', '<C-z>', ':undo<cr>')
 
 -- Window Navigation
-vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
-vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the down window' })
-vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the up window' })
-vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
+set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
+set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the down window' })
+set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the up window' })
+set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
 
 -- Window resizing
 local resize = 2
-vim.keymap.set({ 'n', 't' }, '<C-Left>', string.format(':vertical resize -%d<CR>', resize), { desc = 'Resize Left' })
-vim.keymap.set({ 'n', 't' }, '<C-Up>', string.format(':resize -%d<CR>', resize), { desc = 'Resize Up' })
-vim.keymap.set({ 'n', 't' }, '<C-Down>', string.format(':resize +%d<CR>', resize), { desc = 'Resize Down' })
-vim.keymap.set({ 'n', 't' }, '<C-Right>', string.format(':vertical resize +%d<CR>', resize), { desc = 'Resize Right' })
+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' })
+
+-- Keep selection after < and > in visual mode
+set('v', '<', '<gv')
+set('v', '>', '>gv')
 
--- Keep selection after < and >
-vim.keymap.set('v', '<', '<gv', {})
-vim.keymap.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' })