mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-21 00:25:42 +02:00
47 lines
906 B
Nix
47 lines
906 B
Nix
{
|
|
empty = {
|
|
plugins.git-conflict.enable = true;
|
|
};
|
|
|
|
defaults = {
|
|
plugins.git-conflict = {
|
|
enable = true;
|
|
|
|
settings = {
|
|
default_mappings = true;
|
|
default_commands = true;
|
|
disable_diagnostics = false;
|
|
list_opener = "copen";
|
|
highlights = {
|
|
incoming = "DiffAdd";
|
|
current = "DiffText";
|
|
ancestor = null;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
example = {
|
|
plugins.git-conflict = {
|
|
enable = true;
|
|
|
|
settings = {
|
|
default_mappings = {
|
|
ours = "o";
|
|
theirs = "t";
|
|
none = "0";
|
|
both = "b";
|
|
next = "n";
|
|
prev = "p";
|
|
};
|
|
default_commands = true;
|
|
disable_diagnostics = false;
|
|
list_opener = "copen";
|
|
highlights = {
|
|
incoming = "DiffAdd";
|
|
current = "DiffText";
|
|
};
|
|
};
|
|
};
|
|
};
|
|
}
|