mirror of
https://github.com/pratiktri/dotfiles.git
synced 2026-02-04 08:41:43 +05:30
- Remove relic of effort to force neovim in vs-code - Remove util functions copied from LazyNvim - if I need them I'll write them - Removed Lua code comments I don't understand - Better code comments
89 lines
3.1 KiB
Lua
89 lines
3.1 KiB
Lua
return {
|
|
-- Better fugitive: neogit
|
|
{
|
|
"NeogitOrg/neogit",
|
|
dependencies = {
|
|
"nvim-lua/plenary.nvim",
|
|
"sindrets/diffview.nvim",
|
|
"nvim-telescope/telescope.nvim",
|
|
},
|
|
config = true,
|
|
keys = {
|
|
{ "<leader>gg", "<cmd>Neogit<cr>", desc = "Git: Open Neogit", mode = { "n" } },
|
|
},
|
|
},
|
|
|
|
-- Git Diffview
|
|
{
|
|
"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" } },
|
|
},
|
|
},
|
|
|
|
-- Adds git related signs to the gutter, as well as utilities for managing changes
|
|
{
|
|
"lewis6991/gitsigns.nvim",
|
|
opts = {
|
|
-- See `:help gitsigns.txt`
|
|
signs = {
|
|
add = { text = "+" },
|
|
change = { text = "~" },
|
|
delete = { text = "—" },
|
|
topdelete = { text = "—" },
|
|
changedelete = { text = "~" },
|
|
untracked = { text = "┆" },
|
|
},
|
|
attach_to_untracked = true,
|
|
on_attach = function(bufnr)
|
|
local gs = package.loaded.gitsigns
|
|
|
|
gs.toggle_current_line_blame() -- git blame line
|
|
|
|
local function map(mode, l, r, opts)
|
|
opts = opts or {}
|
|
opts.buffer = bufnr
|
|
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", "<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>gK", function()
|
|
gs.blame_line({ full = true })
|
|
end, { desc = "Git: Hover blame-line" })
|
|
|
|
map("n", "<leader>gB", gs.toggle_current_line_blame, { desc = "Git: Toggle virtual blame-line" })
|
|
end,
|
|
},
|
|
},
|
|
}
|