diff --git a/lib/helpers.nix b/lib/helpers.nix index b91b90f6..06518c19 100644 --- a/lib/helpers.nix +++ b/lib/helpers.nix @@ -5,7 +5,7 @@ in { maintainers = import ./maintainers.nix; - keymaps = import ./keymap-helpers.nix {inherit lib;}; + keymaps = import ./keymap-helpers.nix {inherit lib nixvimOptions nixvimTypes;}; autocmd = import ./autocmd-helpers.nix {inherit lib;}; neovim-plugin = import ./neovim-plugin.nix {inherit lib nixvimOptions;}; vim-plugin = import ./vim-plugin.nix {inherit lib nixvimOptions;}; diff --git a/lib/keymap-helpers.nix b/lib/keymap-helpers.nix index 0dcbca36..f9463391 100644 --- a/lib/keymap-helpers.nix +++ b/lib/keymap-helpers.nix @@ -1,39 +1,41 @@ -{lib, ...}: -with lib; let - helpers = import ../lib/helpers.nix {inherit lib;}; -in rec { +{ + lib, + nixvimOptions, + nixvimTypes, +}: +with lib; rec { # These are the configuration options that change the behavior of each mapping. mapConfigOptions = { silent = - helpers.defaultNullOpts.mkBool false + nixvimOptions.defaultNullOpts.mkBool false "Whether this mapping should be silent. Equivalent to adding to a map."; nowait = - helpers.defaultNullOpts.mkBool false + nixvimOptions.defaultNullOpts.mkBool false "Whether to wait for extra input on ambiguous mappings. Equivalent to adding to a map."; script = - helpers.defaultNullOpts.mkBool false + nixvimOptions.defaultNullOpts.mkBool false "Equivalent to adding