From 1cda8228e998d020f17581166753b802f44d8842 Mon Sep 17 00:00:00 2001 From: alfarel Date: Sat, 14 Mar 2026 20:20:58 -0400 Subject: [PATCH] plugins: use new config-aware mkMappingOption Generated 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. --- docs/manual/hacking.md | 2 +- modules/plugins/assistant/chatgpt/chatgpt.nix | 8 ++++++-- modules/plugins/assistant/neocodeium/neocodeium.nix | 8 ++++++-- modules/plugins/comments/comment-nvim/comment-nvim.nix | 8 ++++++-- modules/plugins/completion/blink-cmp/blink-cmp.nix | 8 ++++++-- modules/plugins/completion/nvim-cmp/nvim-cmp.nix | 2 +- modules/plugins/debugger/nvim-dap/nvim-dap.nix | 8 ++++++-- modules/plugins/git/git-conflict/git-conflict.nix | 2 +- modules/plugins/git/gitsigns/gitsigns.nix | 2 +- modules/plugins/git/neogit/neogit.nix | 8 ++++++-- modules/plugins/languages/scala.nix | 2 +- modules/plugins/languages/typst.nix | 3 ++- modules/plugins/lsp/module.nix | 8 ++++++-- modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix | 8 ++++++-- modules/plugins/lsp/otter/otter.nix | 8 ++++++-- modules/plugins/lsp/trouble/trouble.nix | 8 ++++++-- modules/plugins/minimap/codewindow/codewindow.nix | 8 ++++++-- modules/plugins/notes/todo-comments/todo-comments.nix | 3 ++- modules/plugins/runner/run-nvim/run-nvim.nix | 8 ++++++-- .../plugins/tabline/nvim-bufferline/nvim-bufferline.nix | 2 +- modules/plugins/terminal/toggleterm/toggleterm.nix | 3 ++- modules/plugins/utility/ccc/ccc.nix | 8 ++++++-- .../utility/gestures/gesture-nvim/gesture-nvim.nix | 8 ++++++-- modules/plugins/utility/harpoon/harpoon.nix | 8 ++++++-- modules/plugins/utility/motion/hop/hop.nix | 8 ++++++-- .../plugins/utility/outline/aerial-nvim/aerial-nvim.nix | 8 ++++++-- modules/plugins/utility/preview/glow/glow.nix | 8 ++++++-- modules/plugins/utility/smart-splits/smart-splits.nix | 8 ++++++-- modules/plugins/utility/telescope/telescope.nix | 2 +- modules/plugins/utility/yazi-nvim/yazi-nvim.nix | 8 ++++++-- .../visuals/cellular-automaton/cellular-automaton.nix | 8 ++++++-- 31 files changed, 139 insertions(+), 52 deletions(-) diff --git a/docs/manual/hacking.md b/docs/manual/hacking.md index 40f0854e..37430e67 100644 --- a/docs/manual/hacking.md +++ b/docs/manual/hacking.md @@ -768,7 +768,7 @@ usage should look something like this: # pluginDefinition.nix {lib, ...}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.plugin = { enable = mkEnableOption "Enable plugin"; diff --git a/modules/plugins/assistant/chatgpt/chatgpt.nix b/modules/plugins/assistant/chatgpt/chatgpt.nix index 95dde397..2d644b5c 100644 --- a/modules/plugins/assistant/chatgpt/chatgpt.nix +++ b/modules/plugins/assistant/chatgpt/chatgpt.nix @@ -1,7 +1,11 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.assistant.chatgpt = { enable = mkEnableOption "ChatGPT AI assistant. Requires the environment variable OPENAI_API_KEY to be set"; diff --git a/modules/plugins/assistant/neocodeium/neocodeium.nix b/modules/plugins/assistant/neocodeium/neocodeium.nix index d2ce958c..fe3f3388 100644 --- a/modules/plugins/assistant/neocodeium/neocodeium.nix +++ b/modules/plugins/assistant/neocodeium/neocodeium.nix @@ -1,4 +1,8 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.types) nullOr @@ -11,7 +15,7 @@ ; inherit (lib.options) mkOption mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption luaInline; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.assistant.neocodeium = { enable = mkEnableOption "NeoCodeium AI completion"; diff --git a/modules/plugins/comments/comment-nvim/comment-nvim.nix b/modules/plugins/comments/comment-nvim/comment-nvim.nix index 76fd8131..fcf73baf 100644 --- a/modules/plugins/comments/comment-nvim/comment-nvim.nix +++ b/modules/plugins/comments/comment-nvim/comment-nvim.nix @@ -1,7 +1,11 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.comments.comment-nvim = { enable = mkEnableOption "smart and powerful comment plugin for neovim comment-nvim"; diff --git a/modules/plugins/completion/blink-cmp/blink-cmp.nix b/modules/plugins/completion/blink-cmp/blink-cmp.nix index d0f0328a..b6967dcb 100644 --- a/modules/plugins/completion/blink-cmp/blink-cmp.nix +++ b/modules/plugins/completion/blink-cmp/blink-cmp.nix @@ -1,9 +1,13 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption mkOption literalMD; inherit (lib.types) bool listOf str either attrsOf submodule enum anything int nullOr; inherit (lib.nvim.types) mkPluginSetupOption luaInline pluginType; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.config) mkBool; + inherit (config.vim.lib) mkMappingOption; keymapType = submodule { freeformType = attrsOf (listOf (either str luaInline)); diff --git a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix index 4391a144..a16da8d3 100644 --- a/modules/plugins/completion/nvim-cmp/nvim-cmp.nix +++ b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix @@ -6,9 +6,9 @@ inherit (lib.options) mkEnableOption mkOption literalMD; inherit (lib.types) str attrsOf nullOr either listOf; inherit (lib.generators) mkLuaInline; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption luaInline mergelessListOf pluginType; inherit (lib.nvim.lua) toLuaObject; + inherit (config.vim.lib) mkMappingOption; inherit (builtins) isString; cfg = config.vim.autocomplete.nvim-cmp; diff --git a/modules/plugins/debugger/nvim-dap/nvim-dap.nix b/modules/plugins/debugger/nvim-dap/nvim-dap.nix index ef582091..521823df 100644 --- a/modules/plugins/debugger/nvim-dap/nvim-dap.nix +++ b/modules/plugins/debugger/nvim-dap/nvim-dap.nix @@ -1,8 +1,12 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) bool attrsOf str; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.debugger.nvim-dap = { enable = mkEnableOption "debugging via nvim-dap"; diff --git a/modules/plugins/git/git-conflict/git-conflict.nix b/modules/plugins/git/git-conflict/git-conflict.nix index 44ab79c5..4e5e6216 100644 --- a/modules/plugins/git/git-conflict/git-conflict.nix +++ b/modules/plugins/git/git-conflict/git-conflict.nix @@ -4,8 +4,8 @@ ... }: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; 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;}; diff --git a/modules/plugins/git/gitsigns/gitsigns.nix b/modules/plugins/git/gitsigns/gitsigns.nix index 9c2375d8..f7e14c27 100644 --- a/modules/plugins/git/gitsigns/gitsigns.nix +++ b/modules/plugins/git/gitsigns/gitsigns.nix @@ -5,8 +5,8 @@ }: let inherit (lib.options) mkEnableOption; inherit (lib.modules) mkRenamedOptionModule; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { imports = [ (mkRenamedOptionModule ["vim" "git" "gitsigns" "codeActions" "vim" "gitsigns" "codeActions"] ["vim" "git" "gitsigns" "codeActions" "enable"]) diff --git a/modules/plugins/git/neogit/neogit.nix b/modules/plugins/git/neogit/neogit.nix index fa988a32..9800269c 100644 --- a/modules/plugins/git/neogit/neogit.nix +++ b/modules/plugins/git/neogit/neogit.nix @@ -1,7 +1,11 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.git.neogit = { enable = mkEnableOption "An Interactive and powerful Git interface [Neogit]"; diff --git a/modules/plugins/languages/scala.nix b/modules/plugins/languages/scala.nix index bcbe43fe..cf47352c 100644 --- a/modules/plugins/languages/scala.nix +++ b/modules/plugins/languages/scala.nix @@ -6,13 +6,13 @@ }: let inherit (lib.generators) mkLuaInline; inherit (lib.modules) mkIf mkMerge; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.types) mkGrammarOption luaInline; inherit (lib.options) mkOption mkEnableOption mkPackageOption literalExpression; inherit (lib.strings) optionalString; inherit (lib.types) attrsOf anything bool; + inherit (config.vim.lib) mkMappingOption; listCommandsAction = if config.vim.telescope.enable diff --git a/modules/plugins/languages/typst.nix b/modules/plugins/languages/typst.nix index 2e29f22b..7cada25b 100644 --- a/modules/plugins/languages/typst.nix +++ b/modules/plugins/languages/typst.nix @@ -13,8 +13,9 @@ inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.attrsets) mapListToAttrs; - inherit (lib.nvim.binds) mkKeymap mkMappingOption; + inherit (lib.nvim.binds) mkKeymap; inherit (lib.generators) mkLuaInline; + inherit (config.vim.lib) mkMappingOption; cfg = config.vim.languages.typst; diff --git a/modules/plugins/lsp/module.nix b/modules/plugins/lsp/module.nix index 6b63d725..0f81d9a4 100644 --- a/modules/plugins/lsp/module.nix +++ b/modules/plugins/lsp/module.nix @@ -1,6 +1,10 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.lsp = { formatOnSave = mkEnableOption "format on save"; diff --git a/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix b/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix index df571123..bd96ced7 100644 --- a/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix +++ b/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix @@ -1,9 +1,13 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption mkOption; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; inherit (lib.types) enum int; inherit (lib.modules) mkRenamedOptionModule; + inherit (config.vim.lib) mkMappingOption; in { imports = let renamedSetupOption = oldPath: newPath: diff --git a/modules/plugins/lsp/otter/otter.nix b/modules/plugins/lsp/otter/otter.nix index 2ccc393b..9529eba5 100644 --- a/modules/plugins/lsp/otter/otter.nix +++ b/modules/plugins/lsp/otter/otter.nix @@ -1,8 +1,12 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkOption mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.types) bool str listOf; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.lsp = { otter-nvim = { diff --git a/modules/plugins/lsp/trouble/trouble.nix b/modules/plugins/lsp/trouble/trouble.nix index 5fa5a3df..fb2ae1be 100644 --- a/modules/plugins/lsp/trouble/trouble.nix +++ b/modules/plugins/lsp/trouble/trouble.nix @@ -1,7 +1,11 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.lsp = { trouble = { diff --git a/modules/plugins/minimap/codewindow/codewindow.nix b/modules/plugins/minimap/codewindow/codewindow.nix index 9ad48c9f..dcadd64d 100644 --- a/modules/plugins/minimap/codewindow/codewindow.nix +++ b/modules/plugins/minimap/codewindow/codewindow.nix @@ -1,7 +1,11 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.minimap.codewindow = { enable = mkEnableOption "codewindow plugin for minimap view"; diff --git a/modules/plugins/notes/todo-comments/todo-comments.nix b/modules/plugins/notes/todo-comments/todo-comments.nix index b5bb76f0..76f92b1b 100644 --- a/modules/plugins/notes/todo-comments/todo-comments.nix +++ b/modules/plugins/notes/todo-comments/todo-comments.nix @@ -1,4 +1,5 @@ { + config, pkgs, lib, ... @@ -6,8 +7,8 @@ inherit (lib.modules) mkRenamedOptionModule; inherit (lib.options) mkOption mkEnableOption; inherit (lib.types) str listOf; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption; + inherit (config.vim.lib) mkMappingOption; in { imports = let renamedSetupOption = oldPath: newPath: diff --git a/modules/plugins/runner/run-nvim/run-nvim.nix b/modules/plugins/runner/run-nvim/run-nvim.nix index dd24e6c3..e0f9fcc3 100644 --- a/modules/plugins/runner/run-nvim/run-nvim.nix +++ b/modules/plugins/runner/run-nvim/run-nvim.nix @@ -1,7 +1,11 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options = { vim.runner.run-nvim = { diff --git a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix index 384899de..4f33ed86 100644 --- a/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix +++ b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix @@ -6,8 +6,8 @@ inherit (lib.options) mkOption mkEnableOption literalExpression literalMD; inherit (lib.types) enum bool either nullOr str int listOf attrs; inherit (lib.generators) mkLuaInline; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption luaInline; + inherit (config.vim.lib) mkMappingOption; in { options.vim.tabline.nvimBufferline = { enable = mkEnableOption "neovim bufferline"; diff --git a/modules/plugins/terminal/toggleterm/toggleterm.nix b/modules/plugins/terminal/toggleterm/toggleterm.nix index d6c25c1b..3e72954e 100644 --- a/modules/plugins/terminal/toggleterm/toggleterm.nix +++ b/modules/plugins/terminal/toggleterm/toggleterm.nix @@ -1,14 +1,15 @@ { + config, pkgs, lib, ... }: let inherit (lib.options) mkOption mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.types) nullOr str enum bool package either int; inherit (lib.modules) mkRenamedOptionModule; inherit (lib.nvim.types) mkPluginSetupOption luaInline; inherit (lib.generators) mkLuaInline; + inherit (config.vim.lib) mkMappingOption; in { imports = [ (mkRenamedOptionModule ["vim" "terminal" "toggleterm" "direction"] ["vim" "terminal" "toggleterm" "setupOpts" "direction"]) diff --git a/modules/plugins/utility/ccc/ccc.nix b/modules/plugins/utility/ccc/ccc.nix index 99c169fb..684fde19 100644 --- a/modules/plugins/utility/ccc/ccc.nix +++ b/modules/plugins/utility/ccc/ccc.nix @@ -1,9 +1,13 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkOption mkEnableOption; inherit (lib.types) anything attrsOf listOf enum; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption luaInline; inherit (lib.generators) mkLuaInline; + inherit (config.vim.lib) mkMappingOption; in { options.vim.utility.ccc = { enable = mkEnableOption "ccc color picker for neovim"; diff --git a/modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix b/modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix index aad51dc8..e878eb5a 100644 --- a/modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix +++ b/modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix @@ -1,6 +1,10 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.gestures.gesture-nvim = { enable = mkEnableOption "gesture-nvim: mouse gestures"; diff --git a/modules/plugins/utility/harpoon/harpoon.nix b/modules/plugins/utility/harpoon/harpoon.nix index 6f5b8d0a..002eee1f 100644 --- a/modules/plugins/utility/harpoon/harpoon.nix +++ b/modules/plugins/utility/harpoon/harpoon.nix @@ -1,9 +1,13 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) bool; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption luaInline; inherit (lib.generators) mkLuaInline; + inherit (config.vim.lib) mkMappingOption; in { options.vim.navigation.harpoon = { mappings = { diff --git a/modules/plugins/utility/motion/hop/hop.nix b/modules/plugins/utility/motion/hop/hop.nix index 19d0318f..11d16413 100644 --- a/modules/plugins/utility/motion/hop/hop.nix +++ b/modules/plugins/utility/motion/hop/hop.nix @@ -1,6 +1,10 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.utility.motion.hop = { mappings = { diff --git a/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix b/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix index beede428..8213068a 100644 --- a/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix +++ b/modules/plugins/utility/outline/aerial-nvim/aerial-nvim.nix @@ -1,7 +1,11 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption; inherit (lib.nvim.types) mkPluginSetupOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.utility.outline.aerial-nvim = { enable = mkEnableOption "Aerial.nvim"; diff --git a/modules/plugins/utility/preview/glow/glow.nix b/modules/plugins/utility/preview/glow/glow.nix index 69f9f93d..62cc1ee5 100644 --- a/modules/plugins/utility/preview/glow/glow.nix +++ b/modules/plugins/utility/preview/glow/glow.nix @@ -1,7 +1,11 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.modules) mkRenamedOptionModule; inherit (lib.options) mkEnableOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { imports = [ (mkRenamedOptionModule ["vim" "languages" "markdown" "glow" "enable"] ["vim" "utility" "preview" "glow" "enable"]) diff --git a/modules/plugins/utility/smart-splits/smart-splits.nix b/modules/plugins/utility/smart-splits/smart-splits.nix index dd5c55a3..1b8c5512 100644 --- a/modules/plugins/utility/smart-splits/smart-splits.nix +++ b/modules/plugins/utility/smart-splits/smart-splits.nix @@ -1,8 +1,12 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkOption; inherit (lib.types) bool; inherit (lib.nvim.types) mkPluginSetupOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.utility.smart-splits = { enable = mkOption { diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix index 3aa75ca6..960d1ee5 100644 --- a/modules/plugins/utility/telescope/telescope.nix +++ b/modules/plugins/utility/telescope/telescope.nix @@ -6,8 +6,8 @@ }: let inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.types) int str listOf float bool either enum submodule attrsOf anything package; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption luaInline; + inherit (config.vim.lib) mkMappingOption; cfg = config.vim.telescope; setupOptions = { diff --git a/modules/plugins/utility/yazi-nvim/yazi-nvim.nix b/modules/plugins/utility/yazi-nvim/yazi-nvim.nix index 9a83a1a8..3f44e48c 100644 --- a/modules/plugins/utility/yazi-nvim/yazi-nvim.nix +++ b/modules/plugins/utility/yazi-nvim/yazi-nvim.nix @@ -1,8 +1,12 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) bool; inherit (lib.nvim.types) mkPluginSetupOption; - inherit (lib.nvim.binds) mkMappingOption; + inherit (config.vim.lib) mkMappingOption; in { options.vim.utility.yazi-nvim = { enable = mkEnableOption '' diff --git a/modules/plugins/visuals/cellular-automaton/cellular-automaton.nix b/modules/plugins/visuals/cellular-automaton/cellular-automaton.nix index 6d432e7b..cad3ffdc 100644 --- a/modules/plugins/visuals/cellular-automaton/cellular-automaton.nix +++ b/modules/plugins/visuals/cellular-automaton/cellular-automaton.nix @@ -1,9 +1,13 @@ -{lib, ...}: let +{ + config, + lib, + ... +}: let inherit (lib.modules) mkRenamedOptionModule; inherit (lib.options) mkOption mkEnableOption; inherit (lib.nvim.types) luaInline; - inherit (lib.nvim.binds) mkMappingOption; inherit (lib.generators) mkLuaInline; + inherit (config.vim.lib) mkMappingOption; in { imports = [ (mkRenamedOptionModule ["vim" "visuals" "cellularAutomaton"] ["vim" "visuals" "cellular-automaton"])