NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-09 15:05: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";
};
};
}

26
modules/plugins/git/gitsigns/gitsigns.nix
View file

@ -19,25 +19,25 @@ in {
codeActions.enable = mkEnableOption "gitsigns codeactions through null-ls";
mappings = {
nextHunk = mkMappingOption "Next hunk [Gitsigns]" "]c";
previousHunk = mkMappingOption "Previous hunk [Gitsigns]" "[c";
nextHunk = mkMappingOption config.vim.enableNvfKeymaps "Next hunk [Gitsigns]" "]c";
previousHunk = mkMappingOption config.vim.enableNvfKeymaps "Previous hunk [Gitsigns]" "[c";
stageHunk = mkMappingOption "Stage hunk [Gitsigns]" "<leader>hs";
undoStageHunk = mkMappingOption "Undo stage hunk [Gitsigns]" "<leader>hu";
resetHunk = mkMappingOption "Reset hunk [Gitsigns]" "<leader>hr";
stageHunk = mkMappingOption config.vim.enableNvfKeymaps "Stage hunk [Gitsigns]" "<leader>hs";
undoStageHunk = mkMappingOption config.vim.enableNvfKeymaps "Undo stage hunk [Gitsigns]" "<leader>hu";
resetHunk = mkMappingOption config.vim.enableNvfKeymaps "Reset hunk [Gitsigns]" "<leader>hr";
stageBuffer = mkMappingOption "Stage buffer [Gitsigns]" "<leader>hS";
resetBuffer = mkMappingOption "Reset buffer [Gitsigns]" "<leader>hR";
stageBuffer = mkMappingOption config.vim.enableNvfKeymaps "Stage buffer [Gitsigns]" "<leader>hS";
resetBuffer = mkMappingOption config.vim.enableNvfKeymaps "Reset buffer [Gitsigns]" "<leader>hR";
previewHunk = mkMappingOption "Preview hunk [Gitsigns]" "<leader>hP";
previewHunk = mkMappingOption config.vim.enableNvfKeymaps "Preview hunk [Gitsigns]" "<leader>hP";
blameLine = mkMappingOption "Blame line [Gitsigns]" "<leader>hb";
toggleBlame = mkMappingOption "Toggle blame [Gitsigns]" "<leader>tb";
blameLine = mkMappingOption config.vim.enableNvfKeymaps "Blame line [Gitsigns]" "<leader>hb";
toggleBlame = mkMappingOption config.vim.enableNvfKeymaps "Toggle blame [Gitsigns]" "<leader>tb";
diffThis = mkMappingOption "Diff this [Gitsigns]" "<leader>hd";
diffProject = mkMappingOption "Diff project [Gitsigns]" "<leader>hD";
diffThis = mkMappingOption config.vim.enableNvfKeymaps "Diff this [Gitsigns]" "<leader>hd";
diffProject = mkMappingOption config.vim.enableNvfKeymaps "Diff project [Gitsigns]" "<leader>hD";
toggleDeleted = mkMappingOption "Toggle deleted [Gitsigns]" "<leader>td";
toggleDeleted = mkMappingOption config.vim.enableNvfKeymaps "Toggle deleted [Gitsigns]" "<leader>td";
};
};
}

8
modules/plugins/git/neogit/neogit.nix
View file

@ -8,10 +8,10 @@ in {
setupOpts = mkPluginSetupOption "neogit" {};
mappings = {
open = mkMappingOption "Git Status [Neogit]" "<leader>gs";
commit = mkMappingOption "Git Commit [Neogit]" "<leader>gc";
pull = mkMappingOption "Git pull [Neogit]" "<leader>gp";
push = mkMappingOption "Git push [Neogit]" "<leader>gP";
open = mkMappingOption config.vim.enableNvfKeymaps "Git Status [Neogit]" "<leader>gs";
commit = mkMappingOption config.vim.enableNvfKeymaps "Git Commit [Neogit]" "<leader>gc";
pull = mkMappingOption config.vim.enableNvfKeymaps "Git pull [Neogit]" "<leader>gp";
push = mkMappingOption config.vim.enableNvfKeymaps "Git push [Neogit]" "<leader>gP";
};
};
}