return { { "gitsigns.nvim", event = { "BufReadPost", "BufWritePost", "BufNewFile" }, opts = { signs = { add = { text = "▕" }, change = { text = "▕" }, changedelete = { text = "▕" }, untracked = { text = "▕" }, }, signs_staged = { add = { text = "▕" }, change = { text = "▕" }, changedelete = { text = "▕" }, untracked = { text = "▕" }, }, on_attach = function(buffer) local gs = require("gitsigns") local function map(mode, l, r, desc) vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc }) end map('n', ']h', function() gs.nav_hunk('next') end, "Next Hunk") map('n', '[h', function() gs.nav_hunk('prev') end, "Prev Hunk") map({ "n", "v" }, "ga", ":Gitsigns stage_hunk", "Add Hunk") map({ "n", "v" }, "gr", ":Gitsigns reset_hunk", "Reset Hunk") map("n", "gu", gs.undo_stage_hunk, "Unstage Hunk") map("n", "gA", gs.stage_buffer, "Add buffer") map("n", "gR", gs.reset_buffer, "Reset Buffer") map("n", "gp", gs.preview_hunk, "Preview Hunk") map({ "o", "x" }, "ih", ":Gitsigns select_hunk", "Git Select Hunk") map({ "o", "x" }, "ah", ":Gitsigns select_hunk", "Git Select Hunk") end, }, after = function(plug) require("gitsigns").setup(plug.opts) end, }, { "git-conflict.nvim", -- load on enter to detect + highlight conflicts -- lazy loading make it not work, idk why -- event = { "BufReadPost", "BufWritePost", "BufNewFile" }, opts = { default_mappings = { ours = 'c<', theirs = 'c>', none = 'cd', both = 'c=', next = ']x', prev = '[x', }, }, after = function(plug) require("git-conflict").setup(plug.opts) end }, }