sam_oneal
670f6325a1
- Add unclash.nvim for interactive merge conflict resolution (inline highlighting, action buttons, 3-way merge editor, snacks picker integration) - Enable LazyVim telescope extra with fzf-native for fuzzy finding
79 lines
1.4 KiB
Lua
79 lines
1.4 KiB
Lua
return {
|
|
{
|
|
"NeogitOrg/neogit",
|
|
dependencies = {
|
|
"nvim-lua/plenary.nvim",
|
|
"sindrets/diffview.nvim",
|
|
},
|
|
cmd = "Neogit",
|
|
opts = {
|
|
integrations = {
|
|
diffview = true,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
"madmaxieee/unclash.nvim",
|
|
lazy = false,
|
|
opts = {
|
|
action_buttons = {
|
|
enabled = true,
|
|
},
|
|
annotations = {
|
|
enabled = true,
|
|
},
|
|
},
|
|
keys = {
|
|
{
|
|
"]x",
|
|
function()
|
|
require("unclash").next_conflict()
|
|
end,
|
|
desc = "Next Conflict",
|
|
},
|
|
{
|
|
"[x",
|
|
function()
|
|
require("unclash").prev_conflict()
|
|
end,
|
|
desc = "Prev Conflict",
|
|
},
|
|
{
|
|
"<leader>co",
|
|
function()
|
|
require("unclash").open_merge_editor()
|
|
end,
|
|
desc = "Open Merge Editor",
|
|
},
|
|
{
|
|
"<leader>cc",
|
|
function()
|
|
require("unclash").accept_current()
|
|
end,
|
|
desc = "Accept Current",
|
|
},
|
|
{
|
|
"<leader>ci",
|
|
function()
|
|
require("unclash").accept_incoming()
|
|
end,
|
|
desc = "Accept Incoming",
|
|
},
|
|
{
|
|
"<leader>cb",
|
|
function()
|
|
require("unclash").accept_both()
|
|
end,
|
|
desc = "Accept Both",
|
|
},
|
|
{
|
|
"<leader>fx",
|
|
function()
|
|
require("unclash.snacks").pick()
|
|
end,
|
|
desc = "Pick Conflicts",
|
|
},
|
|
},
|
|
},
|
|
}
|