From 9fe091adc6c0039bbe8cb0920e6da5d6d69c5ffc Mon Sep 17 00:00:00 2001
From: Roman <romanvolovoy@gmail.com>
Date: Thu, 25 Jun 2026 22:19:02 +0200
Subject: [PATCH] mapping refactor

---
 nvim/.config/nvim/lua/romanzy/remap.lua | 86 ++++++++++++-------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/nvim/.config/nvim/lua/romanzy/remap.lua b/nvim/.config/nvim/lua/romanzy/remap.lua
index a551a59..10bc880 100644
--- a/nvim/.config/nvim/lua/romanzy/remap.lua
+++ b/nvim/.config/nvim/lua/romanzy/remap.lua
@@ -19,53 +19,53 @@ local function telescope_picker(picker)
 end
 
 map("n", "<leader><leader>r", ":source ~/.config/nvim/init.lua<CR>", { desc = "reload init.lua" })
-vim.keymap.set("n", "<leader>dl", "<Cmd>Oil<CR>")
-vim.keymap.set("n", "<leader>nl", vim.cmd.Ex)
-vim.keymap.set("n", "<leader>ff", telescope_picker("find_files"))
-vim.keymap.set("n", "<leader>fg", telescope_picker("live_grep"))
-vim.keymap.set("n", "<leader>fb", telescope_picker("buffers"))
-vim.keymap.set("n", "<leader>fh", telescope_picker("help_tags"))
+map("n", "<leader>dl", "<Cmd>Oil<CR>", { desc = "open oil" })
+map("n", "<leader>nl", vim.cmd.Ex, { desc = "open netrw" })
+map("n", "<leader>ff", telescope_picker("find_files"), { desc = "find files" })
+map("n", "<leader>fg", telescope_picker("live_grep"), { desc = "live grep" })
+map("n", "<leader>fb", telescope_picker("buffers"), { desc = "find buffers" })
+map("n", "<leader>fh", telescope_picker("help_tags"), { desc = "help tags" })
 
-vim.keymap.set("n", "<leader>s", ":set spell!<CR>")
-vim.keymap.set("n", "<leader>sv", "<Cmd>vs<CR>")
-vim.keymap.set("n", "<leader>sh", "<Cmd>sp<CR>")
-vim.keymap.set("n", "<leader>se", "<C-w>=")
-vim.keymap.set("n", "<leader>sc", "<C-w>c")
-vim.keymap.set("n", "<leader>rh", "<Cmd>vertical resize -10<CR>")
-vim.keymap.set("n", "<leader>rl", "<Cmd>vertical resize +10<CR>")
-vim.keymap.set("n", "<leader>rj", "<Cmd>resize -5<CR>")
-vim.keymap.set("n", "<leader>rk", "<Cmd>resize +5<CR>")
-vim.keymap.set("n", "<leader>re", "<C-w>=")
+-- map("n", "<leader>s", ":set spell!<CR>", { desc = "toggle spell" })
+map("n", "<leader>sv", "<Cmd>vs<CR>", { desc = "split vertical" })
+map("n", "<leader>sh", "<Cmd>sp<CR>", { desc = "split horizontal" })
+map("n", "<leader>se", "<C-w>=", { desc = "equalize splits" })
+map("n", "<leader>sc", "<C-w>c", { desc = "close split" })
+map("n", "<leader>rh", "<Cmd>vertical resize -10<CR>", { desc = "narrower" })
+map("n", "<leader>rl", "<Cmd>vertical resize +10<CR>", { desc = "wider" })
+map("n", "<leader>rj", "<Cmd>resize -5<CR>", { desc = "shorter" })
+map("n", "<leader>rk", "<Cmd>resize +5<CR>", { desc = "taller" })
+map("n", "<leader>re", "<C-w>=", { desc = "equalize" })
 
-vim.keymap.set("n", "<leader>bp", "<Cmd>bprevious<CR>")
-vim.keymap.set("n", "<leader>bn", "<Cmd>bnext<CR>")
-vim.keymap.set("n", "<leader>bd", "<Cmd>bdelete<CR>")
+map("n", "<leader>bp", "<Cmd>bprevious<CR>", { desc = "prev buffer" })
+map("n", "<leader>bn", "<Cmd>bnext<CR>", { desc = "next buffer" })
+map("n", "<leader>bd", "<Cmd>bdelete<CR>", { desc = "delete buffer" })
 
-vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
+map("t", "<Esc>", "<C-\\><C-n>", { desc = "exit terminal" })
 
-vim.keymap.set("n", "<C-h>", "<C-w>h")
-vim.keymap.set("n", "<C-j>", "<C-w>j")
-vim.keymap.set("n", "<C-k>", "<C-w>k")
-vim.keymap.set("n", "<C-l>", "<C-w>l")
+map("n", "<C-h>", "<C-w>h", { desc = "window left" })
+map("n", "<C-j>", "<C-w>j", { desc = "window down" })
+map("n", "<C-k>", "<C-w>k", { desc = "window up" })
+map("n", "<C-l>", "<C-w>l", { desc = "window right" })
 
 -- this is needed to disable refresh behavior for <C-l> in netrw
 vim.api.nvim_create_autocmd("FileType", {
     pattern = "netrw",
     callback = function(ev)
-        vim.keymap.set("n", "<C-h>", "<C-w>h", { buffer = ev.buf })
-        vim.keymap.set("n", "<C-j>", "<C-w>j", { buffer = ev.buf })
-        vim.keymap.set("n", "<C-k>", "<C-w>k", { buffer = ev.buf })
-        vim.keymap.set("n", "<C-l>", "<C-w>l", { buffer = ev.buf })
+        map("n", "<C-h>", "<C-w>h", { buffer = ev.buf, desc = "window left" })
+        map("n", "<C-j>", "<C-w>j", { buffer = ev.buf, desc = "window down" })
+        map("n", "<C-k>", "<C-w>k", { buffer = ev.buf, desc = "window up" })
+        map("n", "<C-l>", "<C-w>l", { buffer = ev.buf, desc = "window right" })
     end,
 })
 
 vim.api.nvim_create_autocmd("FileType", {
     pattern = "oil",
     callback = function(ev)
-        vim.keymap.set("n", "<C-h>", "<C-w>h", { buffer = ev.buf })
-        vim.keymap.set("n", "<C-j>", "<C-w>j", { buffer = ev.buf })
-        vim.keymap.set("n", "<C-k>", "<C-w>k", { buffer = ev.buf })
-        vim.keymap.set("n", "<C-l>", "<C-w>l", { buffer = ev.buf })
+        map("n", "<C-h>", "<C-w>h", { buffer = ev.buf, desc = "window left" })
+        map("n", "<C-j>", "<C-w>j", { buffer = ev.buf, desc = "window down" })
+        map("n", "<C-k>", "<C-w>k", { buffer = ev.buf, desc = "window up" })
+        map("n", "<C-l>", "<C-w>l", { buffer = ev.buf, desc = "window right" })
     end,
 })
 
@@ -74,20 +74,20 @@ map({ "n", "i", "v", "x", "s", "o", "c" }, { "<left>", "<right>", "<up>", "<down
     vim.notify('hjkl supremacy', vim.log.levels.ERROR)
 end, { desc = "hjkl supremacy" })
 
-vim.keymap.set("n", "g.", vim.diagnostic.open_float)
-vim.keymap.set("n", "gl", vim.diagnostic.setloclist)
+map("n", "g.", vim.diagnostic.open_float, { desc = "line diagnostics" })
+map("n", "gl", vim.diagnostic.setloclist, { desc = "diagnostic list" })
 
 -- diagnostics only on error.
-vim.keymap.set("n", "g]", function()
+map("n", "g]", function()
     vim.diagnostic.goto_next({
         severity = vim.diagnostic.severity.ERROR,
     })
-end)
-vim.keymap.set("n", "g[", function()
+end, { desc = "next error" })
+map("n", "g[", function()
     vim.diagnostic.goto_prev({
         severity = vim.diagnostic.severity.ERROR,
     })
-end)
+end, { desc = "prev error" })
 
 local function rename_without_default()
     vim.ui.input({
@@ -104,10 +104,10 @@ end
 
 vim.api.nvim_create_autocmd("LspAttach", {
     callback = function(ev)
-        vim.keymap.set("n", "gd", vim.lsp.buf.definition, { buffer = ev.buf })
-        vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { buffer = ev.buf })
-        vim.keymap.set("n", "grd", vim.lsp.buf.references, { buffer = ev.buf })
-        vim.keymap.set("n", "grn", rename_without_default, { buffer = ev.buf })
-        vim.keymap.set("i", "<C-Space>", vim.lsp.completion.get, { buffer = ev.buf })
+        map("n", "gd", vim.lsp.buf.definition, { buffer = ev.buf, desc = "goto definition" })
+        map("n", "gD", vim.lsp.buf.declaration, { buffer = ev.buf, desc = "goto declaration" })
+        map("n", "grd", vim.lsp.buf.references, { buffer = ev.buf, desc = "list references" })
+        map("n", "grn", rename_without_default, { buffer = ev.buf, desc = "rename symbol" })
+        map("i", "<C-Space>", vim.lsp.completion.get, { buffer = ev.buf, desc = "trigger completion" })
     end,
 })