-- ============================================================================ -- Git Integration -- ============================================================================ return { -- Gitsigns - Git gutter signs { 'lewis6991/gitsigns.nvim', event = { 'BufReadPre', 'BufNewFile' }, opts = { signs = { add = { text = '│' }, change = { text = '│' }, delete = { text = '_' }, topdelete = { text = '‾' }, changedelete = { text = '~' }, untracked = { text = '┆' }, }, on_attach = function(bufnr) local gs = package.loaded.gitsigns local function map(mode, l, r, opts) opts = opts or {} opts.buffer = bufnr vim.keymap.set(mode, l, r, opts) end -- Navigation map('n', ']c', function() if vim.wo.diff then return ']c' end vim.schedule(function() gs.next_hunk() end) return '' end, { expr = true, desc = 'Next git hunk' }) map('n', '[c', function() if vim.wo.diff then return '[c' end vim.schedule(function() gs.prev_hunk() end) return '' end, { expr = true, desc = 'Previous git hunk' }) -- Actions map('n', 'hs', gs.stage_hunk, { desc = 'Stage hunk' }) map('n', 'hr', gs.reset_hunk, { desc = 'Reset hunk' }) map('v', 'hs', function() gs.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') }) end, { desc = 'Stage hunk' }) map('v', 'hr', function() gs.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') }) end, { desc = 'Reset hunk' }) map('n', 'hS', gs.stage_buffer, { desc = 'Stage buffer' }) map('n', 'hu', gs.undo_stage_hunk, { desc = 'Undo stage hunk' }) map('n', 'hR', gs.reset_buffer, { desc = 'Reset buffer' }) map('n', 'hp', gs.preview_hunk, { desc = 'Preview hunk' }) map('n', 'hb', function() gs.blame_line({ full = true }) end, { desc = 'Blame line' }) map('n', 'tb', gs.toggle_current_line_blame, { desc = 'Toggle blame line' }) map('n', 'hd', gs.diffthis, { desc = 'Diff this' }) map('n', 'hD', function() gs.diffthis('~') end, { desc = 'Diff this ~' }) map('n', 'td', gs.toggle_deleted, { desc = 'Toggle deleted' }) end, }, }, -- Fugitive - Git commands { 'tpope/vim-fugitive', cmd = { 'Git', 'G', 'Gdiffsplit', 'Gread', 'Gwrite', 'Ggrep', 'GMove', 'GDelete', 'GBrowse', 'GRemove', 'GRename', 'Glgrep', 'Gedit' }, keys = { { 'gs', 'Git', desc = 'Git status' }, { 'gc', 'Git commit', desc = 'Git commit' }, { 'gp', 'Git push', desc = 'Git push' }, { 'gl', 'Git log', desc = 'Git log' }, { 'gb', 'Git blame', desc = 'Git blame' }, { 'gd', 'Gdiffsplit', desc = 'Git diff' }, }, }, }