Merge 3860063606 into d6746a7510

docs/manual/configuring/keybinds.md

@@ -1,8 +1,10 @@
 # Custom keymaps {#ch-keymaps}
 
-Some plugin modules provide keymap options for your convenience. If a keymap is
-not provided by such module options, you may easily register your own custom
-keymaps via {option}`vim.keymaps`.
+Some plugin modules provide keymap options for your convenience. These can be
+disabled using {option}`vim.vendoredKeymaps`. It is also possible to disable
+individual keymaps with options by setting them to `null`. If a keymap is not
+provided by a module, you may easily register your own custom keymaps via
+{option}`vim.keymaps`.
 
 ```nix
 {
@@ -22,7 +24,7 @@ keymaps via {option}`vim.keymaps`.
     {
       key = "<leader>k";
       mode = ["n" "x"];
-      
+
       # While `lua` is `true`, `action` is expected to be
       # a valid Lua expression.
       lua = true;

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

docs/manual/release-notes/rl-0.9.md

@@ -195,6 +195,7 @@
     {command}`:healthcheck` doesn't know that.
   - Remove [which-key.nvim] `<leader>o` `+Notes` description which did not
     actually correspond to any keybinds.
+- Allow disabling nvf's vendored keymaps by toggling `vendoredKeymaps`.
 
 [pyrox0](https://github.com/pyrox0):