refactor(mappings): update moar mappings
This commit is contained in:
Matthew Leong
parent
e16fce2f4f
commit
8836c5bd3f
7 changed files with 43 additions and 36 deletions
|
|
@ -15,8 +15,8 @@ function M.init(client, bufnr)
|
|||
buf_map('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>', { desc = 'Go to reference' })
|
||||
|
||||
-- diagnostics
|
||||
buf_map('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<cr>', { desc = 'Next diagnostic' })
|
||||
buf_map('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<cr>', { desc = 'Prev diagnostic' })
|
||||
buf_map('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<cr>', { desc = 'Prev diagnostic' })
|
||||
buf_map('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<cr>', { desc = 'Next diagnostic' })
|
||||
buf_map(
|
||||
'n',
|
||||
'ge',
|
||||
|
|
|
|||
|
|
@ -14,9 +14,6 @@ return {
|
|||
topdelete = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
|
||||
changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
|
||||
},
|
||||
current_line_blame_formatter_opts = {
|
||||
relative_time = false,
|
||||
},
|
||||
preview_config = {
|
||||
-- Options passed to nvim_open_win
|
||||
border = user_config.border,
|
||||
|
|
@ -25,9 +22,6 @@ return {
|
|||
row = 0,
|
||||
col = 1,
|
||||
},
|
||||
yadm = {
|
||||
enable = false,
|
||||
},
|
||||
on_attach = function(bufnr)
|
||||
local gs = package.loaded.gitsigns
|
||||
local map = u.create_buf_map(bufnr)
|
||||
|
|
@ -59,24 +53,24 @@ return {
|
|||
})
|
||||
|
||||
-- Actions
|
||||
map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>', { desc = 'Stage hunk' })
|
||||
map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>', { desc = 'Reset hunk' })
|
||||
map('n', '<leader>hS', gs.stage_buffer, { desc = 'Stage buffer' })
|
||||
map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'Under stage hunk' })
|
||||
map('n', '<leader>hR', gs.reset_buffer, { desc = 'Reset buffer' })
|
||||
map('n', '<leader>hp', gs.preview_hunk, { desc = 'Preview hunk' })
|
||||
map('n', '<leader>hb', function()
|
||||
map({ 'n', 'v' }, '<leader>vs', ':Gitsigns stage_hunk<CR>', { desc = 'Stage hunk' })
|
||||
map({ 'n', 'v' }, '<leader>vr', ':Gitsigns reset_hunk<CR>', { desc = 'Reset hunk' })
|
||||
map('n', '<leader>vS', gs.stage_buffer, { desc = 'Stage buffer' })
|
||||
map('n', '<leader>vu', gs.undo_stage_hunk, { desc = 'Under stage hunk' })
|
||||
map('n', '<leader>vR', gs.reset_buffer, { desc = 'Reset buffer' })
|
||||
map('n', '<leader>vp', gs.preview_hunk, { desc = 'Preview hunk' })
|
||||
map('n', '<leader>vb', function()
|
||||
gs.blame_line({ full = true })
|
||||
end, {
|
||||
desc = 'Blame line preview',
|
||||
})
|
||||
map('n', '<leader>hd', gs.diffthis, { desc = '' })
|
||||
map('n', '<leader>hD', function()
|
||||
map('n', '<leader>vd', gs.diffthis, { desc = 'Diff line' })
|
||||
map('n', '<leader>vD', function()
|
||||
gs.diffthis('~')
|
||||
end, { desc = '' })
|
||||
end, { desc = 'Diff project' })
|
||||
|
||||
map('n', '<leader>htb', gs.toggle_current_line_blame, { desc = 'Toggle blame (virtual text)' })
|
||||
map('n', '<leader>htd', gs.toggle_deleted, { desc = 'Toggle deleted' })
|
||||
map('n', '<leader>vtb', gs.toggle_current_line_blame, { desc = 'Toggle blame (virtual text)' })
|
||||
map('n', '<leader>vtd', gs.toggle_deleted, { desc = 'Toggle deleted' })
|
||||
|
||||
-- Text object
|
||||
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'Select hunk' })
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ return {
|
|||
-- run once to properly show/hide based on user config
|
||||
toggle()
|
||||
-- map for toggling lines
|
||||
map('n', '<leader>ld', '', {
|
||||
map('n', '<leader>ltl', '', {
|
||||
callback = toggle,
|
||||
desc = 'Toggle LSP Lines',
|
||||
})
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ return {
|
|||
override = {
|
||||
['vim.lsp.util.convert_input_to_markdown_lines'] = true,
|
||||
['vim.lsp.util.stylize_markdown'] = true,
|
||||
-- @TODO: why doesn't this work?
|
||||
['cmp.entry.get_documentation'] = false,
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
local map = require('cosmic.utils').map
|
||||
|
||||
map('n', '<C-n>', ':NvimTreeToggle<CR>', { desc = 'Toggle Tree' })
|
||||
map('n', '<leader>r', ':NvimTreeRefresh<CR>', { desc = 'Refresh Tree' })
|
||||
map('n', '<leader>nt', ':NvimTreeToggle<CR>', { desc = 'Toggle Tree' })
|
||||
map('n', '<leader>nr', ':NvimTreeRefresh<CR>', { desc = 'Refresh Tree' })
|
||||
|
|
|
|||
|
|
@ -11,20 +11,18 @@ end
|
|||
|
||||
M.init = function()
|
||||
-- navigation
|
||||
map(
|
||||
'n',
|
||||
'<leader>ff',
|
||||
'<cmd>lua require("cosmic.plugins.telescope.mappings").project_files()<cr>',
|
||||
{ desc = 'Find git files' }
|
||||
)
|
||||
map('n', '<leader>fp', ':Telescope find_files<cr>', { desc = 'Find file' })
|
||||
map('n', '<leader>ff', '', {
|
||||
callback = require('cosmic.plugins.telescope.mappings').project_files,
|
||||
desc = 'Find files',
|
||||
})
|
||||
map('n', '<leader>fp', ':Telescope find_files<cr>', { desc = 'Find project file' })
|
||||
map('n', '<leader>fk', ':Telescope buffers<cr>', { desc = 'Find buffer' })
|
||||
map('n', '<leader>fs', ':Telescope live_grep<cr>', { desc = 'Live grep' })
|
||||
map('n', '<leader>fw', ':Telescope grep_string<cr>', { desc = 'Grep string' })
|
||||
map('n', '<leader>fs', ':Telescope live_grep<cr>', { desc = 'Grep string' })
|
||||
map('n', '<leader>fw', ':Telescope grep_string<cr>', { desc = 'Grep current word' })
|
||||
|
||||
-- git navigation
|
||||
map('n', '<leader>ggc', ':Telescope git_commits<cr>', { desc = 'Git commits' })
|
||||
map('n', '<leader>ggs', ':Telescope git_status<cr>', { desc = 'Git status' })
|
||||
map('n', '<leader>vtc', ':Telescope git_commits<cr>', { desc = 'Git commits' })
|
||||
map('n', '<leader>vts', ':Telescope git_status<cr>', { desc = 'Git status' })
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ return {
|
|||
name = '+quickfix',
|
||||
},
|
||||
f = {
|
||||
name = '+file',
|
||||
name = '+find',
|
||||
},
|
||||
h = {
|
||||
name = '+gitsigns',
|
||||
|
|
@ -27,8 +27,17 @@ return {
|
|||
name = '+toggle',
|
||||
},
|
||||
},
|
||||
l = {
|
||||
name = '+lsp',
|
||||
t = {
|
||||
name = '+toggle',
|
||||
},
|
||||
},
|
||||
g = {
|
||||
name = '+goto',
|
||||
name = '+goto (lsp)',
|
||||
},
|
||||
n = {
|
||||
name = '+tree',
|
||||
},
|
||||
s = {
|
||||
name = '+session',
|
||||
|
|
@ -36,6 +45,12 @@ return {
|
|||
t = {
|
||||
name = '+tab',
|
||||
},
|
||||
v = {
|
||||
name = '+vcs (git)',
|
||||
t = {
|
||||
name = '+toggle',
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue