-- Neovim plugin for resolving, and visualizing Jujutsu conflicts -- https://github.com/larpios/jj-conflict.nvim return { "jj-conflict.nvim", enabled = true, event = { "BufReadPre", "BufNewFile" }, cmd = { "JjConflictChooseBoth", "JjConflictChooseNone", "JjConflictChooseOurs", "JjConflictChooseTheirs", "JjConflictDiff", "JjConflictList", "JjConflictLog", "JjConflictNextConflict", "JjConflictPrevConflict", "JjConflictResolve", "JjConflictSquash", "JjConflictStatus", }, load = function(name) vim.cmd.packadd("lualine.nvim") vim.cmd.packadd(name) end, after = function() require("jj-conflict").setup({ -- Whether to automatically setup default mappings default_mappings = true, -- Whether to automatically setup default commands default_commands = true, -- Whether to enable notifications (require snacks) notify = true, -- Prefix for keybinding descriptions desc_prefix = nil, highlights = { ours = "DiffAdd", theirs = "DiffText", marker = "CursorLine", label = "Comment", diff_remove = "DiffDelete", diff_add = "DiffAdd", }, mappings = { base = "hb", both = "hh", next = "hk", ours = "ho", prev = "hi", theirs = "ht", }, }) -- In your lualine config: require("lualine").setup({ sections = { lualine_c = { { require("jj-conflict.statusline").get_status, cond = function() return require("jj-conflict.api").has_conflicts(0) end, }, }, }, }) end, }