mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-26 18:58:43 +02:00
plugins/git: move to by-name
This commit is contained in:
parent
d016b139fc
commit
2a91b89445
29 changed files with 0 additions and 15 deletions
|
@ -1,47 +0,0 @@
|
|||
{
|
||||
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";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue