pratik/dotfiles
1
0
Fork 0
mirror of https://github.com/pratiktri/dotfiles.git synced 2026-02-04 16:41:43 +05:30
Code Issues Packages Projects Releases Wiki Activity

refactor(neovim): Git operation enhacements

Browse Source 
- Use gitsigns to do file diff against index
- gitsigns: Use `[h` `]h` to traverse hunks instead of `[g` `]g`
- gitsigns: `<leader>gQ`: Project hunks to quickfix list
- gitsigns: `<leader>gs` acts as toggle to stage & unstage
- diffview: `<leader>gD` Diff all files against index
- Lazygit: Consistent keymap descriptions
This commit is contained in:
Pratik Tripathy
2025-10-13 19:17:21 +05:30
parent 9223455162
commit a101e671ff
2 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
common/.config/nvim/lua/plugins/git.lua
View File

@@ -18,8 +18,7 @@ return {
"sindrets/diffview.nvim",
keys = {
{ "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "Git: Open Diffview", mode = { "n" } },
{ "<leader>gD", "<cmd>DiffviewOpen<cr>", desc = "Git: Open Diffview against master", mode = { "n" } },
{ "<leader>gD", "<cmd>DiffviewOpen<cr>", desc = "Git: Diffview Project against index/staging", mode = { "n" } },
},
},
@@ -37,10 +36,14 @@ return {
untracked = { text = "┆" },
},
attach_to_untracked = true,
current_line_blame = true, -- Show git line blame-line by default
current_line_blame_opts = {
virt_text_opt = "right_align",
ignore_whitespace = true,
},
current_line_blame_formatter = "<author>, <author_time:%R>, <summary>",
on_attach = function(bufnr)
local gs = package.loaded.gitsigns
gs.toggle_current_line_blame() -- git blame line
local gs = require("gitsigns")
local function map(mode, l, r, opts)
opts = opts or {}
@@ -48,34 +51,28 @@ return {
vim.keymap.set(mode, l, r, opts)
end
-- Navigation
map({ "n", "v" }, "]g", function()
if vim.wo.diff then
return "]g"
end
vim.schedule(function()
gs.next_hunk()
end)
return "<Ignore>"
end, { expr = true, desc = "Next Git hunk" })
map({ "n", "v" }, "[g", function()
if vim.wo.diff then
return "[g"
end
vim.schedule(function()
gs.prev_hunk()
end)
return "<Ignore>"
end, { expr = true, desc = "Previous Git hunk" })
-- Text object
map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", { desc = "Git: Visual select hunk" })
map({ "n", "v" }, "]h", function()
gs.next_hunk()
end, { desc = "Next Git hunk" })
map({ "n", "v" }, "[h", function()
gs.prev_hunk()
end, { desc = "Previous Git hunk" })
map("n", "<leader>gQ", function()
gs.setqflist("all", { open = false })
end, { desc = "Git: Project Hunks to quickfix list" })
map("n", "<leader>gd", function()
gs.diffthis("~1")
end, { desc = "git: Diff the file against last commit" })
map("n", "<leader>gr", gs.reset_hunk, { desc = "Git: Reset hunk" })
map("n", "<leader>gp", gs.preview_hunk, { desc = "Git: Preview hunk" })
map("n", "<leader>gs", gs.stage_hunk, { desc = "Git: Stage hunk under cursor" })
map("n", "<leader>gu", gs.undo_stage_hunk, { desc = "Git: Unstage hunk under cursor" })
map("n", "<leader>gs", gs.stage_hunk, { desc = "Git: Toggle Stage-Hunk" })
map("n", "<leader>gK", function()
gs.blame_line({ full = true })

18
common/.config/nvim/lua/plugins/utility-plugs.lua
View File

@@ -188,14 +188,21 @@ return {
function()
Snacks.lazygit.open(opts)
end,
desc = "Git: Show LazyGit",
desc = "LazyGit: Show LazyGit",
},
{
"<leader>gl",
function()
Snacks.lazygit.log(opts)
end,
desc = "LazyGit: List Git Log",
desc = "LazyGit: Git Log Graph",
},
{
"<leader>gf",
function()
Snacks.lazygit.log_file(opts)
end,
desc = "LazyGit: Show File Log",
},
{
"<leader>gL",
@@ -204,13 +211,6 @@ return {
end,
desc = "Git: Line Log",
},
{
"<leader>gf",
function()
Snacks.lazygit.log_file(opts)
end,
desc = "Git: Show File Log",
},
{
"<leader>gO",
function()