clean mapping syntax

lua/core/mappings.lua

@@ -1,479 +1,152 @@
--- n, v, i, t = mode names
-
-local M = {}
-
-M.general = {
-  i = {
-    -- go to  beginning and end
-    ["<C-b>"] = { "<ESC>^i", "Beginning of line" },
-    ["<C-e>"] = { "<End>", "End of line" },
-
-    -- navigate within insert mode
-    ["<C-h>"] = { "<Left>", "Move left" },
-    ["<C-l>"] = { "<Right>", "Move right" },
-    ["<C-j>"] = { "<Down>", "Move down" },
-    ["<C-k>"] = { "<Up>", "Move up" },
-  },
-
-  n = {
-    ["<Esc>"] = { "<cmd> noh <CR>", "Clear highlights" },
-    -- switch between windows
-    ["<C-h>"] = { "<C-w>h", "Window left" },
-    ["<C-l>"] = { "<C-w>l", "Window right" },
-    ["<C-j>"] = { "<C-w>j", "Window down" },
-    ["<C-k>"] = { "<C-w>k", "Window up" },
-
-    -- save
-    ["<C-s>"] = { "<cmd> w <CR>", "Save file" },
-
-    -- Copy all
-    ["<C-c>"] = { "<cmd> %y+ <CR>", "Copy whole file" },
-
-    -- line numbers
-    ["<leader>n"] = { "<cmd> set nu! <CR>", "Toggle line number" },
-    ["<leader>rn"] = { "<cmd> set rnu! <CR>", "Toggle relative number" },
-
-    -- Allow moving the cursor through wrapped lines with j, k, <Up> and <Down>
-    -- http://www.reddit.com/r/vim/comments/2k4cbr/problem_with_gj_and_gk/
-    -- empty mode is same as using <cmd> :map
-    -- also don't use g[j|k] when in operator pending mode, so it doesn't alter d, y or c behaviour
-    ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
-    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
-    ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
-    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
-
-    -- new buffer
-    ["<leader>b"] = { "<cmd> enew <CR>", "New buffer" },
-    ["<leader>ch"] = { "<cmd> NvCheatsheet <CR>", "Mapping cheatsheet" },
-
-    ["<leader>fm"] = {
-      function()
-        vim.lsp.buf.format { async = true }
-      end,
-      "LSP formatting",
-    },
-  },
-
-  t = {
-    ["<C-x>"] = { vim.api.nvim_replace_termcodes("<C-\\><C-N>", true, true, true), "Escape terminal mode" },
-  },
-
-  v = {
-    ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
-    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
-    ["<"] = { "<gv", "Indent line" },
-    [">"] = { ">gv", "Indent line" },
-  },
-
-  x = {
-    ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
-    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
-    -- Don't copy the replaced text after pasting in visual mode
-    -- https://vim.fandom.com/wiki/Replace_a_word_with_yanked_text#Alternative_mapping_for_paste
-    ["p"] = { 'p:let @+=@0<CR>:let @"=@0<CR>', "Dont copy replaced text", opts = { silent = true } },
-  },
-}
-
-M.tabufline = {
-  plugin = true,
-
-  n = {
-    -- cycle through buffers
-    ["<tab>"] = {
-      function()
-        require("nvchad.tabufline").tabuflineNext()
-      end,
-      "Goto next buffer",
-    },
-
-    ["<S-tab>"] = {
-      function()
-        require("nvchad.tabufline").tabuflinePrev()
-      end,
-      "Goto prev buffer",
-    },
-
-    -- close buffer + hide terminal buffer
-    ["<leader>x"] = {
-      function()
-        require("nvchad.tabufline").close_buffer()
-      end,
-      "Close buffer",
-    },
-  },
-}
-
-M.comment = {
-  plugin = true,
-
-  -- toggle comment in both modes
-  n = {
-    ["<leader>/"] = {
-      function()
-        require("Comment.api").toggle.linewise.current()
-      end,
-      "Toggle comment",
-    },
-  },
-
-  v = {
-    ["<leader>/"] = {
-      "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
-      "Toggle comment",
-    },
-  },
-}
-
-M.lspconfig = {
-  plugin = true,
-
-  -- See `<cmd> :help vim.lsp.*` for documentation on any of the below functions
-
-  n = {
-    ["gD"] = {
-      function()
-        vim.lsp.buf.declaration()
-      end,
-      "LSP declaration",
-    },
-
-    ["gd"] = {
-      function()
-        vim.lsp.buf.definition()
-      end,
-      "LSP definition",
-    },
-
-    ["K"] = {
-      function()
-        vim.lsp.buf.hover()
-      end,
-      "LSP hover",
-    },
-
-    ["gi"] = {
-      function()
-        vim.lsp.buf.implementation()
-      end,
-      "LSP implementation",
-    },
-
-    ["<leader>ls"] = {
-      function()
-        vim.lsp.buf.signature_help()
-      end,
-      "LSP signature help",
-    },
-
-    ["<leader>D"] = {
-      function()
-        vim.lsp.buf.type_definition()
-      end,
-      "LSP definition type",
-    },
-
-    ["<leader>ra"] = {
-      function()
-        require("nvchad.renamer").open()
-      end,
-      "LSP rename",
-    },
-
-    ["<leader>ca"] = {
-      function()
-        vim.lsp.buf.code_action()
-      end,
-      "LSP code action",
-    },
-
-    ["gr"] = {
-      function()
-        vim.lsp.buf.references()
-      end,
-      "LSP references",
-    },
-
-    ["<leader>lf"] = {
-      function()
-        vim.diagnostic.open_float { border = "rounded" }
-      end,
-      "Floating diagnostic",
-    },
-
-    ["[d"] = {
-      function()
-        vim.diagnostic.goto_prev { float = { border = "rounded" } }
-      end,
-      "Goto prev",
-    },
-
-    ["]d"] = {
-      function()
-        vim.diagnostic.goto_next { float = { border = "rounded" } }
-      end,
-      "Goto next",
-    },
-
-    ["<leader>q"] = {
-      function()
-        vim.diagnostic.setloclist()
-      end,
-      "Diagnostic setloclist",
-    },
-
-    ["<leader>wa"] = {
-      function()
-        vim.lsp.buf.add_workspace_folder()
-      end,
-      "Add workspace folder",
-    },
-
-    ["<leader>wr"] = {
-      function()
-        vim.lsp.buf.remove_workspace_folder()
-      end,
-      "Remove workspace folder",
-    },
-
-    ["<leader>wl"] = {
-      function()
-        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-      end,
-      "List workspace folders",
-    },
-  },
-
-  v = {
-    ["<leader>ca"] = {
-      function()
-        vim.lsp.buf.code_action()
-      end,
-      "LSP code action",
-    },
-  },
-}
-
-M.nvimtree = {
-  plugin = true,
-
-  n = {
-    -- toggle
-    ["<C-n>"] = { "<cmd> NvimTreeToggle <CR>", "Toggle nvimtree" },
-
-    -- focus
-    ["<leader>e"] = { "<cmd> NvimTreeFocus <CR>", "Focus nvimtree" },
-  },
-}
-
-M.telescope = {
-  plugin = true,
-
-  n = {
-    -- find
-    ["<leader>ff"] = { "<cmd> Telescope find_files <CR>", "Find files" },
-    ["<leader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find all" },
-    ["<leader>fw"] = { "<cmd> Telescope live_grep <CR>", "Live grep" },
-    ["<leader>fb"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
-    ["<leader>fh"] = { "<cmd> Telescope help_tags <CR>", "Help page" },
-    ["<leader>fo"] = { "<cmd> Telescope oldfiles <CR>", "Find oldfiles" },
-    ["<leader>fz"] = { "<cmd> Telescope current_buffer_fuzzy_find <CR>", "Find in current buffer" },
-
-    -- git
-    ["<leader>cm"] = { "<cmd> Telescope git_commits <CR>", "Git commits" },
-    ["<leader>gt"] = { "<cmd> Telescope git_status <CR>", "Git status" },
-
-    -- pick a hidden term
-    ["<leader>pt"] = { "<cmd> Telescope terms <CR>", "Pick hidden term" },
-
-    -- theme switcher
-    ["<leader>th"] = { "<cmd> Telescope themes <CR>", "Nvchad themes" },
-
-    ["<leader>ma"] = { "<cmd> Telescope marks <CR>", "telescope bookmarks" },
-  },
-}
-
-M.terminal = {
-  n = {
-    -- spawn new terms
-    ["<leader>h"] = {
-      function()
-        require("nvchad.term").new { pos = "sp", size = 0.3 }
-      end,
-      "New horizontal term",
-    },
-
-    ["<leader>v"] = {
-      function()
-        require("nvchad.term").new { pos = "vsp", size = 0.3 }
-      end,
-      "New vertical term",
-    },
-
-    -- toggle terms
-    ["<A-v>"] = {
-      function()
-        require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm", size = 0.3 }
-      end,
-      "New vertical term",
-    },
-
-    ["<A-h>"] = {
-      function()
-        require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm", size = 0.2 }
-      end,
-      "New vertical term",
-    },
-
-    ["<A-i>"] = {
-      function()
-        require("nvchad.term").toggle { pos = "float", id = "floatTerm" }
-      end,
-      "Toggleable Floating term",
-    },
-  },
-
-  -- toggle terms in terminal mode
-  t = {
-    ["<ESC>"] = {
-      function()
-        local win = vim.api.nvim_get_current_win()
-        vim.api.nvim_win_close(win, true)
-      end,
-      "close term in terminal mode",
-    },
-
-    ["<A-v>"] = {
-      function()
-        require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm" }
-      end,
-      "New vertical term",
-    },
-
-    ["<A-h>"] = {
-      function()
-        require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" }
-      end,
-      "New vertical term",
-    },
-
-    ["<A-i>"] = {
-      function()
-        require("nvchad.term").toggle { pos = "float", id = "floatTerm" }
-      end,
-      "Toggleable Floating term",
-    },
-  },
-}
-
-M.whichkey = {
-  plugin = true,
-
-  n = {
-    ["<leader>wK"] = {
-      function()
-        vim.cmd "WhichKey"
-      end,
-      "Which-key all keymaps",
-    },
-    ["<leader>wk"] = {
-      function()
-        local input = vim.fn.input "WhichKey: "
-        vim.cmd("WhichKey " .. input)
-      end,
-      "Which-key query lookup",
-    },
-  },
-}
-
-M.blankline = {
-  plugin = true,
-
-  n = {
-    ["<leader>cc"] = {
-      function()
-        local config = { scope = {} }
-        config.scope.exclude = { language = {}, node_type = {} }
-        config.scope.include = { node_type = {} }
-
-        local node = require("ibl.scope").get(vim.api.nvim_get_current_buf(), config)
-
-        if node then
-          local start_row, _, end_row, _ = node:range()
-
-          if start_row ~= end_row then
-            vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start_row + 1, 0 })
-            vim.api.nvim_feedkeys("_", "n", true)
-          end
-        end
-      end,
-
-      "Jump to current context",
-    },
-  },
-}
-
-M.gitsigns = {
-  plugin = true,
-
-  n = {
-    -- Navigation through hunks
-    ["]c"] = {
-      function()
-        if vim.wo.diff then
-          return "]c"
-        end
-        vim.schedule(function()
-          require("gitsigns").next_hunk()
-        end)
-        return "<Ignore>"
-      end,
-      "Jump to next hunk",
-      opts = { expr = true },
-    },
-
-    ["[c"] = {
-      function()
-        if vim.wo.diff then
-          return "[c"
-        end
-        vim.schedule(function()
-          require("gitsigns").prev_hunk()
-        end)
-        return "<Ignore>"
-      end,
-      "Jump to prev hunk",
-      opts = { expr = true },
-    },
-
-    -- Actions
-    ["<leader>rh"] = {
-      function()
-        require("gitsigns").reset_hunk()
-      end,
-      "Reset hunk",
-    },
-
-    ["<leader>ph"] = {
-      function()
-        require("gitsigns").preview_hunk()
-      end,
-      "Preview hunk",
-    },
-
-    ["<leader>gb"] = {
-      function()
-        package.loaded.gitsigns.blame_line()
-      end,
-      "Blame line",
-    },
-
-    ["<leader>td"] = {
-      function()
-        require("gitsigns").toggle_deleted()
-      end,
-      "Toggle deleted",
-    },
-  },
-}
-
-return M
+local map = vim.keymap.set
+
+map("i", "<C-b>", "<ESC>^i", { desc = "Beginning of line | general" })
+map("i", "<C-e>", "<End>", { desc = "End of line | general" })
+map("i", "<C-h>", "<Left>", { desc = "Move left | general" })
+map("i", "<C-l>", "<Right>", { desc = "Move right | general" })
+map("i", "<C-j>", "<Down>", { desc = "Move down | general" })
+map("i", "<C-k>", "<Up>", { desc = "Move up | general" })
+
+map("n", "<Esc>", "<cmd>noh<CR>", { desc = "Clear highlights | general" })
+map("n", "<C-h>", "<C-w>h", { desc = "Window left | general" })
+map("n", "<C-l>", "<C-w>l", { desc = "Window right | general" })
+map("n", "<C-j>", "<C-w>j", { desc = "Window down | general" })
+map("n", "<C-k>", "<C-w>k", { desc = "Window up | general" })
+map("n", "<C-s>", "<cmd>w<CR>", { desc = "Save file | general" })
+map("n", "<C-c>", "<cmd>%y+<CR>", { desc = "Copy whole file | general" })
+map("n", "<leader>n", "<cmd>set nu!<CR>", { desc = "Toggle line number | general" })
+map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "Toggle relative number | general" })
+map("n", "<leader>b", "<cmd>enew<CR>", { desc = "New buffer | general" })
+map("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "Mapping cheatsheet | general" })
+
+map("n", "<leader>fm", function()
+  vim.lsp.buf.format { async = true }
+end, { desc = "LSP formatting | lsp" })
+
+vim.keymap.set("n", "<leader>lf", vim.diagnostic.open_float, { desc = "floating diagnostics | lsp" })
+vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { desc = "prev diagnostic | lsp" })
+vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "next diagnostic | lsp" })
+vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "diagnostic loclist | lsp" })
+
+-- Mappings for terminal mode
+map(
+  "t",
+  "<C-x>",
+  vim.api.nvim_replace_termcodes("<C-\\><C-N>", true, true, true),
+  { desc = "Escape terminal mode | general" }
+)
+
+-- Mappings for M.tabufline
+if vim.g.tabufline_maps then
+  map("n", "<tab>", function()
+    require("nvchad.tabufline").tabuflineNext()
+  end, { desc = "Goto next buffer | tabufline" })
+
+  map("n", "<S-tab>", function()
+    require("nvchad.tabufline").tabuflinePrev()
+  end, { desc = "Goto prev buffer | tabufline" })
+
+  map("n", "<leader>x", function()
+    require("nvchad.tabufline").close_buffer()
+  end, { desc = "Close buffer | tabufline" })
+end
+
+if vim.g.comment_maps then
+  map("n", "<leader>/", function()
+    require("Comment.api").toggle.linewise.current()
+  end, { desc = "Toggle comment | comment" })
+
+  map(
+    "v",
+    "<leader>/",
+    "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
+    { desc = "Toggle comment | comment" }
+  )
+end
+
+if vim.g.nvimtree_maps then
+  map("n", "<C-n>", "<cmd>NvimTreeToggle<CR>", { desc = "Toggle nvimtree | nvimtree" })
+  map("n", "<leader>e", "<cmd>NvimTreeFocus<CR>", { desc = "Focus nvimtree | nvimtree" })
+end
+
+if vim.g.telescope_maps then
+  map("n", "<leader>fw", "<cmd>Telescope live_grep<CR>", { desc = "Live grep | telescope" })
+  map("n", "<leader>fb", "<cmd>Telescope buffers<CR>", { desc = "Find buffers | telescope" })
+  map("n", "<leader>fh", "<cmd>Telescope help_tags<CR>", { desc = "Help page | telescope" })
+  map("n", "<leader>fo", "<cmd>Telescope oldfiles<CR>", { desc = "Find oldfiles | telescope" })
+
+  map(
+    "n",
+    "<leader>fz",
+    "<cmd>Telescope current_buffer_fuzzy_find<CR>",
+    { desc = "Find in current buffer | telescope" }
+  )
+
+  map("n", "<leader>cm", "<cmd>Telescope git_commits<CR>", { desc = "Git commits | telescope" })
+  map("n", "<leader>gt", "<cmd>Telescope git_status<CR>", { desc = "Git status | telescope" })
+  map("n", "<leader>pt", "<cmd>Telescope terms<CR>", { desc = "Pick hidden term | telescope" })
+  map("n", "<leader>th", "<cmd>Telescope themes<CR>", { desc = "Nvchad themes | telescope" })
+
+  map("n", "<leader>ff", "<cmd>Telescope find_files<CR>", { desc = "Find files | telescope" })
+  map(
+    "n",
+    "<leader>fa",
+    "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>",
+    { desc = "Find all | telescope" }
+  )
+end
+
+-- Mappings for M.terminal
+if vim.g.terminal_maps then
+  map("n", "<leader>h", function()
+    require("nvchad.term").new { pos = "sp", size = 0.3 }
+  end, { desc = "New horizontal term | terminal" })
+
+  map("n", "<leader>v", function()
+    require("nvchad.term").new { pos = "vsp", size = 0.3 }
+  end, { desc = "New vertical term | terminal" })
+
+  map({ "n", "t" }, "<A-v>", function()
+    require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm", size = 0.3 }
+  end, { desc = "Toggleable vertical term | terminal" })
+
+  map({ "n", "t" }, "<A-h>", function()
+    require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm", size = 0.2 }
+  end, { desc = "New horizontal term | terminal" })
+
+  map({ "n", "t" }, "<A-i>", function()
+    require("nvchad.term").toggle { pos = "float", id = "floatTerm" }
+  end, { desc = "Toggleable Floating term | terminal" })
+
+  map("t", "<ESC>", function()
+    local win = vim.api.nvim_get_current_win()
+    vim.api.nvim_win_close(win, true)
+  end, { desc = "Close term in terminal mode | terminal" })
+end
+
+if vim.g.whichkey_maps then
+  map("n", "<leader>wK", ":WhichKey <CR>", { desc = "Which-key all keymaps | whichkey" })
+
+  map("n", "<leader>wk", function()
+    vim.cmd("WhichKey " .. vim.fn.input "WhichKey: ")
+  end, { desc = "Which-key query lookup | whichkey" })
+end
+
+if vim.g.blankline_maps then
+  map("n", "<leader>cc", function()
+    local config = { scope = {} }
+    config.scope.exclude = { language = {}, node_type = {} }
+    config.scope.include = { node_type = {} }
+    local node = require("ibl.scope").get(vim.api.nvim_get_current_buf(), config)
+
+    if node then
+      local start_row, _, end_row, _ = node:range()
+      if start_row ~= end_row then
+        vim.api.nvim_win_set_cursor(vim.api.nvim_get_current_win(), { start_row + 1, 0 })
+        vim.api.nvim_feedkeys("_", "n", true)
+      end
+    end
+  end, { desc = "Jump to current context | blankline" })
+end
+
+require "custom.mappings"