wires/nvim
1
0
Fork 0
Code Pull requests Projects Releases Packages Wiki Activity Actions

feat: clean up gitsigns keymaps

Browse source
This commit is contained in:
Matthew Leong 2023-11-15 11:11:17 -08:00
parent e104586768
commit c0d7de2896
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lua/cosmic/plugins/gitsigns/init.lua
View file

@ -6,7 +6,8 @@ return {
dependencies = { 'nvim-lua/plenary.nvim' }, dependencies = { 'nvim-lua/plenary.nvim' },
event = 'VeryLazy', event = 'VeryLazy',
config = function() config = function()
require('gitsigns').setup(u.merge({ local gs = require('gitsigns')
gs.setup(u.merge({
signs = { signs = {
add = { hl = 'GitSignsAdd', text = '│', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' }, add = { hl = 'GitSignsAdd', text = '│', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' }, change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
@ -23,7 +24,6 @@ return {
col = 1, col = 1,
}, },
on_attach = function(bufnr) on_attach = function(bufnr)
local gs = package.loaded.gitsigns
local map = u.create_buf_map(bufnr) local map = u.create_buf_map(bufnr)
-- Navigation -- Navigation
map('n', ']c', function() map('n', ']c', function()
@ -53,26 +53,35 @@ return {
}) })
-- Actions -- Actions
map({ 'n', 'v' }, '<leader>vs', ':Gitsigns stage_hunk<CR>', { desc = 'Stage hunk' }) map('n', '<leader>hs', gs.stage_hunk, { desc = 'Stage hunk' })
map({ 'n', 'v' }, '<leader>vr', ':Gitsigns reset_hunk<CR>', { desc = 'Reset hunk' }) map('n', '<leader>hr', gs.reset_hunk, { desc = 'Reset hunk' })
map('n', '<leader>vS', gs.stage_buffer, { desc = 'Stage buffer' }) map('v', '<leader>hs', function()
map('n', '<leader>vu', gs.undo_stage_hunk, { desc = 'Under stage hunk' }) gs.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
map('n', '<leader>vR', gs.reset_buffer, { desc = 'Reset buffer' }) end, {
map('n', '<leader>vp', gs.preview_hunk, { desc = 'Preview hunk' }) desc = 'Stage hunk selection',
map('n', '<leader>vb', function() })
map('v', '<leader>hr', function()
gs.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
end, {
desc = 'Reset hunk selection',
})
map('n', '<leader>hS', gs.stage_buffer, { desc = 'Stage buffer' })
map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'Undo 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()
gs.blame_line({ full = true }) gs.blame_line({ full = true })
end, { end, {
desc = 'Blame line preview', desc = 'Blame line',
}) })
map('n', '<leader>vd', gs.diffthis, { desc = 'Diff line' }) map('n', '<leader>htb', gs.toggle_current_line_blame, { desc = 'Toggle blame current line' })
map('n', '<leader>vD', function() map('n', '<leader>hd', gs.diffthis, { desc = 'Diff buffer' })
map('n', '<leader>hD', function()
gs.diffthis('~') gs.diffthis('~')
end, { desc = 'Diff project' }) end, { desc = 'Diff project' })
map('n', '<leader>td', gs.toggle_deleted, { desc = 'Toggle delete' })
map('n', '<leader>vtb', gs.toggle_current_line_blame, { desc = 'Toggle blame (virtual text)' }) --[[ -- Text object ]]
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' }) map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'Select hunk' })
end, end,
}, user_config.plugins.gitsigns or {})) }, user_config.plugins.gitsigns or {}))