init.lua @ d69e665d3ad014948a583149a85ba2979ca9276d

M lua/keymapings.lua

@@ -1,33 +1,32 @@
 local u = require "utils"
-local map, nmap, expr = u.map, u.nmap, u.expr
+local nmap, map, expr = u.nmap, u.map, u.expr
 
+-- General
 nmap("<C-s>", "<cmd>write!<cr>")
 nmap("<leader>h", "<cmd>nohlsearch<cr>")
 nmap("<leader>q", "<cmd>quit!<cr>")
 nmap("<leader>w", "<cmd>write!<cr>")
 nmap("<leader>e", "<cmd>NvimTreeToggle<cr>")
-nmap("<leader>/", "<cmd>lua require[[Comment]].toggle()<cr>")
-map("v", "<leader>/", "gc")
 nmap("<leader>ps", "<cmd>PackerSync<cr>")
+nmap("<leader>c", "<cmd>bdelete<cr>")
 
--- Windows
-for _, k in ipairs { "h", "j", "k", "l" } do
-  nmap(string.format("<C-%s>", k), string.format("<cmd>wincmd %s<cr>", k))
-  map("t", string.format("<C-%s>", k), string.format("<C-\\><C-N><C-w>%s", k))
-end
-
+-- Split
 nmap("<C-Left>", "<cmd>vertical resize -2<cr>")
-nmap("<C-Up", "<cmd>resize -1<cr>")
 nmap("<C-Down>", "<cmd>resize +2<cr>")
+nmap("<C-Up", "<cmd>resize -1<cr>")
 nmap("<C-Right>", "<cmd>vertical resize +2<CR>")
+for _, key in ipairs { "h", "j", "k", "l" } do
+  nmap(string.format("<C-%s>", key), string.format("<cmd>wincmd %s<cr>", key))
+  map("t", string.format("<C-%s>", key), string.format("<C-\\><C-N><C-w>%s", key))
+end
 
--- Alternative up/down for arrows
+-- Alternative for arrow up/down
 expr("i", "<C-j>", 'pumvisible() ? "\\<down>" : "\\<C-j>"')
 expr("i", "<C-k>", 'pumvisible() ? "\\<up>" : "\\<C-k>"')
 expr("c", "<C-j>", 'pumvisible() ? "\\<C-n>" : "\\<C-j>"')
 expr("c", "<C-k>", 'pumvisible() ? "\\<C-p>" : "\\<C-k>"')
 
--- Move line
+-- Line moves
 map("i", "<A-j>", "<Esc>:m .+1<CR>==gi")
 map("i", "<A-k>", "<Esc>:m .-2<CR>==gi")
 map("v", "K", ":move '<-2<CR>gv-gv")
@@ -35,41 +34,13 @@ map("v", "J", ":move '>+1<CR>gv-gv")
 nmap("<A-j>", ":m .+1<CR>==")
 nmap("<A-k>", ":m .-2<CR>==")
 
--- Telescope
-nmap("<leader>f", "<cmd>Telescope find_files<cr>")
-nmap("<leader>b", "<cmd>Telescope buffers<cr>")
-nmap("<leader>st", "<cmd>Telescope live_grep<cr>")
-nmap("<leader>sT", "<cmd>Telescope grep_string<cr>")
-nmap("<leader>sp", "<cmd>Telescope projects<cr>")
-nmap("<leader>sr", "<cmd>Telescope oldfiles<cr>")
-nmap("<leader>sb", "<cmd>Telescope git_branches<cr>")
-nmap("<leader>sf", "<cmd>Telescope git_files<cr>")
-nmap("<leader>ss", "<cmd>Telescope git_status<cr>")
-nmap("<leader>sc", "<cmd>Telescope git_commits<cr>")
-nmap("<leader>sk", "<cmd>Telescope keymaps<cr>")
-
 -- Terminal
 nmap("<leader>gg", "<cmd>lua term_cmd('lazygit')<cr>")
 nmap("<leader>D", "<cmd> lua term_cmd('lazydocker')<cr>")
 
--- DAP
-nmap("<leader>dt", "<cmd>lua require'dap'.toggle_breakpoint()<cr>")
-nmap("<leader>db", "<cmd>lua require'dap'.step_back()<cr>")
-nmap("<leader>dc", "<cmd>lua require'dap'.continue()<cr>")
-nmap("<leader>dd", "<cmd>lua require'dap'.disconnect()<cr>")
-nmap("<leader>di", "<cmd>lua require'dap'.step_into()<cr>")
-nmap("<leader>do", "<cmd>lua require'dap'.step_over()<cr>")
-nmap("<leader>du", "<cmd>lua require'dap'.step_out()<cr>")
-nmap("<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>")
-nmap("<leader>dp", "<cmd>lua require'dap'.pause.toggle()<cr>")
-nmap("<leader>dq", "<cmd>lua require'dap'.close()<cr>")
-
 -- Ultest
 nmap("<leader>tt", "<cmd>Ultest<cr>")
 nmap("<leader>ts", "<cmd>UltestStop<cr>")
 nmap("<leader>tc", "<cmd>UltestClear<cr>")
 nmap("<leader>tn", "<cmd>UltestNearest<cr>")
 nmap("<leader>to", "<cmd>UltestOutput<cr>")
-
--- Buffer
-nmap("<leader>c", "<cmd>bdelete<cr>")

M lua/plugin/dap.lua

@@ -1,3 +1,4 @@
+local nmap = require("utils").nmap
 local M = {}
 
 function M.setup()
@@ -19,6 +20,18 @@ texthl = "LspDiagnosticsSignInformation",
     linehl = "DiagnosticUnderlineInfo",
     numhl = "LspDiagnosticsSignInformation",
   })
+
+  -- Mappings
+  nmap("<leader>dt", "<cmd>lua require'dap'.toggle_breakpoint()<cr>")
+  nmap("<leader>db", "<cmd>lua require'dap'.step_back()<cr>")
+  nmap("<leader>dc", "<cmd>lua require'dap'.continue()<cr>")
+  nmap("<leader>dd", "<cmd>lua require'dap'.disconnect()<cr>")
+  nmap("<leader>di", "<cmd>lua require'dap'.step_into()<cr>")
+  nmap("<leader>do", "<cmd>lua require'dap'.step_over()<cr>")
+  nmap("<leader>du", "<cmd>lua require'dap'.step_out()<cr>")
+  nmap("<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>")
+  nmap("<leader>dp", "<cmd>lua require'dap'.pause.toggle()<cr>")
+  nmap("<leader>dq", "<cmd>lua require'dap'.close()<cr>")
 end
 
 return M

M lua/plugin/telescope.lua

@@ -1,3 +1,4 @@
+local nmap = require("utils").nmap
 local M = {}
 
 function M.setup()
@@ -44,7 +45,17 @@ },
     },
   }
 
+  -- Extensions
   require("telescope").load_extension "projects"
+
+  -- Mappings
+  nmap("<leader>f", "<cmd>Telescope find_files<cr>")
+  nmap("<leader>b", "<cmd>Telescope buffers<cr>")
+  nmap("<leader>st", "<cmd>Telescope live_grep<cr>")
+  nmap("<leader>sr", "<cmd>Telescope oldfiles<cr>")
+  nmap("<leader>sb", "<cmd>Telescope git_branches<cr>")
+  nmap("<leader>sc", "<cmd>Telescope git_commits<cr>")
+  nmap("<leader>sk", "<cmd>Telescope keymaps<cr>")
 end
 
 return M

M lua/utils.lua

@@ -7,12 +7,6 @@ vim.api.nvim_set_keymap(mode, from, to, opts)
 end
 
 function M.map(mode, from, to)
-  if type(mode) == "table" then
-    for _, m in pairs(mode) do
-      M._map(m, from, to, M.opts)
-    end
-  end
-
   M._map(mode, from, to, M.opts)
 end
 
@@ -22,10 +16,6 @@ end
 
 function M.expr(mode, from, to)
   M._map(mode, from, to, { noremap = true, expr = true })
-end
-
-function M.setup(module, opts)
-  require(module).setup(opts or {})
 end
 
 function M.get_config(name)