refactor(nvim): migrate to vim.keymap.set
This commit is contained in:
parent
7825b61280
commit
f848b943f6
@ -1,5 +1,3 @@
|
||||
local utils_func = require('utils.funcs')
|
||||
local map = utils_func.map
|
||||
local M = {}
|
||||
|
||||
M.setup = function()
|
||||
@ -7,58 +5,52 @@ M.setup = function()
|
||||
vim.g.mapleader = ' '
|
||||
|
||||
-- Get rid of highlight after search
|
||||
map('n', '<esc>', ':noh<CR>')
|
||||
vim.keymap.set('n', '<esc>', ':noh<CR>')
|
||||
|
||||
-- Spell Checking
|
||||
map('n', '<leader>st', ':set spell!<CR>')
|
||||
vim.keymap.set('n', '<leader>st', ':set spell!<CR>')
|
||||
|
||||
-- Better split movement
|
||||
map('n', '<C-l>', '<C-w>l')
|
||||
map('n', '<C-h>', '<C-w>h')
|
||||
map('n', '<C-k>', '<C-w>k')
|
||||
map('n', '<C-j>', '<C-w>j')
|
||||
vim.keymap.set('n', '<C-l>', '<C-w>l')
|
||||
vim.keymap.set('n', '<C-h>', '<C-w>h')
|
||||
vim.keymap.set('n', '<C-k>', '<C-w>k')
|
||||
vim.keymap.set('n', '<C-j>', '<C-w>j')
|
||||
|
||||
-- Better split closing
|
||||
map('n', '<C-x>', '<C-w>c')
|
||||
vim.keymap.set('n', '<C-x>', '<C-w>c')
|
||||
|
||||
-- Switch between tabs faster
|
||||
map('n', '<C-s>', ':tabnext<CR>')
|
||||
map('n', '<C-a>', ':tabprevious<CR>')
|
||||
vim.keymap.set('n', '<C-s>', ':tabnext<CR>')
|
||||
vim.keymap.set('n', '<C-a>', ':tabprevious<CR>')
|
||||
|
||||
-- Set current focused file as cwd
|
||||
map('n', '<leader>cd', ':cd %:p:h<CR>')
|
||||
vim.keymap.set('n', '<leader>cd', ':cd %:p:h<CR>')
|
||||
|
||||
-- Toggle showing diagnostics
|
||||
local diagnostics_active = true
|
||||
map('n', '<leader>lh', '', {
|
||||
callback = function()
|
||||
diagnostics_active = not diagnostics_active
|
||||
if diagnostics_active then
|
||||
vim.diagnostic.show()
|
||||
else
|
||||
vim.diagnostic.hide()
|
||||
end
|
||||
end,
|
||||
})
|
||||
vim.keymap.set('n', '<leader>lh', '', function()
|
||||
diagnostics_active = not diagnostics_active
|
||||
if diagnostics_active then
|
||||
vim.diagnostic.show()
|
||||
else
|
||||
vim.diagnostic.hide()
|
||||
end
|
||||
end)
|
||||
|
||||
-- Toggle showing command bar
|
||||
map('n', '<leader>cl', '', {
|
||||
callback = function()
|
||||
local current_cmdheight = vim.opt.cmdheight:get()
|
||||
if current_cmdheight > 0 then
|
||||
vim.opt.cmdheight = 0
|
||||
else
|
||||
vim.opt.cmdheight = 1
|
||||
end
|
||||
end,
|
||||
})
|
||||
vim.keymap.set('n', '<leader>cl', '', function()
|
||||
local current_cmdheight = vim.opt.cmdheight:get()
|
||||
if current_cmdheight > 0 then
|
||||
vim.opt.cmdheight = 0
|
||||
else
|
||||
vim.opt.cmdheight = 1
|
||||
end
|
||||
end)
|
||||
|
||||
-- Toggle relativenumber
|
||||
map('n', '<leader>sn', '', {
|
||||
callback = function()
|
||||
vim.opt.relativenumber = not vim.opt.relativenumber:get()
|
||||
end,
|
||||
})
|
||||
vim.keymap.set('n', '<leader>sn', '', function()
|
||||
vim.opt.relativenumber = not vim.opt.relativenumber:get()
|
||||
end)
|
||||
end
|
||||
|
||||
return M
|
||||
|
||||
@ -7,127 +7,112 @@ if not loaded then
|
||||
end
|
||||
|
||||
-- Telescope mappings
|
||||
map('n', '<Leader>tw', ':Telescope live_grep<CR>')
|
||||
map('n', '<Leader>tgs', ':Telescope git_status<CR>')
|
||||
map('n', '<Leader>tgc', ':Telescope git_commits<CR>')
|
||||
map('n', '<Leader>tgb', ':Telescope git_branches<CR>')
|
||||
map('n', '<Leader>tf', ':Telescope find_files<CR>')
|
||||
map('n', '<Leader>td', ':Telescope find_directories<CR>')
|
||||
map('n', '<Leader>tb', ':Telescope buffers<CR>')
|
||||
map('n', '<Leader>th', ':Telescope help_tags<CR>')
|
||||
map('n', '<Leader>to', ':Telescope oldfiles<CR>')
|
||||
map('n', '<leader>tc', ':Telescope neoclip default<CR>')
|
||||
map('n', '<leader>tr', ':Telescope registers<CR>')
|
||||
map('n', '<leader>tt', ':Telescope file_browser<CR>')
|
||||
map('n', '<leader>ts', ':Telescope spell_suggest<CR>')
|
||||
map('n', '<leader>tl', ':Telescope resume<CR>')
|
||||
map('n', '<leader>tT', ':TodoTelescope<CR>')
|
||||
vim.keymap.set('n', '<Leader>tw', ':Telescope live_grep<CR>')
|
||||
vim.keymap.set('n', '<Leader>tgs', ':Telescope git_status<CR>')
|
||||
vim.keymap.set('n', '<Leader>tgc', ':Telescope git_commits<CR>')
|
||||
vim.keymap.set('n', '<Leader>tgb', ':Telescope git_branches<CR>')
|
||||
vim.keymap.set('n', '<Leader>tf', ':Telescope find_files<CR>')
|
||||
vim.keymap.set('n', '<Leader>td', ':Telescope find_directories<CR>')
|
||||
vim.keymap.set('n', '<Leader>tb', ':Telescope buffers<CR>')
|
||||
vim.keymap.set('n', '<Leader>th', ':Telescope help_tags<CR>')
|
||||
vim.keymap.set('n', '<Leader>to', ':Telescope oldfiles<CR>')
|
||||
vim.keymap.set('n', '<leader>tc', ':Telescope neoclip default<CR>')
|
||||
vim.keymap.set('n', '<leader>tr', ':Telescope registers<CR>')
|
||||
vim.keymap.set('n', '<leader>tt', ':Telescope file_browser<CR>')
|
||||
vim.keymap.set('n', '<leader>ts', ':Telescope spell_suggest<CR>')
|
||||
vim.keymap.set('n', '<leader>tl', ':Telescope resume<CR>')
|
||||
vim.keymap.set('n', '<leader>tT', ':TodoTelescope<CR>')
|
||||
|
||||
-- Lsp Mappings
|
||||
map('n', '<leader>lD', ':lua vim.lsp.buf.declaration()<CR>')
|
||||
map('n', '<leader>ld', ':lua vim.lsp.buf.definition()<CR>')
|
||||
map('n', '<leader>k', ':lua vim.lsp.buf.hover()<CR>')
|
||||
map('n', '<leader>K', ':lua vim.lsp.buf.signature_help()<CR>')
|
||||
map('n', '<leader>li', ':lua vim.lsp.buf.implementation()<CR>')
|
||||
map('n', '<leader>la', ':lua vim.lsp.buf.add_workspace_folder()<CR>')
|
||||
map('n', '<leader>lx', ':lua vim.lsp.buf.remove_workspace_folder()<CR>')
|
||||
map('n', '<leader>ll', ':lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>')
|
||||
map('n', '<leader>ln', ':IncRename ')
|
||||
map('n', '<leader>lc', ':CodeActionMenu<CR>')
|
||||
map('n', '<leader>lr', ':lua vim.lsp.buf.references()<CR>')
|
||||
map('n', '<leader>lR', ':LspRestart<CR>')
|
||||
map('n', '<leader>ls', ":lua vim.diagnostic.open_float(nil, {focus=false, scope='cursor'})<CR>")
|
||||
map('n', '<leader>lf', ':lua vim.lsp.buf.format({ async = true })<CR>')
|
||||
map('n', '[l', ':lua vim.diagnostic.goto_prev()<CR>')
|
||||
map('n', ']l', ':lua vim.diagnostic.goto_next()<CR>')
|
||||
map('n', '<leader>lq', ':Telescope diagnostics bufnr=0<CR>')
|
||||
map('n', '<leader>lt', '', {
|
||||
callback = function()
|
||||
local virtual_lines_enabled = not vim.diagnostic.config().virtual_lines
|
||||
vim.diagnostic.config({ virtual_lines = virtual_lines_enabled, virtual_text = not virtual_lines_enabled })
|
||||
end,
|
||||
})
|
||||
vim.keymap.set('n', '<leader>lD', ':lua vim.lsp.buf.declaration()<CR>')
|
||||
vim.keymap.set('n', '<leader>ld', ':lua vim.lsp.buf.definition()<CR>')
|
||||
vim.keymap.set('n', '<leader>k', ':lua vim.lsp.buf.hover()<CR>')
|
||||
vim.keymap.set('n', '<leader>K', ':lua vim.lsp.buf.signature_help()<CR>')
|
||||
vim.keymap.set('n', '<leader>li', ':lua vim.lsp.buf.implementation()<CR>')
|
||||
vim.keymap.set('n', '<leader>la', ':lua vim.lsp.buf.add_workspace_folder()<CR>')
|
||||
vim.keymap.set('n', '<leader>lx', ':lua vim.lsp.buf.remove_workspace_folder()<CR>')
|
||||
vim.keymap.set('n', '<leader>ll', ':lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>')
|
||||
vim.keymap.set('n', '<leader>ln', ':IncRename ')
|
||||
vim.keymap.set('n', '<leader>lc', ':CodeActionMenu<CR>')
|
||||
vim.keymap.set('n', '<leader>lr', ':lua vim.lsp.buf.references()<CR>')
|
||||
vim.keymap.set('n', '<leader>lR', ':LspRestart<CR>')
|
||||
vim.keymap.set('n', '<leader>ls', ":lua vim.diagnostic.open_float(nil, {focus=false, scope='cursor'})<CR>")
|
||||
vim.keymap.set('n', '<leader>lf', ':lua vim.lsp.buf.format({ async = true })<CR>')
|
||||
vim.keymap.set('n', '[l', ':lua vim.diagnostic.goto_prev()<CR>')
|
||||
vim.keymap.set('n', ']l', ':lua vim.diagnostic.goto_next()<CR>')
|
||||
vim.keymap.set('n', '<leader>lq', ':Telescope diagnostics bufnr=0<CR>')
|
||||
vim.keymap.set('n', '<leader>lt', function()
|
||||
local virtual_lines_enabled = not vim.diagnostic.config().virtual_lines
|
||||
vim.diagnostic.config({ virtual_lines = virtual_lines_enabled, virtual_text = not virtual_lines_enabled })
|
||||
end)
|
||||
|
||||
-- Trouble mappings
|
||||
map('n', '<leader>lT', ':TroubleToggle<CR>')
|
||||
vim.keymap.set('n', '<leader>lT', ':TroubleToggle<CR>')
|
||||
|
||||
-- Formatter
|
||||
map('n', '<leader>nf', ':Neoformat<CR>')
|
||||
vim.keymap.set('n', '<leader>nf', ':Neoformat<CR>')
|
||||
|
||||
-- DAP Mappings
|
||||
map('n', '<leader>dR', ':lua require("dap").continue()<CR>')
|
||||
map('n', '<leader>de', ':lua require("dap").terminate()<CR>')
|
||||
map('n', '<leader>db', ':lua require("dap").toggle_breakpoint()<CR>')
|
||||
map('n', '<leader>dr', ':lua require("dap").set_breakpoint(vim.fn.input(\'Breakpoint condition: \'))<CR>')
|
||||
map('n', '<leader>dp', ':lua require("dap").set_breakpoint(nil, nil, vim.fn.input(\'Log point message: \'))<CR>')
|
||||
map('n', '<F5>', ':lua require("dap").step_over()<CR>')
|
||||
map('n', '<F6>', ':lua require("dap").step_into()<CR>')
|
||||
map('n', '<F7>', ':lua require("dap").step_out()<CR>')
|
||||
map('n', '<leader>dB', ':lua require("dap").step_back()<CR>')
|
||||
map('n', '<leader>dc', ':lua require("dap").run_to_cursor()<CR>')
|
||||
map('n', '<leader>do', ':lua require("dap").repl.open()<CR>')
|
||||
map('n', '<leader>dt', ':lua require("dapui").toggle()<CR>')
|
||||
map('n', '<leader>dl', ':lua require("dap").run_last()<CR>')
|
||||
vim.keymap.set('n', '<leader>dR', ':lua require("dap").continue()<CR>')
|
||||
vim.keymap.set('n', '<leader>de', ':lua require("dap").terminate()<CR>')
|
||||
vim.keymap.set('n', '<leader>db', ':lua require("dap").toggle_breakpoint()<CR>')
|
||||
vim.keymap.set('n', '<leader>dr', ':lua require("dap").set_breakpoint(vim.fn.input(\'Breakpoint condition: \'))<CR>')
|
||||
vim.keymap.set(
|
||||
'n',
|
||||
'<leader>dp',
|
||||
':lua require("dap").set_breakpoint(nil, nil, vim.fn.input(\'Log point message: \'))<CR>'
|
||||
)
|
||||
vim.keymap.set('n', '<F5>', ':lua require("dap").step_over()<CR>')
|
||||
vim.keymap.set('n', '<F6>', ':lua require("dap").step_into()<CR>')
|
||||
vim.keymap.set('n', '<F7>', ':lua require("dap").step_out()<CR>')
|
||||
vim.keymap.set('n', '<leader>dB', ':lua require("dap").step_back()<CR>')
|
||||
vim.keymap.set('n', '<leader>dc', ':lua require("dap").run_to_cursor()<CR>')
|
||||
vim.keymap.set('n', '<leader>do', ':lua require("dap").repl.open()<CR>')
|
||||
vim.keymap.set('n', '<leader>dt', ':lua require("dapui").toggle()<CR>')
|
||||
vim.keymap.set('n', '<leader>dl', ':lua require("dap").run_last()<CR>')
|
||||
|
||||
-- Comments
|
||||
map('n', '<leader>/', ':CommentToggle<CR>')
|
||||
map('v', '<leader>/', ":'<,'>CommentToggle<CR>")
|
||||
vim.keymap.set('n', '<leader>/', ':CommentToggle<CR>')
|
||||
vim.keymap.set('v', '<leader>/', ":'<,'>CommentToggle<CR>")
|
||||
|
||||
-- Code Outline
|
||||
map('n', '<leader>co', ':SymbolsOutline<CR>')
|
||||
vim.keymap.set('n', '<leader>co', ':SymbolsOutline<CR>')
|
||||
|
||||
-- Bufferline mappings
|
||||
map('n', '<A-a>', ':BufferLineCyclePrev<CR>')
|
||||
map('n', '<A-s>', ':BufferLineCycleNext<CR>')
|
||||
map('n', '<A-x>', ":lua require('utils.funcs').close_buffer()<CR>")
|
||||
vim.keymap.set('n', '<A-a>', ':BufferLineCyclePrev<CR>')
|
||||
vim.keymap.set('n', '<A-s>', ':BufferLineCycleNext<CR>')
|
||||
vim.keymap.set('n', '<A-x>', ":lua require('utils.funcs').close_buffer()<CR>")
|
||||
|
||||
-- Vim Notify Mappings
|
||||
map('n', '<leader>nv', ":lua require('telescope').extensions.notify.notify()<CR>")
|
||||
map('n', '<leader>nd', ":lua require('notify').dismiss()<CR>")
|
||||
vim.keymap.set('n', '<leader>nv', ":lua require('telescope').extensions.notify.notify()<CR>")
|
||||
vim.keymap.set('n', '<leader>nd', ":lua require('notify').dismiss()<CR>")
|
||||
|
||||
-- Whichkey Mappings
|
||||
map('n', '<leader>ww', ':WhichKey<CR>')
|
||||
map('n', '<leader>wk', ':Telescope keymaps<CR>')
|
||||
map('n', '<leader>wc', ':Telescope commands<CR>')
|
||||
vim.keymap.set('n', '<leader>ww', ':WhichKey<CR>')
|
||||
vim.keymap.set('n', '<leader>wk', ':Telescope keymaps<CR>')
|
||||
vim.keymap.set('n', '<leader>wc', ':Telescope commands<CR>')
|
||||
|
||||
-- Neogen Mappings
|
||||
map('n', '<leader>ng', ':Neogen<CR>')
|
||||
vim.keymap.set('n', '<leader>ng', ':Neogen<CR>')
|
||||
|
||||
-- Nvim Tree Mappings
|
||||
map('n', '<leader>nt', ':Neotree show toggle focus<cr>')
|
||||
vim.keymap.set('n', '<leader>nt', ':Neotree show toggle focus<cr>')
|
||||
|
||||
-- Plenary Mappings
|
||||
map('n', '<leader>pt', '<Plug>PlenaryTestFile', {})
|
||||
vim.keymap.set('n', '<leader>pt', '<Plug>PlenaryTestFile', {})
|
||||
|
||||
-- Zenmode Mappings
|
||||
map('n', '<leader>zm', ':ZenMode<CR>')
|
||||
vim.keymap.set('n', '<leader>zm', ':ZenMode<CR>')
|
||||
|
||||
-- Neogit Mappings
|
||||
map('n', '<leader>gg', ':Neogit<CR>')
|
||||
vim.keymap.set('n', '<leader>gg', ':Neogit<CR>')
|
||||
|
||||
-- Gitsigns Mappings
|
||||
map('n', ']g', '<cmd>Gitsigns next_hunk<CR>')
|
||||
map('n', '[g', '<cmd>Gitsigns prev_hunk<CR>')
|
||||
map('n', '<leader>gs', '<cmd>Gitsigns stage_hunk<CR>')
|
||||
map('n', '<leader>gr', '<cmd>Gitsigns reset_hunk<CR>')
|
||||
map('n', '<leader>gu', '<cmd>Gitsigns undo_stage_hunk<CR>')
|
||||
|
||||
-- SnipRun Mappings
|
||||
local run_snip = function()
|
||||
async.run(function()
|
||||
vim.notify.async('Running snippet, saving current buffer.', 'info', {
|
||||
title = 'SnipRun',
|
||||
})
|
||||
end)
|
||||
vim.cmd('w')
|
||||
vim.cmd('SnipRun')
|
||||
end
|
||||
map('n', '<leader>sr', '', {
|
||||
callback = run_snip,
|
||||
})
|
||||
map('v', '<leader>sr', '', {
|
||||
callback = run_snip,
|
||||
})
|
||||
vim.keymap.set('n', ']g', '<cmd>Gitsigns next_hunk<CR>')
|
||||
vim.keymap.set('n', '[g', '<cmd>Gitsigns prev_hunk<CR>')
|
||||
vim.keymap.set('n', '<leader>gs', '<cmd>Gitsigns stage_hunk<CR>')
|
||||
vim.keymap.set('n', '<leader>gr', '<cmd>Gitsigns reset_hunk<CR>')
|
||||
vim.keymap.set('n', '<leader>gu', '<cmd>Gitsigns undo_stage_hunk<CR>')
|
||||
|
||||
-- Packer Mappings
|
||||
local packer = require('packer')
|
||||
@ -147,13 +132,9 @@ local packer_compile = function()
|
||||
packer.compile()
|
||||
end
|
||||
|
||||
map('n', '<leader>ps', '', {
|
||||
callback = packer_sync,
|
||||
})
|
||||
vim.keymap.set('n', '<leader>ps', packer_sync)
|
||||
|
||||
map('n', '<leader>pc', '', {
|
||||
callback = packer_compile,
|
||||
})
|
||||
vim.keymap.set('n', '<leader>pc', packer_compile)
|
||||
|
||||
-- Undotree mappings
|
||||
map('n', '<leader>ut', ':UndotreeToggle<CR>')
|
||||
vim.keymap.set('n', '<leader>ut', ':UndotreeToggle<CR>')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user