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

removed dupication and refactored my keymaps

Browse source
This commit is contained in:
Nikhil 2025-08-23 22:06:02 +05:30
parent 116c91c155
commit c5d1b0ac8f
5 changed files with 217 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

79
lua/plugins/git.lua
View file

@ -1,18 +1,26 @@
--[plugins/git.lua]
-- [plugins/git.lua]
return {
{ -- Adds git related signs to the gutter, as well as utilities for managing changes
'lewis6991/gitsigns.nvim',
{ -- Adds git related signs + keymaps
"lewis6991/gitsigns.nvim",
event = "BufReadPre", -- load only when a file is opened
opts = {
-- Basic options for the signs in the gutter
signs = {
add = { text = '+' },
change = { text = '~' },
delete = { text = '_' },
topdelete = { text = '‾' },
changedelete = { text = '~' },
add = { text = "+" },
change = { text = "~" },
delete = { text = "_" },
topdelete = { text = "‾" },
changedelete = { text = "~" },
},
-- All keymaps are now defined in the on_attach function
current_line_blame = true, -- shows git blame at end of line
current_line_blame_opts = {
virt_text = true,
virt_text_pos = "eol", -- "eol" | "overlay" | "right_align"
delay = 500,
ignore_whitespace = false,
},
current_line_blame_formatter = "<author>, <author_time:%Y-%m-%d> - <summary>",
-- Keymaps on attach
on_attach = function(bufnr)
local gs = package.loaded.gitsigns
local function map(mode, l, r, desc)
@ -20,42 +28,39 @@ return {
end
-- Navigation
map('n', ']c', gs.next_hunk, 'Next Hunk')
map('n', '[c', gs.prev_hunk, 'Prev Hunk')
map("n", "]c", gs.next_hunk, "Next Hunk")
map("n", "[c", gs.prev_hunk, "Prev Hunk")
-- Actions
map({ 'n', 'v' }, '<leader>hs', gs.stage_hunk, 'Stage Hunk')
map({ 'n', 'v' }, '<leader>hr', gs.reset_hunk, 'Reset Hunk')
map('n', '<leader>hS', gs.stage_buffer, 'Stage Buffer')
map('n', '<leader>hu', gs.undo_stage_hunk, 'Undo Stage Hunk')
map('n', '<leader>hR', gs.reset_buffer, 'Reset Buffer')
map('n', '<leader>hp', gs.preview_hunk, 'Preview Hunk')
map('n', '<leader>hb', function() gs.blame_line { full = true } end, 'Blame Line')
map('n', '<leader>tb', gs.toggle_current_line_blame, 'Toggle Blame Line')
map('n', '<leader>hd', gs.diffthis, 'Diff This')
map('n', '<leader>hD', function() gs.diffthis '~' end, 'Diff This ~')
map('n', '<leader>td', gs.toggle_deleted, 'Toggle Deleted')
map({ "n", "v" }, "<leader>hs", gs.stage_hunk, "Stage Hunk")
map({ "n", "v" }, "<leader>hr", gs.reset_hunk, "Reset Hunk")
map("n", "<leader>hS", gs.stage_buffer, "Stage Buffer")
map("n", "<leader>hu", gs.undo_stage_hunk, "Undo Stage Hunk")
map("n", "<leader>hR", gs.reset_buffer, "Reset Buffer")
map("n", "<leader>hp", gs.preview_hunk, "Preview Hunk")
map("n", "<leader>hb", function() gs.blame_line { full = true } end, "Blame Line")
map("n", "<leader>tb", gs.toggle_current_line_blame, "Toggle Blame Line")
map("n", "<leader>hd", gs.diffthis, "Diff This")
map("n", "<leader>hD", function() gs.diffthis("~") end, "Diff This ~")
map("n", "<leader>td", gs.toggle_deleted, "Toggle Deleted")
-- Text object
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', 'Select Hunk')
map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "Select Hunk")
end,
},
},
{ -- Git wrapper
'tpope/vim-fugitive',
cmd = { "Git", "G" }, -- lazy load on :Git
"tpope/vim-fugitive",
cmd = { "Git", "G" }, -- lazy load only on :Git commands
},
require('gitsigns').setup {
current_line_blame = true, -- shows git blame at end of line
current_line_blame_opts = {
virt_text = true,
virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
delay = 500,
ignore_whitespace = false,
{ -- Lazygit UI (optional)
"kdheepak/lazygit.nvim",
cmd = "LazyGit",
dependencies = { "nvim-lua/plenary.nvim" },
keys = {
{ "<leader>lg", "<cmd>LazyGit<CR>", desc = "Open LazyGit" },
},
current_line_blame_formatter = '<author>, <author_time:%Y-%m-%d> - <summary>',
}
},
}