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
docs/manual/hacking/keybinds.md
View file

@ -49,12 +49,12 @@ in {
# Mappings should always be inside an attrset called mappings
mappings = {
workspaceDiagnostics = mkMappingOption "Workspace diagnostics [trouble]" "<leader>lwd";
documentDiagnostics = mkMappingOption "Document diagnostics [trouble]" "<leader>ld";
lspReferences = mkMappingOption "LSP References [trouble]" "<leader>lr";
quickfix = mkMappingOption "QuickFix [trouble]" "<leader>xq";
locList = mkMappingOption "LOCList [trouble]" "<leader>xl";
symbols = mkMappingOption "Symbols [trouble]" "<leader>xs";
workspaceDiagnostics = mkMappingOption config.vim.enableNvfKeymaps "Workspace diagnostics [trouble]" "<leader>lwd";
documentDiagnostics = mkMappingOption config.vim.enableNvfKeymaps "Document diagnostics [trouble]" "<leader>ld";
lspReferences = mkMappingOption config.vim.enableNvfKeymaps "LSP References [trouble]" "<leader>lr";
quickfix = mkMappingOption config.vim.enableNvfKeymaps "QuickFix [trouble]" "<leader>xq";
locList = mkMappingOption config.vim.enableNvfKeymaps "LOCList [trouble]" "<leader>xl";
symbols = mkMappingOption config.vim.enableNvfKeymaps "Symbols [trouble]" "<leader>xs";
};
}
```

8
lib/binds.nix
View file

@ -32,10 +32,14 @@
};
};
mkMappingOption = description: default:
mkMappingOption = enableDefault: description: default:
mkOption {
type = nullOr str;
inherit default description;
default =
if enableDefault
then default
else null;
inherit description;
};
# Utility function that takes two attrsets:

3
modules/neovim/mappings/options.nix
View file

@ -1,5 +1,5 @@
{lib, ...}: let
inherit (lib.options) mkOption literalMD;
inherit (lib.options) mkOption literalMD mkEnableOption;
inherit (lib.types) either str listOf attrsOf nullOr submodule;
inherit (lib.nvim.config) mkBool;
@ -57,6 +57,7 @@
};
in {
options.vim = {
enableNvfKeymaps = mkEnableOption "default NVF keymaps for plugins" // {default = true;};
keymaps = mkOption {
type = listOf mapType;
description = "Custom keybindings.";

26
modules/plugins/assistant/chatgpt/chatgpt.nix
View file

@ -7,19 +7,19 @@ in {
enable = mkEnableOption "ChatGPT AI assistant. Requires the environment variable OPENAI_API_KEY to be set";
setupOpts = mkPluginSetupOption "chatgpt" {};
mappings = {
chatGpt = mkMappingOption "ChatGPT" "<leader>ac";
editWithInstructions = mkMappingOption "[ChatGPT] Edit with instructions" "<leader>ae";
grammarCorrection = mkMappingOption "[ChatGPT] Grammar correction" "<leader>ag";
translate = mkMappingOption "[ChatGPT] Translate" "<leader>at";
keyword = mkMappingOption "[ChatGPT] Keywords" "<leader>ak";
docstring = mkMappingOption "[ChatGPT] Docstring" "<leader>ad";
addTests = mkMappingOption "[ChatGPT] Add tests" "<leader>aa";
optimize = mkMappingOption "[ChatGPT] Optimize code" "<leader>ao";
summarize = mkMappingOption "[ChatGPT] Summarize" "<leader>as";
fixBugs = mkMappingOption "[ChatGPT] Fix bugs" "<leader>af";
explain = mkMappingOption "[ChatGPT] Explain code" "<leader>ax";
roxygenEdit = mkMappingOption "[ChatGPT] Roxygen edit" "<leader>ar";
readabilityanalysis = mkMappingOption "[ChatGPT] Code reability analysis" "<leader>al";
chatGpt = mkMappingOption config.vim.enableNvfKeymaps "ChatGPT" "<leader>ac";
editWithInstructions = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Edit with instructions" "<leader>ae";
grammarCorrection = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Grammar correction" "<leader>ag";
translate = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Translate" "<leader>at";
keyword = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Keywords" "<leader>ak";
docstring = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Docstring" "<leader>ad";
addTests = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Add tests" "<leader>aa";
optimize = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Optimize code" "<leader>ao";
summarize = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Summarize" "<leader>as";
fixBugs = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Fix bugs" "<leader>af";
explain = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Explain code" "<leader>ax";
roxygenEdit = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Roxygen edit" "<leader>ar";
readabilityanalysis = mkMappingOption config.vim.enableNvfKeymaps "[ChatGPT] Code reability analysis" "<leader>al";
};
};
}

12
modules/plugins/comments/comment-nvim/comment-nvim.nix
View file

@ -7,14 +7,14 @@ in {
enable = mkEnableOption "smart and powerful comment plugin for neovim comment-nvim";
mappings = {
toggleCurrentLine = mkMappingOption "Toggle current line comment" "gcc";
toggleCurrentBlock = mkMappingOption "Toggle current block comment" "gbc";
toggleCurrentLine = mkMappingOption config.vim.enableNvfKeymaps "Toggle current line comment" "gcc";
toggleCurrentBlock = mkMappingOption config.vim.enableNvfKeymaps "Toggle current block comment" "gbc";
toggleOpLeaderLine = mkMappingOption "Toggle line comment" "gc";
toggleOpLeaderBlock = mkMappingOption "Toggle block comment" "gb";
toggleOpLeaderLine = mkMappingOption config.vim.enableNvfKeymaps "Toggle line comment" "gc";
toggleOpLeaderBlock = mkMappingOption config.vim.enableNvfKeymaps "Toggle block comment" "gb";
toggleSelectedLine = mkMappingOption "Toggle selected comment" "gc";
toggleSelectedBlock = mkMappingOption "Toggle selected block" "gb";
toggleSelectedLine = mkMappingOption config.vim.enableNvfKeymaps "Toggle selected comment" "gc";
toggleSelectedBlock = mkMappingOption config.vim.enableNvfKeymaps "Toggle selected block" "gb";
};
setupOpts = mkPluginSetupOption "Comment-nvim" {

14
modules/plugins/completion/blink-cmp/blink-cmp.nix
View file

@ -131,13 +131,13 @@ in {
};
mappings = {
complete = mkMappingOption "Complete [blink.cmp]" "<C-Space>";
confirm = mkMappingOption "Confirm [blink.cmp]" "<CR>";
next = mkMappingOption "Next item [blink.cmp]" "<Tab>";
previous = mkMappingOption "Previous item [blink.cmp]" "<S-Tab>";
close = mkMappingOption "Close [blink.cmp]" "<C-e>";
scrollDocsUp = mkMappingOption "Scroll docs up [blink.cmp]" "<C-d>";
scrollDocsDown = mkMappingOption "Scroll docs down [blink.cmp]" "<C-f>";
complete = mkMappingOption config.vim.enableNvfKeymaps "Complete [blink.cmp]" "<C-Space>";
confirm = mkMappingOption config.vim.enableNvfKeymaps "Confirm [blink.cmp]" "<CR>";
next = mkMappingOption config.vim.enableNvfKeymaps "Next item [blink.cmp]" "<Tab>";
previous = mkMappingOption config.vim.enableNvfKeymaps "Previous item [blink.cmp]" "<S-Tab>";
close = mkMappingOption config.vim.enableNvfKeymaps "Close [blink.cmp]" "<C-e>";
scrollDocsUp = mkMappingOption config.vim.enableNvfKeymaps "Scroll docs up [blink.cmp]" "<C-d>";
scrollDocsDown = mkMappingOption config.vim.enableNvfKeymaps "Scroll docs down [blink.cmp]" "<C-f>";
};
sourcePlugins = let

14
modules/plugins/completion/nvim-cmp/nvim-cmp.nix
View file

@ -62,13 +62,13 @@ in {
};
mappings = {
complete = mkMappingOption "Complete [nvim-cmp]" "<C-Space>";
confirm = mkMappingOption "Confirm [nvim-cmp]" "<CR>";
next = mkMappingOption "Next item [nvim-cmp]" "<Tab>";
previous = mkMappingOption "Previous item [nvim-cmp]" "<S-Tab>";
close = mkMappingOption "Close [nvim-cmp]" "<C-e>";
scrollDocsUp = mkMappingOption "Scroll docs up [nvim-cmp]" "<C-d>";
scrollDocsDown = mkMappingOption "Scroll docs down [nvim-cmp]" "<C-f>";
complete = mkMappingOption config.vim.enableNvfKeymaps "Complete [nvim-cmp]" "<C-Space>";
confirm = mkMappingOption config.vim.enableNvfKeymaps "Confirm [nvim-cmp]" "<CR>";
next = mkMappingOption config.vim.enableNvfKeymaps "Next item [nvim-cmp]" "<Tab>";
previous = mkMappingOption config.vim.enableNvfKeymaps "Previous item [nvim-cmp]" "<S-Tab>";
close = mkMappingOption config.vim.enableNvfKeymaps "Close [nvim-cmp]" "<C-e>";
scrollDocsUp = mkMappingOption config.vim.enableNvfKeymaps "Scroll docs up [nvim-cmp]" "<C-d>";
scrollDocsDown = mkMappingOption config.vim.enableNvfKeymaps "Scroll docs down [nvim-cmp]" "<C-f>";
};
format = mkOption {

30
modules/plugins/debugger/nvim-dap/nvim-dap.nix
View file

@ -26,25 +26,25 @@ in {
};
mappings = {
continue = mkMappingOption "Continue" "<leader>dc";
restart = mkMappingOption "Restart" "<leader>dR";
terminate = mkMappingOption "Terminate" "<leader>dq";
runLast = mkMappingOption "Re-run Last Debug Session" "<leader>d.";
continue = mkMappingOption config.vim.enableNvfKeymaps "Continue" "<leader>dc";
restart = mkMappingOption config.vim.enableNvfKeymaps "Restart" "<leader>dR";
terminate = mkMappingOption config.vim.enableNvfKeymaps "Terminate" "<leader>dq";
runLast = mkMappingOption config.vim.enableNvfKeymaps "Re-run Last Debug Session" "<leader>d.";
toggleRepl = mkMappingOption "Toggle Repl" "<leader>dr";
hover = mkMappingOption "Hover" "<leader>dh";
toggleBreakpoint = mkMappingOption "Toggle breakpoint" "<leader>db";
toggleRepl = mkMappingOption config.vim.enableNvfKeymaps "Toggle Repl" "<leader>dr";
hover = mkMappingOption config.vim.enableNvfKeymaps "Hover" "<leader>dh";
toggleBreakpoint = mkMappingOption config.vim.enableNvfKeymaps "Toggle breakpoint" "<leader>db";
runToCursor = mkMappingOption "Continue to the current cursor" "<leader>dgc";
stepInto = mkMappingOption "Step into function" "<leader>dgi";
stepOut = mkMappingOption "Step out of function" "<leader>dgo";
stepOver = mkMappingOption "Next step" "<leader>dgj";
stepBack = mkMappingOption "Step back" "<leader>dgk";
runToCursor = mkMappingOption config.vim.enableNvfKeymaps "Continue to the current cursor" "<leader>dgc";
stepInto = mkMappingOption config.vim.enableNvfKeymaps "Step into function" "<leader>dgi";
stepOut = mkMappingOption config.vim.enableNvfKeymaps "Step out of function" "<leader>dgo";
stepOver = mkMappingOption config.vim.enableNvfKeymaps "Next step" "<leader>dgj";
stepBack = mkMappingOption config.vim.enableNvfKeymaps "Step back" "<leader>dgk";
goUp = mkMappingOption "Go up stacktrace" "<leader>dvo";
goDown = mkMappingOption "Go down stacktrace" "<leader>dvi";
goUp = mkMappingOption config.vim.enableNvfKeymaps "Go up stacktrace" "<leader>dvo";
goDown = mkMappingOption config.vim.enableNvfKeymaps "Go down stacktrace" "<leader>dvi";
toggleDapUI = mkMappingOption "Toggle DAP-UI" "<leader>du";
toggleDapUI = mkMappingOption config.vim.enableNvfKeymaps "Toggle DAP-UI" "<leader>du";
};
};
}

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";
};
};
}

2
modules/plugins/languages/scala.nix
View file

@ -39,7 +39,7 @@ in {
};
extraMappings = {
listCommands = mkMappingOption "List Metals commands" "<leader>lc";
listCommands = mkMappingOption config.vim.enableNvfKeymaps "List Metals commands" "<leader>lc";
};
extraSettings = mkOption {

4
modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix
View file

@ -57,8 +57,8 @@ in {
};
mappings = {
viewToggle = mkMappingOption "Open or close the docs view panel" "<leader>lvt";
viewUpdate = mkMappingOption "Manually update the docs view panel" "<leader>lvu";
viewToggle = mkMappingOption config.vim.enableNvfKeymaps "Open or close the docs view panel" "<leader>lvt";
viewUpdate = mkMappingOption config.vim.enableNvfKeymaps "Manually update the docs view panel" "<leader>lvu";
};
};
}

2
modules/plugins/lsp/otter/otter.nix
View file

@ -10,7 +10,7 @@ in {
lsp features and a code completion source for code embedded in other documents [otter-nvim]
'';
mappings = {
toggle = mkMappingOption "Activate LSP on Cursor Position [otter-nvim]" "<leader>lo";
toggle = mkMappingOption config.vim.enableNvfKeymaps "Activate LSP on Cursor Position [otter-nvim]" "<leader>lo";
};
setupOpts = mkPluginSetupOption "otter.nvim" {
lsp = {

12
modules/plugins/lsp/trouble/trouble.nix
View file

@ -10,12 +10,12 @@ in {
setupOpts = mkPluginSetupOption "Trouble" {};
mappings = {
workspaceDiagnostics = mkMappingOption "Workspace diagnostics [trouble]" "<leader>lwd";
documentDiagnostics = mkMappingOption "Document diagnostics [trouble]" "<leader>ld";
lspReferences = mkMappingOption "LSP References [trouble]" "<leader>lr";
quickfix = mkMappingOption "QuickFix [trouble]" "<leader>xq";
locList = mkMappingOption "LOCList [trouble]" "<leader>xl";
symbols = mkMappingOption "Symbols [trouble]" "<leader>xs";
workspaceDiagnostics = mkMappingOption config.vim.enableNvfKeymaps "Workspace diagnostics [trouble]" "<leader>lwd";
documentDiagnostics = mkMappingOption config.vim.enableNvfKeymaps "Document diagnostics [trouble]" "<leader>ld";
lspReferences = mkMappingOption config.vim.enableNvfKeymaps "LSP References [trouble]" "<leader>lr";
quickfix = mkMappingOption config.vim.enableNvfKeymaps "QuickFix [trouble]" "<leader>xq";
locList = mkMappingOption config.vim.enableNvfKeymaps "LOCList [trouble]" "<leader>xl";
symbols = mkMappingOption config.vim.enableNvfKeymaps "Symbols [trouble]" "<leader>xs";
};
};
};

8
modules/plugins/minimap/codewindow/codewindow.nix
View file

@ -6,10 +6,10 @@ in {
enable = mkEnableOption "codewindow plugin for minimap view";
mappings = {
open = mkMappingOption "Open minimap [codewindow]" "<leader>mo";
close = mkMappingOption "Close minimap [codewindow]" "<leader>mc";
toggle = mkMappingOption "Toggle minimap [codewindow]" "<leader>mm";
toggleFocus = mkMappingOption "Toggle minimap focus [codewindow]" "<leader>mf";
open = mkMappingOption config.vim.enableNvfKeymaps "Open minimap [codewindow]" "<leader>mo";
close = mkMappingOption config.vim.enableNvfKeymaps "Close minimap [codewindow]" "<leader>mc";
toggle = mkMappingOption config.vim.enableNvfKeymaps "Toggle minimap [codewindow]" "<leader>mm";
toggleFocus = mkMappingOption config.vim.enableNvfKeymaps "Toggle minimap focus [codewindow]" "<leader>mf";
};
};
}

6
modules/plugins/notes/todo-comments/todo-comments.nix
View file

@ -53,9 +53,9 @@ in {
};
mappings = {
quickFix = mkMappingOption "Open Todo-s in a quickfix list" "<leader>tdq";
telescope = mkMappingOption "Open Todo-s in telescope" "<leader>tds";
trouble = mkMappingOption "Open Todo-s in Trouble" "<leader>tdt";
quickFix = mkMappingOption config.vim.enableNvfKeymaps "Open Todo-s in a quickfix list" "<leader>tdq";
telescope = mkMappingOption config.vim.enableNvfKeymaps "Open Todo-s in telescope" "<leader>tds";
trouble = mkMappingOption config.vim.enableNvfKeymaps "Open Todo-s in Trouble" "<leader>tdt";
};
};
}

6
modules/plugins/runner/run-nvim/run-nvim.nix
View file

@ -9,9 +9,9 @@ in {
setupOpts = mkPluginSetupOption "run.nvim" {};
mappings = {
run = mkMappingOption "Run cached" "<leader>ri";
runOverride = mkMappingOption "Run and override" "<leader>ro";
runCommand = mkMappingOption "Run prompt" "<leader>rc";
run = mkMappingOption config.vim.enableNvfKeymaps "Run cached" "<leader>ri";
runOverride = mkMappingOption config.vim.enableNvfKeymaps "Run and override" "<leader>ro";
runCommand = mkMappingOption config.vim.enableNvfKeymaps "Run prompt" "<leader>rc";
};
};
};

18
modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix
View file

@ -13,15 +13,15 @@ in {
enable = mkEnableOption "neovim bufferline";
mappings = {
closeCurrent = mkMappingOption "Close buffer" null;
cycleNext = mkMappingOption "Next buffer" "<leader>bn";
cyclePrevious = mkMappingOption "Previous buffer" "<leader>bp";
pick = mkMappingOption "Pick buffer" "<leader>bc";
sortByExtension = mkMappingOption "Sort buffers by extension" "<leader>bse";
sortByDirectory = mkMappingOption "Sort buffers by directory" "<leader>bsd";
sortById = mkMappingOption "Sort buffers by ID" "<leader>bsi";
moveNext = mkMappingOption "Move next buffer" "<leader>bmn";
movePrevious = mkMappingOption "Move previous buffer" "<leader>bmp";
closeCurrent = mkMappingOption config.vim.enableNvfKeymaps "Close buffer" null;
cycleNext = mkMappingOption config.vim.enableNvfKeymaps "Next buffer" "<leader>bn";
cyclePrevious = mkMappingOption config.vim.enableNvfKeymaps "Previous buffer" "<leader>bp";
pick = mkMappingOption config.vim.enableNvfKeymaps "Pick buffer" "<leader>bc";
sortByExtension = mkMappingOption config.vim.enableNvfKeymaps "Sort buffers by extension" "<leader>bse";
sortByDirectory = mkMappingOption config.vim.enableNvfKeymaps "Sort buffers by directory" "<leader>bsd";
sortById = mkMappingOption config.vim.enableNvfKeymaps "Sort buffers by ID" "<leader>bsi";
moveNext = mkMappingOption config.vim.enableNvfKeymaps "Move next buffer" "<leader>bmn";
movePrevious = mkMappingOption config.vim.enableNvfKeymaps "Move previous buffer" "<leader>bmp";
};
setupOpts = mkPluginSetupOption "Bufferline-nvim" {

2
modules/plugins/terminal/toggleterm/toggleterm.nix
View file

@ -80,7 +80,7 @@ in {
};
mappings = {
open = mkMappingOption "Open lazygit [toggleterm]" "<leader>gg";
open = mkMappingOption config.vim.enableNvfKeymaps "Open lazygit [toggleterm]" "<leader>gg";
};
};
};

8
modules/plugins/treesitter/treesitter.nix
View file

@ -12,10 +12,10 @@ in {
enable = mkEnableOption "treesitter, also enabled automatically through language options";
mappings.incrementalSelection = {
init = mkMappingOption "Init selection [treesitter]" "gnn";
incrementByNode = mkMappingOption "Increment selection by node [treesitter]" "grn";
incrementByScope = mkMappingOption "Increment selection by scope [treesitter]" "grc";
decrementByNode = mkMappingOption "Decrement selection by node [treesitter]" "grm";
init = mkMappingOption config.vim.enableNvfKeymaps "Init selection [treesitter]" "gnn";
incrementByNode = mkMappingOption config.vim.enableNvfKeymaps "Increment selection by node [treesitter]" "grn";
incrementByScope = mkMappingOption config.vim.enableNvfKeymaps "Increment selection by scope [treesitter]" "grc";
decrementByNode = mkMappingOption config.vim.enableNvfKeymaps "Decrement selection by node [treesitter]" "grm";
};
fold = mkEnableOption "fold with treesitter";

6
modules/plugins/utility/ccc/ccc.nix
View file

@ -6,9 +6,9 @@ in {
enable = mkEnableOption "ccc color picker for neovim";
mappings = {
quit = mkMappingOption "Cancel and close the UI without replace or insert" "<Esc>";
increase10 = mkMappingOption "Increase the value times delta of the slider" "<L>";
decrease10 = mkMappingOption "Decrease the value times delta of the slider" "<H>";
quit = mkMappingOption config.vim.enableNvfKeymaps "Cancel and close the UI without replace or insert" "<Esc>";
increase10 = mkMappingOption config.vim.enableNvfKeymaps "Increase the value times delta of the slider" "<L>";
decrease10 = mkMappingOption config.vim.enableNvfKeymaps "Decrease the value times delta of the slider" "<H>";
};
};
}

4
modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix
View file

@ -6,8 +6,8 @@ in {
enable = mkEnableOption "gesture-nvim: mouse gestures";
mappings = {
draw = mkMappingOption "Start drawing [gesture.nvim]" "<LeftDrag>";
finish = mkMappingOption "Finish drawing [gesture.nvim]" "<LeftRelease>";
draw = mkMappingOption config.vim.enableNvfKeymaps "Start drawing [gesture.nvim]" "<LeftDrag>";
finish = mkMappingOption config.vim.enableNvfKeymaps "Finish drawing [gesture.nvim]" "<LeftRelease>";
};
};
}

12
modules/plugins/utility/harpoon/harpoon.nix
View file

@ -7,12 +7,12 @@
in {
options.vim.navigation.harpoon = {
mappings = {
markFile = mkMappingOption "Mark file [Harpoon]" "<leader>a";
listMarks = mkMappingOption "List marked files [Harpoon]" "<C-e>";
file1 = mkMappingOption "Go to marked file 1 [Harpoon]" "<C-j>";
file2 = mkMappingOption "Go to marked file 2 [Harpoon]" "<C-k>";
file3 = mkMappingOption "Go to marked file 3 [Harpoon]" "<C-l>";
file4 = mkMappingOption "Go to marked file 4 [Harpoon]" "<C-;>";
markFile = mkMappingOption config.vim.enableNvfKeymaps "Mark file [Harpoon]" "<leader>a";
listMarks = mkMappingOption config.vim.enableNvfKeymaps "List marked files [Harpoon]" "<C-e>";
file1 = mkMappingOption config.vim.enableNvfKeymaps "Go to marked file 1 [Harpoon]" "<C-j>";
file2 = mkMappingOption config.vim.enableNvfKeymaps "Go to marked file 2 [Harpoon]" "<C-k>";
file3 = mkMappingOption config.vim.enableNvfKeymaps "Go to marked file 3 [Harpoon]" "<C-l>";
file4 = mkMappingOption config.vim.enableNvfKeymaps "Go to marked file 4 [Harpoon]" "<C-;>";
};
enable = mkEnableOption "Quick bookmarks on keybinds [Harpoon]";

2
modules/plugins/utility/motion/hop/hop.nix
View file

@ -4,7 +4,7 @@
in {
options.vim.utility.motion.hop = {
mappings = {
hop = mkMappingOption "Jump to occurrences [hop.nvim]" "<leader>h";
hop = mkMappingOption config.vim.enableNvfKeymaps "Jump to occurrences [hop.nvim]" "<leader>h";
};
enable = mkEnableOption "Hop.nvim plugin (easy motion)";

2
modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix
View file

@ -8,7 +8,7 @@ in {
setupOpts = mkPluginSetupOption "aerial.nvim" {};
mappings = {
toggle = mkMappingOption "Toggle aerial window" "gO";
toggle = mkMappingOption config.vim.enableNvfKeymaps "Toggle aerial window" "gO";
};
};
}

2
modules/plugins/utility/preview/glow/glow.nix
View file

@ -10,7 +10,7 @@ in {
options.vim.utility.preview = {
glow = {
enable = mkEnableOption "markdown preview in neovim with glow";
mappings.openPreview = mkMappingOption "Open preview" "<leader>p";
mappings.openPreview = mkMappingOption config.vim.enableNvfKeymaps "Open preview" "<leader>p";
};
};
}

26
modules/plugins/utility/smart-splits/smart-splits.nix
View file

@ -19,19 +19,19 @@ in {
setupOpts = mkPluginSetupOption "smart-splits" {};
keymaps = {
resize_left = mkMappingOption "Resize Window/Pane Left" "<A-h>";
resize_down = mkMappingOption "Resize Window/Pane Down" "<A-j>";
resize_up = mkMappingOption "Resize Window/Pane Up" "<A-k>";
resize_right = mkMappingOption "Resize Window/Pane Right" "<A-l>";
move_cursor_left = mkMappingOption "Focus Window/Pane on the Left" "<C-h>";
move_cursor_down = mkMappingOption "Focus Window/Pane Below" "<C-j>";
move_cursor_up = mkMappingOption "Focus Window/Pane Above" "<C-k>";
move_cursor_right = mkMappingOption "Focus Window/Pane on the Right" "<C-l>";
move_cursor_previous = mkMappingOption "Focus Previous Window/Pane" "<C-\\>";
swap_buf_left = mkMappingOption "Swap Buffer Left" "<leader><leader>h";
swap_buf_down = mkMappingOption "Swap Buffer Down" "<leader><leader>j";
swap_buf_up = mkMappingOption "Swap Buffer Up" "<leader><leader>k";
swap_buf_right = mkMappingOption "Swap Buffer Right" "<leader><leader>l";
resize_left = mkMappingOption config.vim.enableNvfKeymaps "Resize Window/Pane Left" "<A-h>";
resize_down = mkMappingOption config.vim.enableNvfKeymaps "Resize Window/Pane Down" "<A-j>";
resize_up = mkMappingOption config.vim.enableNvfKeymaps "Resize Window/Pane Up" "<A-k>";
resize_right = mkMappingOption config.vim.enableNvfKeymaps "Resize Window/Pane Right" "<A-l>";
move_cursor_left = mkMappingOption config.vim.enableNvfKeymaps "Focus Window/Pane on the Left" "<C-h>";
move_cursor_down = mkMappingOption config.vim.enableNvfKeymaps "Focus Window/Pane Below" "<C-j>";
move_cursor_up = mkMappingOption config.vim.enableNvfKeymaps "Focus Window/Pane Above" "<C-k>";
move_cursor_right = mkMappingOption config.vim.enableNvfKeymaps "Focus Window/Pane on the Right" "<C-l>";
move_cursor_previous = mkMappingOption config.vim.enableNvfKeymaps "Focus Previous Window/Pane" "<C-\\>";
swap_buf_left = mkMappingOption config.vim.enableNvfKeymaps "Swap Buffer Left" "<leader><leader>h";
swap_buf_down = mkMappingOption config.vim.enableNvfKeymaps "Swap Buffer Down" "<leader><leader>j";
swap_buf_up = mkMappingOption config.vim.enableNvfKeymaps "Swap Buffer Up" "<leader><leader>k";
swap_buf_right = mkMappingOption config.vim.enableNvfKeymaps "Swap Buffer Right" "<leader><leader>l";
};
};
}

40
modules/plugins/utility/telescope/telescope.nix
View file

@ -200,29 +200,29 @@
in {
options.vim.telescope = {
mappings = {
findProjects = mkMappingOption "Find projects [Telescope]" "<leader>fp";
findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
liveGrep = mkMappingOption "Live grep [Telescope]" "<leader>fg";
buffers = mkMappingOption "Buffers [Telescope]" "<leader>fb";
helpTags = mkMappingOption "Help tags [Telescope]" "<leader>fh";
open = mkMappingOption "Open [Telescope]" "<leader>ft";
resume = mkMappingOption "Resume (previous search) [Telescope]" "<leader>fr";
findProjects = mkMappingOption config.vim.enableNvfKeymaps "Find projects [Telescope]" "<leader>fp";
findFiles = mkMappingOption config.vim.enableNvfKeymaps "Find files [Telescope]" "<leader>ff";
liveGrep = mkMappingOption config.vim.enableNvfKeymaps "Live grep [Telescope]" "<leader>fg";
buffers = mkMappingOption config.vim.enableNvfKeymaps "Buffers [Telescope]" "<leader>fb";
helpTags = mkMappingOption config.vim.enableNvfKeymaps "Help tags [Telescope]" "<leader>fh";
open = mkMappingOption config.vim.enableNvfKeymaps "Open [Telescope]" "<leader>ft";
resume = mkMappingOption config.vim.enableNvfKeymaps "Resume (previous search) [Telescope]" "<leader>fr";
gitCommits = mkMappingOption "Git commits [Telescope]" "<leader>fvcw";
gitBufferCommits = mkMappingOption "Git buffer commits [Telescope]" "<leader>fvcb";
gitBranches = mkMappingOption "Git branches [Telescope]" "<leader>fvb";
gitStatus = mkMappingOption "Git status [Telescope]" "<leader>fvs";
gitStash = mkMappingOption "Git stash [Telescope]" "<leader>fvx";
gitCommits = mkMappingOption config.vim.enableNvfKeymaps "Git commits [Telescope]" "<leader>fvcw";
gitBufferCommits = mkMappingOption config.vim.enableNvfKeymaps "Git buffer commits [Telescope]" "<leader>fvcb";
gitBranches = mkMappingOption config.vim.enableNvfKeymaps "Git branches [Telescope]" "<leader>fvb";
gitStatus = mkMappingOption config.vim.enableNvfKeymaps "Git status [Telescope]" "<leader>fvs";
gitStash = mkMappingOption config.vim.enableNvfKeymaps "Git stash [Telescope]" "<leader>fvx";
lspDocumentSymbols = mkMappingOption "LSP Document Symbols [Telescope]" "<leader>flsb";
lspWorkspaceSymbols = mkMappingOption "LSP Workspace Symbols [Telescope]" "<leader>flsw";
lspReferences = mkMappingOption "LSP References [Telescope]" "<leader>flr";
lspImplementations = mkMappingOption "LSP Implementations [Telescope]" "<leader>fli";
lspDefinitions = mkMappingOption "LSP Definitions [Telescope]" "<leader>flD";
lspTypeDefinitions = mkMappingOption "LSP Type Definitions [Telescope]" "<leader>flt";
diagnostics = mkMappingOption "Diagnostics [Telescope]" "<leader>fld";
lspDocumentSymbols = mkMappingOption config.vim.enableNvfKeymaps "LSP Document Symbols [Telescope]" "<leader>flsb";
lspWorkspaceSymbols = mkMappingOption config.vim.enableNvfKeymaps "LSP Workspace Symbols [Telescope]" "<leader>flsw";
lspReferences = mkMappingOption config.vim.enableNvfKeymaps "LSP References [Telescope]" "<leader>flr";
lspImplementations = mkMappingOption config.vim.enableNvfKeymaps "LSP Implementations [Telescope]" "<leader>fli";
lspDefinitions = mkMappingOption config.vim.enableNvfKeymaps "LSP Definitions [Telescope]" "<leader>flD";
lspTypeDefinitions = mkMappingOption config.vim.enableNvfKeymaps "LSP Type Definitions [Telescope]" "<leader>flt";
diagnostics = mkMappingOption config.vim.enableNvfKeymaps "Diagnostics [Telescope]" "<leader>fld";
treesitter = mkMappingOption "Treesitter [Telescope]" "<leader>fs";
treesitter = mkMappingOption config.vim.enableNvfKeymaps "Treesitter [Telescope]" "<leader>fs";
};
enable = mkEnableOption "telescope.nvim: multi-purpose search and picker utility";

6
modules/plugins/utility/yazi-nvim/yazi-nvim.nix
View file

@ -10,9 +10,9 @@ in {
'';
mappings = {
openYazi = mkMappingOption "Open yazi at the current file [yazi.nvim]" "<leader>-";
openYaziDir = mkMappingOption "Open the file manager in nvim's working directory [yazi.nvim]" "<leader>cw";
yaziToggle = mkMappingOption "Resume the last yazi session [yazi.nvim]" "<c-up>";
openYazi = mkMappingOption config.vim.enableNvfKeymaps "Open yazi at the current file [yazi.nvim]" "<leader>-";
openYaziDir = mkMappingOption config.vim.enableNvfKeymaps "Open the file manager in nvim's working directory [yazi.nvim]" "<leader>cw";
yaziToggle = mkMappingOption config.vim.enableNvfKeymaps "Resume the last yazi session [yazi.nvim]" "<c-up>";
};
setupOpts = mkPluginSetupOption "yazi-nvim" {

2
modules/plugins/visuals/cellular-automaton/cellular-automaton.nix
View file

@ -13,7 +13,7 @@ in {
enable = mkEnableOption "cellular-automaton to help you cope with stubborn code [cellular-automaton]";
mappings = {
makeItRain = mkMappingOption "Make it rain [cellular-automaton]" "<leader>fml";
makeItRain = mkMappingOption config.vim.enableNvfKeymaps "Make it rain [cellular-automaton]" "<leader>fml";
};
animation = {