Imbus/nvim-ks
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove gitsigns in favor of mini.diff

Browse source
This commit is contained in:
Imbus 2026-03-05 17:23:53 +01:00
parent 3b308ace73
commit 261453871b
2 changed files with 13 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

62
lua/plugins/gitsigns.lua
View file

@ -1,62 +0,0 @@
-- Adds git related signs to the gutter, as well as utilities for managing changes
-- See: https://github.com/lewis6991/gitsigns.nvim?tab=readme-ov-file#installation--usage
return {
{
'lewis6991/gitsigns.nvim',
opts = {
current_line_blame = true, -- Show blame for current line
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', '<leader>hs', function()
gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
end, { desc = 'stage git hunk' })
map('v', '<leader>hr', function()
gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
end, { desc = 'reset git hunk' })
-- normal mode
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
map('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' })
map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
map('n', '<leader>hD', function()
gitsigns.diffthis '@'
end, { desc = 'git [D]iff against last commit' })
-- Toggles
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' })
end,
},
},
}

13
lua/plugins/mini.lua
View file

@ -46,6 +46,19 @@ return { -- Collection of various small independent plugins/modules
},
}
-- Unused for now
-- require('mini.git').setup {}
-- Helpful diffs, replaces gitsigns
-- see: https://nvim-mini.org/mini.nvim/doc/mini-diff.html#module-highlightgroups
require('mini.diff').setup {
view = {
style = 'sign',
-- signs = { add = '▒', change = '▒', delete = '▒' },
-- signs = { add = '|', change = '|', delete = '|' },
},
}
-- Simple and easy statusline.
-- You could remove this setup call if you don't like it,
-- and try some other statusline plugin