From bbd1cde31d44cee23e225f476b72143dd208bd07 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 3 Nov 2025 03:01:33 +0100 Subject: [PATCH 1/5] plugins/notebook-navigator: fix warning condition Signed-off-by: saygo-png --- plugins/by-name/notebook-navigator/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/by-name/notebook-navigator/default.nix b/plugins/by-name/notebook-navigator/default.nix index d96496271a..549ba30bec 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`. ''; From 31d40319b0dd756e19bede9a5fb6c8b530b1a984 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Sat, 1 Nov 2025 05:43:09 +0100 Subject: [PATCH 2/5] plugins/lsp/tinymist: fix type in settings declaration Signed-off-by: saygo-png --- plugins/lsp/language-servers/tinymist-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/lsp/language-servers/tinymist-settings.nix b/plugins/lsp/language-servers/tinymist-settings.nix index 8e318a2aa5..2435e048bf 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 From e645873419d983bec54ef7657a732a451fb5cc70 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 3 Nov 2025 03:38:04 +0100 Subject: [PATCH 3/5] plugins/inc-rename: fix type in settings declaration Signed-off-by: saygo-png --- plugins/by-name/inc-rename/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/by-name/inc-rename/default.nix b/plugins/by-name/inc-rename/default.nix index 6ec6612a80..17e2b9e159 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 From fd8847ba4ac9733365b4a85bdcf59586297223aa Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 3 Nov 2025 03:46:27 +0100 Subject: [PATCH 4/5] plugins/dressing: fix type in setting declaration Signed-off-by: saygo-png --- plugins/by-name/dressing/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/by-name/dressing/default.nix b/plugins/by-name/dressing/default.nix index 19cf165f7a..15c3c4528c 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 = { From b0347370ed2f4bddced2fcce127448d8be773149 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 3 Nov 2025 22:48:03 +0100 Subject: [PATCH 5/5] plugins/lazygit: fix type in setting declaration Signed-off-by: saygo-png --- plugins/by-name/lazygit/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/by-name/lazygit/default.nix b/plugins/by-name/lazygit/default.nix index 01830daaa0..88b62db583 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 = {