mirror
/
kickstart.nvim
mirror of https://github.com/nvim-lua/kickstart.nvim.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix labeling and remove unused git hunk shortcuts

This commit is contained in:
Nick Burt 2024-01-25 01:51:39 -06:00
parent 0f98cf51a4
commit 5eb3d923c1
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lua/plugins/gitsigns.lua
View File

@ -43,31 +43,26 @@ return {
-- visual mode -- visual mode
map('v', '<leader>ghs', function() map('v', '<leader>ghs', function()
gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
end, { desc = 'stage git hunk' }) end, { desc = '[S]tage [G]it [H]unk' })
map('v', '<leader>ghr', function() map('v', '<leader>ghr', function()
gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
end, { desc = 'reset git hunk' }) end, { desc = '[R]eset [G]it [H]unk' })
-- normal mode -- normal mode
map('n', '<leader>ghs', gs.stage_hunk, { desc = 'git stage hunk' }) map('n', '<leader>ghs', gs.stage_hunk, { desc = '[G]it [S]tage [H]unk' })
map('n', '<leader>ghr', gs.reset_hunk, { desc = 'git reset hunk' }) map('n', '<leader>ghr', gs.reset_hunk, { desc = '[G]it [R]eset [H]unk' })
map('n', '<leader>ghS', gs.stage_buffer, { desc = 'git Stage buffer' }) map('n', '<leader>ghS', gs.stage_buffer, { desc = '[G]it [S]tage buffer' })
map('n', '<leader>ghu', gs.undo_stage_hunk, { desc = 'undo stage hunk' }) map('n', '<leader>ghu', gs.undo_stage_hunk, { desc = '[U]ndo stage [H]unk' })
map('n', '<leader>ghR', gs.reset_buffer, { desc = 'git Reset buffer' }) map('n', '<leader>ghR', gs.reset_buffer, { desc = '[G]it [R]eset buffer' })
map('n', '<leader>ghp', gs.preview_hunk, { desc = 'preview git hunk' }) map('n', '<leader>ghp', gs.preview_hunk, { desc = '[P]review [G]it [H]unk' })
map('n', '<leader>ghb', function() map('n', '<leader>ghb', function()
gs.blame_line { full = false } gs.blame_line { full = false }
end, { desc = 'git blame line' }) end, { desc = '[G]it blame line' })
map('n', '<leader>ghd', gs.diffthis, { desc = 'git diff against index' })
map('n', '<leader>ghD', function()
gs.diffthis '~'
end, { desc = 'git diff against last commit' })
-- Toggles -- Toggles
map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle git blame line' }) map('n', '<leader>ghx', gs.toggle_deleted, { desc = 'toggle [G]it show deleted' })
map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle git show deleted' })
-- Text object -- Text object
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select git hunk' }) map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select [G]it [H]unk' })
end end
} }
} }

1
lua/plugins/whichkey.lua
View File

@ -8,7 +8,6 @@ return { 'folke/which-key.nvim', opts = {},
['<leader>gh'] = { name = '[G]it [H]unk', _ = 'which_key_ignore' }, ['<leader>gh'] = { name = '[G]it [H]unk', _ = 'which_key_ignore' },
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' }, ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' }, ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
} }
-- register which-key VISUAL mode -- register which-key VISUAL mode