return { -- Better fugitive: neogit { "NeogitOrg/neogit", 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: Open Neogit Log", mode = { "n" } }, }, }, -- Git Diffview { "sindrets/diffview.nvim", keys = { { "gd", "DiffviewOpen", desc = "Git: Open Diffview", mode = { "n" } }, { "gD", "DiffviewOpen", desc = "Git: Open Diffview against master", mode = { "n" } }, { "gh", "DiffviewFileHistory", desc = "Git: Show file history", mode = { "n" } }, }, -- TODO: -- Toggle Diffview keymap }, -- 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 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" }) -- 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", "gb", 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" }) map("v", "gsR", function() gs.reset_hunk({ vim.fn.line("."), vim.fn.line("v") }) end, { desc = "Git: Visual Reset Hunk" }) -- normal mode map("n", "gp", gs.preview_hunk, { desc = "Git: Preview hunk" }) -- map("n", "gD", gs.diffthis, { desc = "Git: diff against index" }) -- map("n", "gd", function() -- gs.diffthis("~") -- end, { desc = "Git: diff against last commit" }) -- Toggles map("n", "gtb", gs.toggle_current_line_blame, { desc = "Git: toggle blame line" }) map("n", "gtd", gs.toggle_deleted, { desc = "Git: toggle show deleted" }) -- Text object map({ "o", "x" }, "ih", ":Gitsigns select_hunk", { desc = "Git: Visual select hunk" }) end, }, }, -- Git worktree { "ThePrimeagen/git-worktree.nvim", config = function() -- FIX: Open files do NOT get replaced with the changed branch require("telescope").load_extension("git_worktree") vim.keymap.set("n", "gw", " lua require('telescope').extensions.git_worktree.git_worktrees()") end, }, }