nix/12.nixvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

plugins/conflict.nvim: init

Browse source
This commit is contained in:
jaredmontoya 2026-06-04 22:34:42 +02:00 • committed by Matt Sturgeon
parent 5dac467f1c
commit 43a7e6f829
2 changed files with 84 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
plugins/by-name/conflict/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ lib, ... }:
lib.nixvim.plugins.mkNeovimPlugin {
name = "conflict";
package = "conflict-nvim";
description = "A simple Neovim plugin to resolve merge conflicts with ease.";
maintainers = [ lib.maintainers.jaredmontoya ];
dependencies = [ "git" ];
settingsExample = {
default_mappings = {
current = "<leader>co";
incoming = "<leader>ct";
both = "<leader>ca";
base = "<leader>cb";
none = "<leader>cn";
next = "]e";
prev = "[e";
};
show_actions = false;
disable_diagnostics = false;
highlights = {
current = "DiffChange";
incoming = "DiffText";
ancestor = "DiffDelete";
};
};
}

55
tests/test-sources/plugins/by-name/conflict/default.nix Normal file
View file

@ -0,0 +1,55 @@
{
empty = {
plugins.conflict.enable = true;
};
defaults = {
plugins.conflict = {
enable = true;
settings = {
default_mappings = {
current = "cc";
incoming = "ci";
both = "cb";
base = "cB";
none = false;
next = "]x";
prev = "[x";
};
show_actions = true;
disable_diagnostics = true;
highlights = {
current = "DiffText";
incoming = "DiffAdd";
ancestor = "DiffChange";
};
};
};
};
example = {
plugins.conflict = {
enable = true;
settings = {
default_mappings = {
current = "<leader>co";
incoming = "<leader>ct";
both = "<leader>ca";
base = "<leader>cb";
none = "<leader>cn";
next = "]e";
prev = "[e";
};
show_actions = false;
disable_diagnostics = false;
highlights = {
current = "DiffChange";
incoming = "DiffText";
ancestor = "DiffDelete";
};
};
};
};
}