Hotkey descriptions, couple new ones

Instead of comments, notate keybinds with descriptions.
Changed <leader>la to <leader>z for Lazy
Changed <C-c> to <leader>c
Added <leader>o for :only
Added <leader>g3 for 3-way diff view

1 files changed, 12 insertions, 15 deletions

diff --git a/nvim/init.lua b/nvim/init.lua
index 6384e83..8cde75d 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -13,30 +13,27 @@ vim.keymap.set('n', '<C-j>', '<C-w>j', { noremap = true, silent = true })
 vim.keymap.set('n', '<C-k>', '<C-w>k', { noremap = true, silent = true })
 vim.keymap.set('n', '<C-l>', '<C-w>l', { noremap = true, silent = true })
 -- <C-l> by default clears search highlight, so we remap it
-vim.keymap.set('n', '<leader><C-l>', ':nohl<CR>', { noremap = true, silent = true })
--- quick window close
-vim.keymap.set('n', '<C-c>', '<C-w>c', { noremap = true, silent = true })
--- quick file write
-vim.keymap.set('n', '<leader>w', ':w<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<leader><C-l>', ':nohl<CR>', { noremap = true, silent = true, desc = 'Clear searh highlight' })
+vim.keymap.set('n', '<leader>c', '<C-w>c', { noremap = true, silent = true, desc = 'Close window' })
+vim.keymap.set('n', '<leader>o', '<C-w>o', { noremap = true, silent = true, desc = 'Close other windows' })
+vim.keymap.set('n', '<leader>w', ':w<CR>', { noremap = true, silent = true, desc = 'Write buffer' })
 
 -- LSP binds
 vim.keymap.set('n', 'gl', vim.diagnostic.open_float, { noremap = true, silent = true })
 vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { noremap = true, silent = true })
 vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true, silent = true })
 
--- la - for LAzy (plugin manager)
-vim.keymap.set('n', '<leader>la', ':Lazy<CR>', { noremap = true, silent = true })
+-- z means laZy (plugin manager)
+vim.keymap.set('n', '<leader>z', ':Lazy<CR>', { noremap = true, silent = true, desc = 'Open Lazy.nvim' })
 
 -- Fugitive shortcuts
--- opens current file diff as vertical split
-vim.keymap.set('n', '<leader>gd', ':Gvdiffsplit<CR>', { noremap = true, silent = true })
--- opens git fugitive status and make it the only visible window (gs is for Git Status)
-vim.keymap.set('n', '<leader>gs', ':Git<CR><C-w>o', { noremap = true, silent = true })
--- opens blame mode. Navigate everywhere with <CR>
-vim.keymap.set('n', '<leader>gb', ':Git blame<CR>', { noremap = true, silent = true })
--- from fugitive version of file, takes you back to HEAD
-vim.keymap.set('n', '<leader>ge', ':Gedit<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<leader>gd', ':Gvdiffsplit<CR>', { noremap = true, silent = true, desc = 'Open file diff' })
+vim.keymap.set('n', '<leader>g3', ':Gvdiffsplit!<CR>', { noremap = true, silent = true, desc = 'Open 3-way diff' })
+vim.keymap.set('n', '<leader>gs', ':Git<CR><C-w>o', { noremap = true, silent = true, desc = 'Git status' })
+vim.keymap.set('n', '<leader>gb', ':Git blame<CR>', { noremap = true, silent = true, desc = 'Git blame' })
+vim.keymap.set('n', '<leader>ge', ':Gedit<CR>', { noremap = true, silent = true, desc = 'Git: return to HEAD file version' })
 
+-- I forgot what it's for :(
 vim.diagnostic.config({
   virtual_text = true,
 })