Job79/neovim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: small changes

Browse Source
This commit is contained in:
Job79
2026-09-05 16:53:39 +02:00
parent 0fffee1c1a
commit 4e03b0e297
6 changed files with 95 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin/20_keymaps.lua
+85 -64
View File
@@ -14,96 +14,117 @@ Config.leader_group_clues = {
}
-- Keymap Helpers
local function map(mode, lhs, rhs, desc)
vim.keymap.set(mode, lhs, rhs, { desc = desc, silent = true })
local nmap_leader = function(suffix, rhs, desc)
vim.keymap.set("n", "<Leader>" .. suffix, rhs, { desc = desc, silent = true })
end
local function leader(suffix, rhs, desc, mode)
map(mode or "n", "<Leader>" .. suffix, rhs, desc)
local xmap_leader = function(suffix, rhs, desc)
vim.keymap.set("x", "<Leader>" .. suffix, rhs, { desc = desc, silent = true })
end
-- Buffers
leader("bd", "<cmd>bdelete<CR>", "Delete")
leader("bD", "<cmd>bdelete!<CR>", "Delete!")
leader("bw", "<cmd>bwipeout<CR>", "Wipeout")
leader("bW", "<cmd>bwipeout!<CR>", "Wipeout!")
leader("bo", function()
local new_scratch_buffer = function()
vim.api.nvim_win_set_buf(0, vim.api.nvim_create_buf(true, true))
end
local close_invisible_buffers = function()
local visible = vim.iter(vim.api.nvim_list_wins()):map(vim.api.nvim_win_get_buf):totable()
vim.iter(vim.api.nvim_list_bufs())
:filter(function(buf) return not vim.list_contains(visible, buf) end)
:each(function(buf) pcall(vim.api.nvim_buf_delete, buf, { force = false }) end)
end, "Close invisible buffers")
end
nmap_leader("bd", "<Cmd>bdelete<CR>", "Delete")
nmap_leader("bD", "<Cmd>bdelete!<CR>", "Delete!")
nmap_leader("bs", new_scratch_buffer, "Scratch")
nmap_leader("bw", "<Cmd>bwipeout<CR>", "Wipeout")
nmap_leader("bW", "<Cmd>bwipeout!<CR>", "Wipeout!")
nmap_leader("bo", close_invisible_buffers, "Close invisible buffers")
-- Debug
leader("db", function() require("dap").toggle_breakpoint() end, "Toggle Breakpoint")
leader("dl", function() require("dap").set_breakpoint(nil, nil, vim.fn.input("Log point: ")) end, "Log point")
leader("dc", function() require("dap").continue() end, "Run/Continue")
leader("dC", function() require("dap").run_to_cursor() end, "Run to Cursor")
leader("de", function() require("dap.ui.widgets").hover() end, "Inspect")
leader("dr", function() require("dap").repl.open() end, "Open REPL")
leader("dt", function() require("dap").terminate() end, "Terminate")
nmap_leader("db", "<Cmd>lua require('dap').toggle_breakpoint()<CR>", "Toggle Breakpoint")
nmap_leader("dl", "<Cmd>lua require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point: '))<CR>", "Log point")
nmap_leader("dc", "<Cmd>lua require('dap').continue()<CR>", "Run/Continue")
nmap_leader("dC", "<Cmd>lua require('dap').run_to_cursor()<CR>", "Run to Cursor")
nmap_leader("de", "<Cmd>lua require('dap.ui.widgets').hover()<CR>", "Inspect")
nmap_leader("dr", "<Cmd>lua require('dap').repl.open()<CR>", "Open REPL")
nmap_leader("dt", "<Cmd>lua require('dap').terminate()<CR>", "Terminate")
-- Explore
leader("ed", function() MiniFiles.open() end, "Directory")
leader("ef", function()
local explore_at_file = function()
local file = vim.api.nvim_buf_get_name(0)
MiniFiles.open(vim.uv.fs_stat(file) and file or nil)
end, "File directory")
leader("ey", function() vim.fn.setreg("+", vim.api.nvim_buf_get_name(0)) end, "Yank absolute path")
end
nmap_leader("ed", "<Cmd>lua MiniFiles.open()<CR>", "Directory")
nmap_leader("ef", explore_at_file, "File directory")
nmap_leader("ey", "<Cmd>lua vim.fn.setreg('+', vim.api.nvim_buf_get_name(0))<CR>", "Yank absolute path")
nmap_leader("en", "<Cmd>messages<CR>", "Notifications")
-- Find
leader("fb", function() MiniPick.builtin.buffers() end, "Buffers")
leader("fc", function() MiniExtra.pickers.git_commits() end, "Commits (all)")
leader("fC", function() MiniExtra.pickers.git_commits({ path = "%" }) end, "Commits (buf)")
leader("fd", function() MiniExtra.pickers.diagnostic({ scope = "all" }) end, "Diagnostic workspace")
leader("fD", function() MiniExtra.pickers.diagnostic({ scope = "current" }) end, "Diagnostic buffer")
leader("ff", function() MiniPick.builtin.files() end, "Files")
leader("fg", function() MiniPick.builtin.grep_live() end, "Grep live")
leader("fG", function() MiniPick.builtin.grep({ pattern = vim.fn.expand("<cword>") }) end, "Grep word")
leader("fh", function() MiniPick.builtin.help() end, "Help tags")
leader("fl", function() MiniPick.builtin.buf_lines({ scope = "all" }) end, "Lines (all)")
leader("fL", function() MiniPick.builtin.buf_lines({ scope = "current" }) end, "Lines (buf)")
leader("fr", function() MiniPick.builtin.resume() end, "Resume")
leader("fs", function() MiniExtra.pickers.lsp({ scope = "workspace_symbol_live" }) end, "Symbols workspace")
leader("fS", function() MiniExtra.pickers.lsp({ scope = "document_symbol" }) end, "Symbols document")
leader("f:", function() MiniExtra.pickers.history({ scope = ":" }) end, "Command history")
nmap_leader("fb", "<Cmd>lua MiniPick.builtin.buffers()<CR>", "Buffers")
nmap_leader("fc", "<Cmd>lua MiniExtra.pickers.git_commits()<CR>", "Commits (all)")
nmap_leader("fC", "<Cmd>lua MiniExtra.pickers.git_commits({ path = '%' })<CR>", "Commits (buf)")
nmap_leader("fd", "<Cmd>lua MiniExtra.pickers.diagnostic({ scope = 'all' })<CR>", "Diagnostic workspace")
nmap_leader("fD", "<Cmd>lua MiniExtra.pickers.diagnostic({ scope = 'current' })<CR>", "Diagnostic buffer")
nmap_leader("ff", "<Cmd>lua MiniPick.builtin.files()<CR>", "Files")
nmap_leader("fg", "<Cmd>lua MiniPick.builtin.grep_live()<CR>", "Grep live")
nmap_leader("fG", "<Cmd>lua MiniPick.builtin.grep({ pattern = vim.fn.expand('<cword>') })<CR>", "Grep word")
nmap_leader("fh", "<Cmd>lua MiniPick.builtin.help()<CR>", "Help tags")
nmap_leader("fl", "<Cmd>lua MiniPick.builtin.buf_lines({ scope = 'all' })<CR>", "Lines (all)")
nmap_leader("fL", "<Cmd>lua MiniPick.builtin.buf_lines({ scope = 'current' })<CR>", "Lines (buf)")
nmap_leader("fr", "<Cmd>lua MiniPick.builtin.resume()<CR>", "Resume")
nmap_leader("fs", "<Cmd>lua MiniExtra.pickers.lsp({ scope = 'workspace_symbol_live' })<CR>", "Symbols workspace")
nmap_leader("fS", "<Cmd>lua MiniExtra.pickers.lsp({ scope = 'document_symbol' })<CR>", "Symbols document")
nmap_leader("f:", "<Cmd>lua MiniExtra.pickers.history({ scope = ':' })<CR>", "Command history")
-- Git
leader("go", function() MiniDiff.toggle_overlay() end, "Toggle overlay")
leader("gs", function() MiniGit.show_at_cursor() end, "Show at cursor")
leader("gs", function() MiniGit.show_at_cursor() end, "Show selection", "x")
local git_log_cmd = [[Git log --pretty=format:\%h\ \%as\ │\ \%s --topo-order]]
local git_log_buf_cmd = git_log_cmd .. " --follow -- %"
nmap_leader("ga", "<Cmd>Git diff --cached<CR>", "Added diff")
nmap_leader("gA", "<Cmd>Git diff --cached -- %<CR>", "Added diff buffer")
nmap_leader("gd", "<Cmd>Git diff<CR>", "Diff")
nmap_leader("gD", "<Cmd>Git diff -- %<CR>", "Diff buffer")
nmap_leader("gl", "<Cmd>" .. git_log_cmd .. "<CR>", "Log")
nmap_leader("gL", "<Cmd>" .. git_log_buf_cmd .. "<CR>", "Log buffer")
nmap_leader("go", "<Cmd>lua MiniDiff.toggle_overlay()<CR>", "Toggle overlay")
nmap_leader("gs", "<Cmd>lua MiniGit.show_at_cursor()<CR>", "Show at cursor")
xmap_leader("gs", "<Cmd>lua MiniGit.show_at_cursor()<CR>", "Show at selection")
-- Language
leader("la", vim.lsp.buf.code_action, "Actions")
leader("ld", vim.diagnostic.open_float, "Diagnostic popup")
leader("lf", function() require("conform").format({ async = true }) end, "Format")
leader("lf", function() require("conform").format({ async = true }) end, "Format selection", "x")
leader("li", vim.lsp.buf.implementation, "Implementation")
leader("lh", vim.lsp.buf.hover, "Hover")
leader("ll", vim.lsp.codelens.run, "Lens")
leader("lr", vim.lsp.buf.rename, "Rename")
leader("lR", vim.lsp.buf.references, "References")
leader("ls", vim.lsp.buf.definition, "Source definition")
leader("lt", vim.lsp.buf.type_definition, "Type definition")
nmap_leader("la", "<Cmd>lua vim.lsp.buf.code_action()<CR>", "Actions")
nmap_leader("ld", "<Cmd>lua vim.diagnostic.open_float()<CR>", "Diagnostic popup")
nmap_leader("lf", "<Cmd>lua require('conform').format({ async = true })<CR>", "Format")
xmap_leader("lf", "<Cmd>lua require('conform').format({ async = true })<CR>", "Format selection")
nmap_leader("li", "<Cmd>lua vim.lsp.buf.implementation()<CR>", "Implementation")
nmap_leader("lh", "<Cmd>lua vim.lsp.buf.hover()<CR>", "Hover")
nmap_leader("ll", "<Cmd>lua vim.lsp.codelens.run()<CR>", "Lens")
nmap_leader("lr", "<Cmd>lua vim.lsp.buf.rename()<CR>", "Rename")
nmap_leader("lR", "<Cmd>lua vim.lsp.buf.references()<CR>", "References")
nmap_leader("ls", "<Cmd>lua vim.lsp.buf.definition()<CR>", "Source definition")
nmap_leader("lt", "<Cmd>lua vim.lsp.buf.type_definition()<CR>", "Type definition")
-- Request
leader("rs", function() require("kulala").run() end, "Send HTTP request")
nmap_leader("rs", "<Cmd>lua require('kulala').run()<CR>", "Send HTTP request")
-- Session
leader("sd", function() MiniSessions.select("delete") end, "Delete")
leader("sn", function() vim.ui.input({ prompt = "Session name: " }, MiniSessions.write) end, "New")
leader("sr", function() MiniSessions.select("read") end, "Read")
leader("sR", function() MiniSessions.restart() end, "Restart")
leader("sw", function() MiniSessions.write() end, "Write current")
local session_new = "vim.ui.input({ prompt = 'Session name: ' }, MiniSessions.write)"
nmap_leader("sd", "<Cmd>lua MiniSessions.select('delete')<CR>", "Delete")
nmap_leader("sn", "<Cmd>lua " .. session_new .. "<CR>", "New")
nmap_leader("sr", "<Cmd>lua MiniSessions.select('read')<CR>", "Read")
nmap_leader("sR", "<Cmd>lua MiniSessions.restart()<CR>", "Restart")
nmap_leader("sw", "<Cmd>lua MiniSessions.write()<CR>", "Write current")
-- Terminal
leader("tT", "<cmd>horizontal term<CR>", "Terminal (horizontal)")
leader("tt", "<cmd>vertical term<CR>", "Terminal (vertical)")
leader("tc", "<cmd>vertical term claude<CR>", "Claude")
leader("tf", function() require("terminal").open_terminal_app("bash") end, "Terminal (popup)")
leader("tg", function() require("terminal").open_terminal_app("lazygit") end, "LazyGit")
leader("ts", function() require("terminal").open_terminal_app("lazysql") end, "LazySQL")
nmap_leader("tT", "<Cmd>horizontal term<CR>", "Terminal (horizontal)")
nmap_leader("tt", "<Cmd>vertical term<CR>", "Terminal (vertical)")
nmap_leader("tc", "<Cmd>vertical term claude<CR>", "Claude")
nmap_leader("tf", "<Cmd>lua require('terminal').open_terminal_app('bash')<CR>", "Terminal (popup)")
nmap_leader("tg", "<Cmd>lua require('terminal').open_terminal_app('lazygit')<CR>", "LazyGit")
nmap_leader("ts", "<Cmd>lua require('terminal').open_terminal_app('lazysql')<CR>", "LazySQL")
-- Overwrites
map("n", "<Esc>", "<cmd>nohlsearch<CR>", "Clear highlights")
map("t", "<C-w>", "<C-\\><C-n><C-w>", "Terminal window navigation")
vim.keymap.set("n", "<Esc>", "<Cmd>nohlsearch<CR>", { desc = "Clear highlights", silent = true })
vim.keymap.set("t", "<C-w>", "<C-\\><C-n><C-w>", { desc = "Terminal window navigation", silent = true })