mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-11-04 12:42:21 +00:00
5fbc72d697
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Set up binary cache / cachix (maximal) (push) Waiting to run
Set up binary cache / cachix (nix) (push) Waiting to run
Validate flake & check documentation / Validate Flake Documentation (push) Waiting to run
Validate flake & check documentation / Validate hyperlinks in documentation sources (push) Waiting to run
Validate flake & check formatting / Validate Flake (push) Waiting to run
Validate flake & check formatting / Formatting via Alejandra (push) Waiting to run
Build and deploy documentation / Check latest commit (push) Waiting to run
Build and deploy documentation / publish (push) Blocked by required conditions
Check for typos in the source tree / check-typos (push) Waiting to run
* git/git-conflict: avoid shadowing builtin keybinds * docs: update release notes --------- Co-authored-by: raf <me@notashelf.dev>
23 lines
837 B
Nix
23 lines
837 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]" "<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";
|
|
};
|
|
};
|
|
}
|