24 lines
689 B
Lua
24 lines
689 B
Lua
return {
|
|
{
|
|
"vim-fugitive",
|
|
enabled = nixCats("git") or false,
|
|
cmd = { "Git", "Gvdiffsplit" },
|
|
},
|
|
{
|
|
"resolve-nvim",
|
|
enabled = nixCats("git") or false,
|
|
event = { "BufReadPre", "BufNewFile" },
|
|
after = function(plugin)
|
|
require("resolve").setup({
|
|
default_keymaps = false,
|
|
on_conflicts_resolved = function(info)
|
|
-- NOTE: am not sure if i wanna stage files automatically
|
|
-- local filepath = vim.api.nvim_buf_get_name(info.bufnr)
|
|
-- vim.fn.system({ "git", "add", filepath })
|
|
-- vim.notify("conflicts resolved :3 file staged yayayayy <3", vim.log.levels.INFO)
|
|
vim.notify("conflicts resolved :3", vim.log.levels.INFO)
|
|
end,
|
|
})
|
|
end,
|
|
},
|
|
}
|