From 094b442f8cbc063c5633bfc76f5685f8c8604b18 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Wed, 11 Mar 2026 18:58:41 -0400 Subject: Add gitsigns plugin --- .../nvim/lua/eugenetriguba/plugins/gitsigns.lua | 66 ++++++++++++++++++++++ .config/nvim/lua/eugenetriguba/plugins/init.lua | 1 + 2 files changed, 67 insertions(+) create mode 100644 .config/nvim/lua/eugenetriguba/plugins/gitsigns.lua diff --git a/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua b/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua new file mode 100644 index 0000000..315337f --- /dev/null +++ b/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua @@ -0,0 +1,66 @@ +vim.pack.add { + { + name = 'gitsigns', + src = 'https://github.com/lewis6991/gitsigns.nvim', + }, +} + +require('gitsigns').setup { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, + on_attach = function(bufnr) + local gitsigns = require '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 + vim.cmd.normal { ']c', bang = true } + else + gitsigns.nav_hunk 'next' + end + end, { desc = 'Jump to next git [c]hange' }) + + map('n', '[c', function() + if vim.wo.diff then + vim.cmd.normal { '[c', bang = true } + else + gitsigns.nav_hunk 'prev' + end + end, { desc = 'Jump to previous git [c]hange' }) + + -- Actions + -- visual mode + map('v', 'hs', function() + gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'git [s]tage hunk' }) + map('v', 'hr', function() + gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'git [r]eset hunk' }) + -- normal mode + map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) + map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) + map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) + map('n', 'hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' }) + map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) + map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) + map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) + map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) + map('n', 'hD', function() + gitsigns.diffthis '@' + end, { desc = 'git [D]iff against last commit' }) + -- Toggles + map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) + map('n', 'tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' }) + end, +} diff --git a/.config/nvim/lua/eugenetriguba/plugins/init.lua b/.config/nvim/lua/eugenetriguba/plugins/init.lua index 8f4adee..4192055 100644 --- a/.config/nvim/lua/eugenetriguba/plugins/init.lua +++ b/.config/nvim/lua/eugenetriguba/plugins/init.lua @@ -5,6 +5,7 @@ require 'eugenetriguba.plugins.oil' require 'eugenetriguba.plugins.tree-sitter' require 'eugenetriguba.plugins.fzf-lua' require 'eugenetriguba.plugins.lazygit' +require 'eugenetriguba.plugins.gitsigns' require 'eugenetriguba.plugins.harpoon' require 'eugenetriguba.plugins.nvim-lint' require 'eugenetriguba.plugins.conform' -- cgit v1.2.3