mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-02-23 11:58:23 +00:00

* plugins/git: add git-conflict-nvim; modularize * plugins/git: build git-conflict-nvim ourselves
23 lines
805 B
Nix
23 lines
805 B
Nix
{
|
|
config,
|
|
lib,
|
|
...
|
|
}: let
|
|
inherit (lib.options) mkEnableOption;
|
|
inherit (lib.nvim.binds) mkMappingOption;
|
|
inherit (lib.nvim.types) mkPluginSetupOption;
|
|
in {
|
|
options.vim.git.git-conflict = {
|
|
enable = mkEnableOption "git-conflict" // {default = config.vim.git.enable;};
|
|
setupOpts = mkPluginSetupOption "git-conflict" {};
|
|
|
|
mappings = {
|
|
ours = mkMappingOption "Choose Ours [Git-Conflict]" "co";
|
|
theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct";
|
|
both = mkMappingOption "Choose Both [Git-Conflict]" "cb";
|
|
none = mkMappingOption "Choose None [Git-Conflict]" "c0";
|
|
prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
|
|
nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
|
|
};
|
|
};
|
|
}
|