NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-09 06:55:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

treewide: add global flag to disable default keymaps

Browse source
This commit is contained in:
Ching Pei Yang 2025-07-24 15:41:10 +02:00
commit 9902836a90
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
31 changed files with 170 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/plugins/git/git-conflict/git-conflict.nix
View file

@ -12,12 +12,12 @@ in {
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";
ours = mkMappingOption config.vim.enableNvfKeymaps "Choose Ours [Git-Conflict]" "<leader>co";
theirs = mkMappingOption config.vim.enableNvfKeymaps "Choose Theirs [Git-Conflict]" "<leader>ct";
both = mkMappingOption config.vim.enableNvfKeymaps "Choose Both [Git-Conflict]" "<leader>cb";
none = mkMappingOption config.vim.enableNvfKeymaps "Choose None [Git-Conflict]" "<leader>c0";
prevConflict = mkMappingOption config.vim.enableNvfKeymaps "Go to the previous Conflict [Git-Conflict]" "]x";
nextConflict = mkMappingOption config.vim.enableNvfKeymaps "Go to the next Conflict [Git-Conflict]" "[x";
};
};
}