mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-04-09 03:56:11 +00:00
1cda8228e9Generated using:
- `sd -F "inherit (lib.nvim.binds) mkMappingOption;" "inherit (config.vim.lib) mkMappingOption;" $(find . -type f)`
- `sd -F "{lib, ...}: let" "{config, lib, ...}: let" $(find . -type f)`
Tweaked manually (placement in inherit list, fixing todo-comments and toggleterm).
Ran `nix run nixpkgs#deadnix -- -e` to clean up.
Next commit includes unrelated dead code.
23 lines
837 B
Nix
23 lines
837 B
Nix
{
|
|
config,
|
|
lib,
|
|
...
|
|
}: let
|
|
inherit (lib.options) mkEnableOption;
|
|
inherit (lib.nvim.types) mkPluginSetupOption;
|
|
inherit (config.vim.lib) mkMappingOption;
|
|
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]" "<leader>co";
|
|
theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "<leader>ct";
|
|
both = mkMappingOption "Choose Both [Git-Conflict]" "<leader>cb";
|
|
none = mkMappingOption "Choose None [Git-Conflict]" "<leader>c0";
|
|
prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
|
|
nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
|
|
};
|
|
};
|
|
}
|