clean mapping syntax

init.lua

@@ -6,8 +6,6 @@ if custom_init_path then
   dofile(custom_init_path)
 end
 
-require("core.utils").load_mappings()
-
 local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
 
 -- bootstrap lazy.nvim!
@@ -19,3 +17,7 @@ end
 dofile(vim.g.base46_cache .. "defaults")
 vim.opt.rtp:prepend(lazypath)
 require "plugins"
+
+vim.schedule(function()
+  require "core.mappings"
+end, 0)

lua/core/init.lua

@@ -136,3 +136,12 @@ local new_cmd = vim.api.nvim_create_user_command
 new_cmd("NvChadUpdate", function()
   require "nvchad.updater"()
 end, {})
+
+--------------------------------------- globals -------------------------------------------
+vim.g.whichkey_maps = true
+vim.g.blankline_maps = true
+vim.g.terminal_maps = true
+vim.g.telescope_maps = true
+vim.g.nvimtree_maps = true
+vim.g.comment_maps = true
+vim.g.tabufline_maps = true

lua/core/mappings.lua

@@ -1,479 +1,152 @@
--- n, v, i, t = mode names
+local map = vim.keymap.set
-
+
-local M = {}
+map("i", "<C-b>", "<ESC>^i", { desc = "Beginning of line | general" })
-
+map("i", "<C-e>", "<End>", { desc = "End of line | general" })
-M.general = {
+map("i", "<C-h>", "<Left>", { desc = "Move left | general" })
-  i = {
+map("i", "<C-l>", "<Right>", { desc = "Move right | general" })
-    -- go to  beginning and end
+map("i", "<C-j>", "<Down>", { desc = "Move down | general" })
-    ["<C-b>"] = { "<ESC>^i", "Beginning of line" },
+map("i", "<C-k>", "<Up>", { desc = "Move up | general" })
-    ["<C-e>"] = { "<End>", "End of line" },
+
-
+map("n", "<Esc>", "<cmd>noh<CR>", { desc = "Clear highlights | general" })
-    -- navigate within insert mode
+map("n", "<C-h>", "<C-w>h", { desc = "Window left | general" })
-    ["<C-h>"] = { "<Left>", "Move left" },
+map("n", "<C-l>", "<C-w>l", { desc = "Window right | general" })
-    ["<C-l>"] = { "<Right>", "Move right" },
+map("n", "<C-j>", "<C-w>j", { desc = "Window down | general" })
-    ["<C-j>"] = { "<Down>", "Move down" },
+map("n", "<C-k>", "<C-w>k", { desc = "Window up | general" })
-    ["<C-k>"] = { "<Up>", "Move up" },
+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" })
-  n = {
+map("n", "<leader>rn", "<cmd>set rnu!<CR>", { desc = "Toggle relative number | general" })
-    ["<Esc>"] = { "<cmd> noh <CR>", "Clear highlights" },
+map("n", "<leader>b", "<cmd>enew<CR>", { desc = "New buffer | general" })
-    -- switch between windows
+map("n", "<leader>ch", "<cmd>NvCheatsheet<CR>", { desc = "Mapping cheatsheet | general" })
-    ["<C-h>"] = { "<C-w>h", "Window left" },
+
-    ["<C-l>"] = { "<C-w>l", "Window right" },
+map("n", "<leader>fm", function()
-    ["<C-j>"] = { "<C-w>j", "Window down" },
+  vim.lsp.buf.format { async = true }
-    ["<C-k>"] = { "<C-w>k", "Window up" },
+end, { desc = "LSP formatting | lsp" })
-
+
-    -- save
+vim.keymap.set("n", "<leader>lf", vim.diagnostic.open_float, { desc = "floating diagnostics | lsp" })
-    ["<C-s>"] = { "<cmd> w <CR>", "Save file" },
+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" })
-    -- Copy all
+vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, { desc = "diagnostic loclist | lsp" })
-    ["<C-c>"] = { "<cmd> %y+ <CR>", "Copy whole file" },
+
-
+-- Mappings for terminal mode
-    -- line numbers
+map(
-    ["<leader>n"] = { "<cmd> set nu! <CR>", "Toggle line number" },
+  "t",
-    ["<leader>rn"] = { "<cmd> set rnu! <CR>", "Toggle relative number" },
+  "<C-x>",
-
+  vim.api.nvim_replace_termcodes("<C-\\><C-N>", true, true, true),
-    -- Allow moving the cursor through wrapped lines with j, k, <Up> and <Down>
+  { desc = "Escape terminal mode | general" }
-    -- 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
+-- Mappings for M.tabufline
-    ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+if vim.g.tabufline_maps then
-    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+  map("n", "<tab>", function()
-    ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+    require("nvchad.tabufline").tabuflineNext()
-    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+  end, { desc = "Goto next buffer | tabufline" })
-
+
-    -- new buffer
+  map("n", "<S-tab>", function()
-    ["<leader>b"] = { "<cmd> enew <CR>", "New buffer" },
+    require("nvchad.tabufline").tabuflinePrev()
-    ["<leader>ch"] = { "<cmd> NvCheatsheet <CR>", "Mapping cheatsheet" },
+  end, { desc = "Goto prev buffer | tabufline" })
-
+
-    ["<leader>fm"] = {
+  map("n", "<leader>x", function()
-      function()
+    require("nvchad.tabufline").close_buffer()
-        vim.lsp.buf.format { async = true }
+  end, { desc = "Close buffer | tabufline" })
-      end,
+end
-      "LSP formatting",
+
-    },
+if vim.g.comment_maps then
-  },
+  map("n", "<leader>/", function()
-
+    require("Comment.api").toggle.linewise.current()
-  t = {
+  end, { desc = "Toggle comment | comment" })
-    ["<C-x>"] = { vim.api.nvim_replace_termcodes("<C-\\><C-N>", true, true, true), "Escape terminal mode" },
+
-  },
+  map(
-
+    "v",
-  v = {
+    "<leader>/",
-    ["<Up>"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+    "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
-    ["<Down>"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+    { desc = "Toggle comment | comment" }
-    ["<"] = { "<gv", "Indent line" },
+  )
-    [">"] = { ">gv", "Indent line" },
+end
-  },
+
-
+if vim.g.nvimtree_maps then
-  x = {
+  map("n", "<C-n>", "<cmd>NvimTreeToggle<CR>", { desc = "Toggle nvimtree | nvimtree" })
-    ["j"] = { 'v:count || mode(1)[0:1] == "no" ? "j" : "gj"', "Move down", opts = { expr = true } },
+  map("n", "<leader>e", "<cmd>NvimTreeFocus<CR>", { desc = "Focus nvimtree | nvimtree" })
-    ["k"] = { 'v:count || mode(1)[0:1] == "no" ? "k" : "gk"', "Move up", opts = { expr = true } },
+end
-    -- 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
+if vim.g.telescope_maps then
-    ["p"] = { 'p:let @+=@0<CR>:let @"=@0<CR>', "Dont copy replaced text", opts = { silent = true } },
+  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" })
-M.tabufline = {
+
-  plugin = true,
+  map(
-
+    "n",
-  n = {
+    "<leader>fz",
-    -- cycle through buffers
+    "<cmd>Telescope current_buffer_fuzzy_find<CR>",
-    ["<tab>"] = {
+    { desc = "Find in current buffer | telescope" }
-      function()
+  )
-        require("nvchad.tabufline").tabuflineNext()
+
-      end,
+  map("n", "<leader>cm", "<cmd>Telescope git_commits<CR>", { desc = "Git commits | telescope" })
-      "Goto next buffer",
+  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" })
-    ["<S-tab>"] = {
+
-      function()
+  map("n", "<leader>ff", "<cmd>Telescope find_files<CR>", { desc = "Find files | telescope" })
-        require("nvchad.tabufline").tabuflinePrev()
+  map(
-      end,
+    "n",
-      "Goto prev buffer",
+    "<leader>fa",
-    },
+    "<cmd>Telescope find_files follow=true no_ignore=true hidden=true<CR>",
-
+    { desc = "Find all | telescope" }
-    -- close buffer + hide terminal buffer
+  )
-    ["<leader>x"] = {
+end
-      function()
+
-        require("nvchad.tabufline").close_buffer()
+-- Mappings for M.terminal
-      end,
+if vim.g.terminal_maps then
-      "Close buffer",
+  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()
-M.comment = {
+    require("nvchad.term").new { pos = "vsp", size = 0.3 }
-  plugin = true,
+  end, { desc = "New vertical term | terminal" })
-
+
-  -- toggle comment in both modes
+  map({ "n", "t" }, "<A-v>", function()
-  n = {
+    require("nvchad.term").toggle { pos = "vsp", id = "vtoggleTerm", size = 0.3 }
-    ["<leader>/"] = {
+  end, { desc = "Toggleable vertical term | terminal" })
-      function()
+
-        require("Comment.api").toggle.linewise.current()
+  map({ "n", "t" }, "<A-h>", function()
-      end,
+    require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm", size = 0.2 }
-      "Toggle comment",
+  end, { desc = "New horizontal term | terminal" })
-    },
+
-  },
+  map({ "n", "t" }, "<A-i>", function()
-
+    require("nvchad.term").toggle { pos = "float", id = "floatTerm" }
-  v = {
+  end, { desc = "Toggleable Floating term | terminal" })
-    ["<leader>/"] = {
+
-      "<ESC><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>",
+  map("t", "<ESC>", function()
-      "Toggle comment",
+    local win = vim.api.nvim_get_current_win()
-    },
+    vim.api.nvim_win_close(win, true)
-  },
+  end, { desc = "Close term in terminal mode | terminal" })
-}
+end
-
+
-M.lspconfig = {
+if vim.g.whichkey_maps then
-  plugin = true,
+  map("n", "<leader>wK", ":WhichKey <CR>", { desc = "Which-key all keymaps | whichkey" })
-
+
-  -- See `<cmd> :help vim.lsp.*` for documentation on any of the below functions
+  map("n", "<leader>wk", function()
-
+    vim.cmd("WhichKey " .. vim.fn.input "WhichKey: ")
-  n = {
+  end, { desc = "Which-key query lookup | whichkey" })
-    ["gD"] = {
+end
-      function()
+
-        vim.lsp.buf.declaration()
+if vim.g.blankline_maps then
-      end,
+  map("n", "<leader>cc", function()
-      "LSP declaration",
+    local config = { scope = {} }
-    },
+    config.scope.exclude = { language = {}, node_type = {} }
-
+    config.scope.include = { node_type = {} }
-    ["gd"] = {
+    local node = require("ibl.scope").get(vim.api.nvim_get_current_buf(), config)
-      function()
+
-        vim.lsp.buf.definition()
+    if node then
-      end,
+      local start_row, _, end_row, _ = node:range()
-      "LSP definition",
+      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)
-    ["K"] = {
+      end
-      function()
+    end
-        vim.lsp.buf.hover()
+  end, { desc = "Jump to current context | blankline" })
-      end,
+end
-      "LSP hover",
+
-    },
+require "custom.mappings"
-
-    ["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

lua/core/utils.lua

@@ -1,90 +1,14 @@
 local M = {}
-local merge_tb = vim.tbl_deep_extend
 
 M.load_config = function()
   local config = require "core.default_config"
   local chadrc_path = vim.api.nvim_get_runtime_file("lua/custom/chadrc.lua", false)[1]
 
   if chadrc_path then
-    local chadrc = dofile(chadrc_path)
+    config = vim.tbl_deep_extend("force", config,  dofile(chadrc_path))
-
-    config.mappings = M.remove_disabled_keys(chadrc.mappings, config.mappings)
-    config = merge_tb("force", config, chadrc)
-    config.mappings.disabled = nil
   end
 
   return config
 end
 
-M.remove_disabled_keys = function(chadrc_mappings, default_mappings)
-  if not chadrc_mappings then
-    return default_mappings
-  end
-
-  -- store keys in a array with true value to compare
-  local keys_to_disable = {}
-  for _, mappings in pairs(chadrc_mappings) do
-    for mode, section_keys in pairs(mappings) do
-      if not keys_to_disable[mode] then
-        keys_to_disable[mode] = {}
-      end
-      section_keys = (type(section_keys) == "table" and section_keys) or {}
-      for k, _ in pairs(section_keys) do
-        keys_to_disable[mode][k] = true
-      end
-    end
-  end
-
-  -- make a copy as we need to modify default_mappings
-  for section_name, section_mappings in pairs(default_mappings) do
-    for mode, mode_mappings in pairs(section_mappings) do
-      mode_mappings = (type(mode_mappings) == "table" and mode_mappings) or {}
-      for k, _ in pairs(mode_mappings) do
-        -- if key if found then remove from default_mappings
-        if keys_to_disable[mode] and keys_to_disable[mode][k] then
-          default_mappings[section_name][mode][k] = nil
-        end
-      end
-    end
-  end
-
-  return default_mappings
-end
-
-M.load_mappings = function(section, mapping_opt)
-  vim.schedule(function()
-    local function set_section_map(section_values)
-      if section_values.plugin then
-        return
-      end
-
-      section_values.plugin = nil
-
-      for mode, mode_values in pairs(section_values) do
-        local default_opts = merge_tb("force", { mode = mode }, mapping_opt or {})
-        for keybind, mapping_info in pairs(mode_values) do
-          -- merge default + user opts
-          local opts = merge_tb("force", default_opts, mapping_info.opts or {})
-
-          mapping_info.opts, opts.mode = nil, nil
-          opts.desc = mapping_info[2]
-
-          vim.keymap.set(mode, keybind, mapping_info[1], opts)
-        end
-      end
-    end
-
-    local mappings = require("nvconfig").mappings
-
-    if type(section) == "string" then
-      mappings[section]["plugin"] = nil
-      mappings = { mappings[section] }
-    end
-
-    for _, sect in pairs(mappings) do
-      set_section_map(sect)
-    end
-  end)
-end
-
 return M

lua/plugins/configs/gitsigns.lua

@@ -0,0 +1,26 @@
+local options = {
+  signs = {
+    add = { text = "│" },
+    change = { text = "│" },
+    delete = { text = "󰍵" },
+    topdelete = { text = "‾" },
+    changedelete = { text = "~" },
+    untracked = { text = "│" },
+  },
+
+  on_attach = function(bufnr)
+    local gs = package.loaded.gitsigns
+
+    local function opts(desc)
+      return { buffer = bufnr, desc = desc }
+    end
+
+    local map = vim.keymap.set
+
+    map("n", "<leader>rh", gs.reset_hunk, opts "Reset Hunk")
+    map("n", "<leader>ph", gs.preview_hunk, opts "Preview Hunk")
+    map("n", "<leader>gb", gs.blame_line, opts "Blame Line")
+  end,
+}
+
+return options

lua/plugins/configs/lspconfig.lua

@@ -1,8 +1,8 @@
 local M = {}
+local map = vim.keymap.set
 
 -- export on_attach & capabilities for custom lspconfigs
 M.on_attach = function(client, bufnr)
-  local utils = require "core.utils"
   local conf = require("nvconfig").ui.lsp
 
   -- semanticTokens
@@ -14,7 +14,26 @@ M.on_attach = function(client, bufnr)
     require("nvchad.signature").setup(client, bufnr)
   end
 
-  utils.load_mappings("lspconfig", { buffer = bufnr })
+  local function opts(desc)
+    return { buffer = bufnr, desc = desc }
+  end
+
+  map("n", "gD", vim.lsp.buf.declaration, opts "Go to declaration | lsp")
+  map("n", "gd", vim.lsp.buf.definition, opts "Go to definition | lsp")
+  map("n", "K", vim.lsp.buf.hover, opts "Show hover information | lsp")
+  map("n", "gi", vim.lsp.buf.implementation, opts "Go to implementation | lsp")
+  map("n", "<C-k>", vim.lsp.buf.signature_help, opts "Show signature help | lsp")
+  map("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, opts "Add workspace folder | lsp")
+  map("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, opts "Remove workspace folder | lsp")
+
+  map("n", "<leader>wl", function()
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+  end, opts "List workspace folders | lsp")
+
+  map("n", "<leader>D", vim.lsp.buf.type_definition, opts "Go to type definition | lsp")
+  map("n", "<leader>rn", vim.lsp.buf.rename, opts "Rename symbol | lsp")
+  map({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts "Code action | lsp")
+  map("n", "gr", vim.lsp.buf.references, opts "Show references | lsp")
 end
 
 M.capabilities = vim.lsp.protocol.make_client_capabilities()

lua/plugins/configs/luasnip.lua

@@ -0,0 +1,23 @@
+-- vscode format
+require("luasnip.loaders.from_vscode").lazy_load()
+require("luasnip.loaders.from_vscode").lazy_load { paths = "your path!" }
+require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
+
+-- snipmate format
+require("luasnip.loaders.from_snipmate").load()
+require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
+
+-- lua format
+require("luasnip.loaders.from_lua").load()
+require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
+
+vim.api.nvim_create_autocmd("InsertLeave", {
+  callback = function()
+    if
+      require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
+      and not require("luasnip").session.jump_active
+    then
+      require("luasnip").unlink_current()
+    end
+  end,
+})

lua/plugins/configs/others.lua

@@ -1,50 +0,0 @@
-local M = {}
-local utils = require "core.utils"
-
-M.blankline = {
-  indent = { char = "│", highlight = "IblChar" },
-  scope = { char = "│", highlight = "IblScopeChar" },
-}
-
-M.luasnip = function(opts)
-  require("luasnip").config.set_config(opts)
-
-  -- vscode format
-  require("luasnip.loaders.from_vscode").lazy_load()
-  require("luasnip.loaders.from_vscode").lazy_load { paths = vim.g.vscode_snippets_path or "" }
-
-  -- snipmate format
-  require("luasnip.loaders.from_snipmate").load()
-  require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snippets_path or "" }
-
-  -- lua format
-  require("luasnip.loaders.from_lua").load()
-  require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" }
-
-  vim.api.nvim_create_autocmd("InsertLeave", {
-    callback = function()
-      if
-        require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
-        and not require("luasnip").session.jump_active
-      then
-        require("luasnip").unlink_current()
-      end
-    end,
-  })
-end
-
-M.gitsigns = {
-  signs = {
-    add = { text = "│" },
-    change = { text = "│" },
-    delete = { text = "󰍵" },
-    topdelete = { text = "‾" },
-    changedelete = { text = "~" },
-    untracked = { text = "│" },
-  },
-  on_attach = function(bufnr)
-    utils.load_mappings("gitsigns", { buffer = bufnr })
-  end,
-}
-
-return M

lua/plugins/init.lua

@@ -48,11 +48,11 @@ local default_plugins = {
   {
     "lukas-reineke/indent-blankline.nvim",
     event = "User FilePost",
-    opts = function()
+    opts = {
-      return require("plugins.configs.others").blankline
+      indent = { char = "│", highlight = "IblChar" },
-    end,
+      scope = { char = "│", highlight = "IblScopeChar" },
+    },
     config = function(_, opts)
-      require("core.utils").load_mappings "blankline"
       dofile(vim.g.base46_cache .. "blankline")
 
       local hooks = require "ibl.hooks"
@@ -81,7 +81,7 @@ local default_plugins = {
     "lewis6991/gitsigns.nvim",
     event = "User FilePost",
     opts = function()
-      return require("plugins.configs.others").gitsigns
+      return require("plugins.configs.gitsigns")
     end,
     config = function(_, opts)
       dofile(vim.g.base46_cache .. "git")
@@ -130,7 +130,8 @@ local default_plugins = {
         dependencies = "rafamadriz/friendly-snippets",
         opts = { history = true, updateevents = "TextChanged,TextChangedI" },
         config = function(_, opts)
-          require("plugins.configs.others").luasnip(opts)
+          require("luasnip").config.set_config(opts)
+          require "plugins.configs.luasnip"
         end,
       },
 
@@ -178,7 +179,7 @@ local default_plugins = {
       { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" },
     },
     init = function()
-      require("core.utils").load_mappings "comment"
+      vim.g.comment_maps = true
     end,
     config = function(_, opts)
       require("Comment").setup(opts)
@@ -189,9 +190,6 @@ local default_plugins = {
   {
     "nvim-tree/nvim-tree.lua",
     cmd = { "NvimTreeToggle", "NvimTreeFocus" },
-    init = function()
-      require("core.utils").load_mappings "nvimtree"
-    end,
     opts = function()
       return require "plugins.configs.nvimtree"
     end,
@@ -205,9 +203,6 @@ local default_plugins = {
     "nvim-telescope/telescope.nvim",
     dependencies = { "nvim-treesitter/nvim-treesitter" },
     cmd = "Telescope",
-    init = function()
-      require("core.utils").load_mappings "telescope"
-    end,
     opts = function()
       return require "plugins.configs.telescope"
     end,
@@ -227,9 +222,6 @@ local default_plugins = {
   {
     "folke/which-key.nvim",
     keys = { "<leader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" },
-    init = function()
-      require("core.utils").load_mappings "whichkey"
-    end,
     cmd = "WhichKey",
     config = function(_, opts)
       dofile(vim.g.base46_cache .. "whichkey")