diff --git a/plugins/by-name/dressing/default.nix b/plugins/by-name/dressing/default.nix index 19cf165f..15c3c452 100644 --- a/plugins/by-name/dressing/default.nix +++ b/plugins/by-name/dressing/default.nix @@ -12,7 +12,13 @@ lib.nixvim.plugins.mkNeovimPlugin { settingsOptions = let - intOrRatio = with types; either ints.unsigned (numbers.between 0.0 1.0); + intOrRatio = + with types; + oneOf [ + ints.unsigned + (numbers.between 0.0 1.0) + rawLua + ]; in { input = { diff --git a/plugins/by-name/inc-rename/default.nix b/plugins/by-name/inc-rename/default.nix index 6ec6612a..17e2b9e1 100644 --- a/plugins/by-name/inc-rename/default.nix +++ b/plugins/by-name/inc-rename/default.nix @@ -46,9 +46,11 @@ lib.nixvim.plugins.mkNeovimPlugin { the behavior of command preview). ''; - input_buffer_type = defaultNullOpts.mkNullable (types.enum [ "dressing" ]) null '' - The type of the external input buffer to use. - ''; + input_buffer_type = + defaultNullOpts.mkNullable (with types; either (enum [ "dressing" ]) rawLua) null + '' + The type of the external input buffer to use. + ''; post_hook = defaultNullOpts.mkRaw null '' Callback to run after renaming, receives the result table (from LSP diff --git a/plugins/by-name/lazygit/default.nix b/plugins/by-name/lazygit/default.nix index 01830daa..88b62db5 100644 --- a/plugins/by-name/lazygit/default.nix +++ b/plugins/by-name/lazygit/default.nix @@ -63,8 +63,14 @@ lib.nixvim.plugins.mkVimPlugin { Config file path is evaluated if this value is `1`. ''; - config_file_path = defaultNullOpts.mkNullable (with types; either str (listOf str)) [ - ] "Custom config file path or list of custom config file paths."; + config_file_path = defaultNullOpts.mkNullable ( + with types; + oneOf [ + str + (listOf str) + rawLua + ] + ) [ ] "Custom config file path or list of custom config file paths."; }; settingsExample = { diff --git a/plugins/by-name/notebook-navigator/default.nix b/plugins/by-name/notebook-navigator/default.nix index d9649627..549ba30b 100644 --- a/plugins/by-name/notebook-navigator/default.nix +++ b/plugins/by-name/notebook-navigator/default.nix @@ -105,7 +105,17 @@ lib.nixvim.plugins.mkNeovimPlugin { extraConfig = cfg: { warnings = lib.nixvim.mkWarnings "plugins.notebook-navigator" [ { - when = (cfg.settings.activate_hydra_keys != null) && (!config.plugins.hydra.enable); + when = + ( + !( + cfg ? settings.activate_hydra_keys + && builtins.elem cfg.settings.activate_hydra_keys [ + null + (lib.nixvim.mkRaw "nil") + ] + ) + ) + && (!config.plugins.hydra.enable); message = '' `settings.activate_hydra_keys` has been set to a non-`null` value but `plugins.hydra.enable` is `false`. ''; diff --git a/plugins/lsp/language-servers/tinymist-settings.nix b/plugins/lsp/language-servers/tinymist-settings.nix index 8e318a2a..2435e048 100644 --- a/plugins/lsp/language-servers/tinymist-settings.nix +++ b/plugins/lsp/language-servers/tinymist-settings.nix @@ -2,7 +2,7 @@ # https://github.com/Myriad-Dreamin/tinymist/blob/main/editors/neovim/Configuration.md let - inherit (lib.nixvim) defaultNullOpts mkNullOrOption mkNullOrStr; + inherit (lib.nixvim) defaultNullOpts mkNullOrStr; inherit (lib) types; in { @@ -104,7 +104,7 @@ in ''; completion = { - triggerOnSnippetPlaceholders = mkNullOrOption types.bool '' + triggerOnSnippetPlaceholders = defaultNullOpts.mkBool false '' Whether to trigger completions on arguments (placeholders) of snippets. For example, `box` will be completed to `box(|)`, and server will request the editor (lsp