return { -- Better fugitive: neogit { "NeogitOrg/neogit", cond = require("config.util").is_not_vscode(), dependencies = { "nvim-lua/plenary.nvim", "sindrets/diffview.nvim", "nvim-telescope/telescope.nvim", }, config = true, keys = { { "gg", "Neogit", desc = "Git: Open Neogit", mode = { "n" } }, { "gl", "Neogit log", desc = "Git: Log", mode = { "n" } }, }, }, -- Git Diffview { "sindrets/diffview.nvim", cond = require("config.util").is_not_vscode(), keys = { { "gd", "DiffviewOpen", desc = "Git: Open Diffview", mode = { "n" } }, { "gD", "DiffviewOpen", desc = "Git: Open Diffview against master", mode = { "n" } }, { "gf", "DiffviewFileHistory", desc = "Git: Show file history", mode = { "n" } }, }, }, -- Adds git related signs to the gutter, as well as utilities for managing changes { "lewis6991/gitsigns.nvim", cond = require("config.util").is_not_vscode(), 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 "" 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 "" end, { expr = true, desc = "Previous Git hunk" }) -- Text object map({ "o", "x" }, "ih", ":Gitsigns select_hunk", { desc = "Git: Visual select hunk" }) -- Staging -- Actions map("n", "gr", gs.reset_hunk, { desc = "Git: reset hunk" }) map("n", "gsh", gs.stage_hunk, { desc = "Git: Stage Hunk" }) map("n", "gsu", gs.undo_stage_hunk, { desc = "Git: Undo Stage Hunk" }) map("n", "gsb", gs.stage_buffer, { desc = "Git: Stage Current File" }) map("n", "gK", function() gs.blame_line({ full = true }) end, { desc = "Git: Hover blame-line" }) -- visual mode map("v", "gsH", function() gs.stage_hunk({ vim.fn.line("."), vim.fn.line("v") }) end, { desc = "Git: Visual Stage Hunk" }) -- normal mode map("n", "gp", gs.preview_hunk, { desc = "Git: Preview hunk" }) -- Toggles map("n", "gB", gs.toggle_current_line_blame, { desc = "Git: Toggle blame-line" }) end, }, }, }