zias
6ec8190beb
- Extract all options, keymaps, and autocommands into lua/config/ - Move every plugin spec into its own file under lua/plugins/ - Add custom inline orng colorscheme (dark + light) synced to macOS appearance - Consolidate image.nvim into pdf-viewer.lua (fix duplicate spec) - Fix image.nvim processor: magick -> magick_cli - Remove conflicting nvim-autopairs (kept mini.pairs) - Fix broken <C-f> keymap (was calling non-existent builtin cmd) - Delete lua/kickstart/ and lua/custom/ folders - Add colors/orng.vim + colors/orng-light.vim stubs for mid-session switching - init.lua reduced from 1078 lines to 49 lines
52 lines
2.6 KiB
Lua
52 lines
2.6 KiB
Lua
-- lua/plugins/gitsigns.lua
|
|
-- Git signs in the gutter + hunk actions and navigation keymaps
|
|
|
|
return {
|
|
'lewis6991/gitsigns.nvim',
|
|
opts = {
|
|
signs = {
|
|
add = { text = '+' },
|
|
change = { text = '~' },
|
|
delete = { text = '_' },
|
|
topdelete = { text = '‾' },
|
|
changedelete = { text = '~' },
|
|
},
|
|
on_attach = function(bufnr)
|
|
local gs = require 'gitsigns'
|
|
|
|
local function map(mode, lhs, rhs, opts)
|
|
opts = vim.tbl_extend('force', { buffer = bufnr }, opts or {})
|
|
vim.keymap.set(mode, lhs, rhs, opts)
|
|
end
|
|
|
|
-- Navigation
|
|
map('n', ']c', function()
|
|
if vim.wo.diff then vim.cmd.normal { ']c', bang = true }
|
|
else gs.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 gs.nav_hunk 'prev' end
|
|
end, { desc = 'Jump to previous git [c]hange' })
|
|
|
|
-- Hunk actions (visual + normal)
|
|
map('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' })
|
|
map('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' })
|
|
map('n', '<leader>hs', gs.stage_hunk, { desc = 'git [s]tage hunk' })
|
|
map('n', '<leader>hr', gs.reset_hunk, { desc = 'git [r]eset hunk' })
|
|
map('n', '<leader>hS', gs.stage_buffer, { desc = 'git [S]tage buffer' })
|
|
map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' })
|
|
map('n', '<leader>hR', gs.reset_buffer, { desc = 'git [R]eset buffer' })
|
|
map('n', '<leader>hp', gs.preview_hunk, { desc = 'git [p]review hunk' })
|
|
map('n', '<leader>hb', gs.blame_line, { desc = 'git [b]lame line' })
|
|
map('n', '<leader>hd', gs.diffthis, { desc = 'git [d]iff against index' })
|
|
map('n', '<leader>hD', function() gs.diffthis '@' end, { desc = 'git [D]iff against last commit' })
|
|
|
|
-- Toggles
|
|
map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = '[T]oggle git [b]lame line' })
|
|
map('n', '<leader>tD', gs.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
|
|
end,
|
|
},
|
|
}
|