From 044a9d1ab8d1794b46ba6e295fb971a13d16ca97 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Fri, 31 Oct 2025 19:55:38 +0100 Subject: [PATCH 01/24] plugins/dap-go: remove settings declarations Signed-off-by: saygo-png --- plugins/by-name/dap-go/default.nix | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/plugins/by-name/dap-go/default.nix b/plugins/by-name/dap-go/default.nix index b1281122..df30a5aa 100644 --- a/plugins/by-name/dap-go/default.nix +++ b/plugins/by-name/dap-go/default.nix @@ -2,12 +2,6 @@ lib, ... }: -let - inherit (lib) types; - inherit (lib.nixvim) defaultNullOpts; - - dapHelpers = import ../dap/dapHelpers.nix { inherit lib; }; -in lib.nixvim.plugins.mkNeovimPlugin { name = "dap-go"; package = "nvim-dap-go"; @@ -15,30 +9,6 @@ lib.nixvim.plugins.mkNeovimPlugin { maintainers = [ lib.maintainers.khaneliman ]; - settingsOptions = { - dap_configurations = lib.nixvim.mkNullOrOption (types.listOf dapHelpers.configurationType) '' - Additional dap configurations. - See `:h dap-configuration` for more detail. - ''; - - delve = { - path = defaultNullOpts.mkStr "dlv" "The path to the executable dlv which will be used for debugging."; - - initialize_timeout_sec = defaultNullOpts.mkUnsignedInt 20 "Time to wait for delve to initialize the debug session."; - - port = defaultNullOpts.mkStr "$${port}" '' - A string that defines the port to start delve debugger. - - Defaults to string "$${port}" which instructs dap - to start the process in a random available port. - ''; - - args = lib.nixvim.mkNullOrOption (types.listOf types.str) "Additional args to pass to dlv."; - - build_flags = defaultNullOpts.mkStr "" "Build flags to pass to dlv."; - }; - }; - # Manually supplied to nvim-dap config module callSetup = false; extraConfig = cfg: { From 0dd3843bd6a8960eb4d7aad395e8597b7016166a Mon Sep 17 00:00:00 2001 From: saygo-png Date: Fri, 31 Oct 2025 19:57:58 +0100 Subject: [PATCH 02/24] plugins/flutter-tools: remove most settings declarations Signed-off-by: saygo-png --- .../flutter-tools/settings-options.nix | 246 +----------------- 1 file changed, 1 insertion(+), 245 deletions(-) diff --git a/plugins/by-name/flutter-tools/settings-options.nix b/plugins/by-name/flutter-tools/settings-options.nix index 0fb782e5..56831370 100644 --- a/plugins/by-name/flutter-tools/settings-options.nix +++ b/plugins/by-name/flutter-tools/settings-options.nix @@ -1,65 +1,9 @@ lib: let - inherit (lib) types; - inherit (lib.nixvim) - defaultNullOpts - mkNullOrOption' - mkNullOrOption - literalLua - ; + inherit (lib.nixvim) defaultNullOpts; in { - ui = { - border = defaultNullOpts.mkBorder' { - pluginDefault = "single"; - example = "rounded"; - name = "all floating windows"; - }; - }; - - decorations = { - statusline = { - app_version = defaultNullOpts.mkBool false '' - Set to true to be able use the `flutter_tools_decorations.app_version` in your statusline. - - This will show the current version of the flutter app from the `pubspec.yaml` file. - ''; - - device = defaultNullOpts.mkBool false '' - Set to true to be able use the `flutter_tools_decorations.device` in your statusline. - - This will show the currently running device if an application was started with a specific - device. - ''; - - project_config = defaultNullOpts.mkBool false '' - Set to true to be able use the `flutter_tools_decorations.project_config` in your - statusline. - - This will show the currently selected project configuration. - ''; - }; - }; - debugger = { - enabled = defaultNullOpts.mkBool false '' - Enable `nvim-dap` integration. - ''; - - exception_breakpoints = defaultNullOpts.mkListOf types.anything null '' - If empty, dap will not stop on any exceptions. - Otherwise it will stop on those specified. - - See `|:help dap.set_exception_breakpoints()|` for more information. - ''; - - evaluate_to_string_in_debug_views = defaultNullOpts.mkBool true '' - Whether to call `toString()` on objects in debug views like hovers and the variables list. - - Invoking `toString()` has a performance cost and may introduce side-effects, although users - may expect this functionality. - ''; - register_configurations = defaultNullOpts.mkRaw' { pluginDefault = null; example = '' @@ -77,80 +21,7 @@ in }; }; - flutter_path = defaultNullOpts.mkStr' { - pluginDefault = null; - example = ""; - description = '' - Absolute path to the `flutter` binary. - - This takes priority over the `flutter_lookup_cmd`. - ''; - }; - - flutter_lookup_cmd = defaultNullOpts.mkStr' { - pluginDefault = literalLua '' - function get_default_lookup() - local exepath = fn.exepath("flutter") - local is_snap_installation = exepath and exepath:match("snap") or false - return (path.is_linux and is_snap_installation) and "flutter sdk-path" or nil - end - ''; - example = "dirname $(which flutter)"; - description = '' - The command used to find the directory where flutter is installed. - ''; - }; - - root_patterns = defaultNullOpts.mkListOf types.str [ ".git" "pubspec.yaml" ] '' - Patterns to find the root of your flutter project. - ''; - - fvm = defaultNullOpts.mkBool false '' - Takes priority over path, uses `/.fvm/flutter_sdk` if enabled. - ''; - - widget_guides = { - enabled = defaultNullOpts.mkBool false '' - Whether to enable widget guides. - ''; - }; - - closing_tags = { - highlight = defaultNullOpts.mkStr' { - example = "ErrorMsg"; - pluginDefault = "Comment"; - description = '' - Highlight group for the closing tag. - ''; - }; - - prefix = defaultNullOpts.mkStr' { - pluginDefault = "// "; - example = ">"; - description = '' - Character to use for close tag. - ''; - }; - - priority = defaultNullOpts.mkUnsignedInt 10 '' - Priority of virtual text in current line. - - Consider to configure this when there is a possibility of multiple virtual text items in one - line. - - See `priority` option in `|:help nvim_buf_set_extmark|` for more information. - ''; - - enabled = defaultNullOpts.mkBool true '' - Set to `false` to disable closing tags. - ''; - }; - dev_log = { - enabled = defaultNullOpts.mkBool true '' - Whether to enable `dev_log`. - ''; - filter = defaultNullOpts.mkRaw null '' Optional callback to filter the log. @@ -158,120 +29,5 @@ in The `log_line` is only added to the output if the function returns `true`. ''; - - notify_errors = defaultNullOpts.mkBool false '' - Whether notify the user when there is an error whilst running. - ''; - - open_cmd = defaultNullOpts.mkStr' { - example = "15split"; - pluginDefault = literalLua "('botright %dvnew'):format(math.max(vim.o.columns * 0.4, 50))"; - description = '' - Command to use to open the log buffer. - ''; - }; - - focus_on_open = defaultNullOpts.mkBool true '' - Whether to focus on the newly opened log window. - ''; - }; - - dev_tools = { - autostart = defaultNullOpts.mkBool false '' - Whether to autostart `devtools` server if not detected. - ''; - - auto_open_browser = defaultNullOpts.mkBool false '' - Automatically opens `devtools` in the browser. - ''; - }; - - outline = { - open_cmd = defaultNullOpts.mkStr' { - pluginDefault = literalLua "('botright %dvnew'):format(math.max(vim.o.columns * 0.3, 40))"; - example = "30vnew"; - description = '' - Command to use to open the outline buffer. - ''; - }; - - auto_open = defaultNullOpts.mkBool false '' - If `true` this will open the outline automatically when it is first populated. - ''; - }; - - lsp = { - color = { - enabled = defaultNullOpts.mkBool false '' - Show the derived colors for dart variables. - Set this to `true` to enable color variables highlighting (only supported on - flutter >= 2.10). - ''; - - background = defaultNullOpts.mkBool false '' - Whether to highlight the background. - ''; - - background_color = defaultNullOpts.mkNullable' { - type = with types; either str (attrsOf ints.unsigned); - pluginDefault = null; - example = { - r = 19; - g = 17; - b = 24; - }; - description = '' - Background color. - Required, when background is transparent. - ''; - }; - - foreground = defaultNullOpts.mkBool false '' - Whether to highlight the foreground. - ''; - - virtual_text = defaultNullOpts.mkBool true '' - Whether to show the highlight using virtual text. - ''; - - virtual_text_str = defaultNullOpts.mkStr "■" '' - The virtual text character to highlight. - ''; - }; - - on_attach = mkNullOrOption types.rawLua '' - Provide a custom `on_attach` function. - ''; - - capabilities = mkNullOrOption' { - type = types.rawLua; - example = literalLua '' - function(config) - config.specificThingIDontWant = false - return config - end - ''; - description = '' - Provide a custom value for `capabilities`. - Example: `lsp_status` capabilities. - ''; - }; - - settings = mkNullOrOption' { - type = with types; attrsOf anything; - example = { - showTodos = true; - completeFunctionCalls = true; - analysisExcludedFolders = [ "" ]; - renameFilesWithClasses = "prompt"; - enableSnippets = true; - updateImportsOnRename = true; - }; - description = '' - Settings for the dart language server. - See [here](https://github.com/dart-lang/sdk/blob/master/pkg/analysis_server/tool/lsp_spec/README.md#client-workspace-configuration) - for details on each option. - ''; - }; }; } From 2219f852d0844ceb0f1eb8c5152a92dd054b72a7 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 3 Nov 2025 01:31:14 +0100 Subject: [PATCH 03/24] plugins/ledger: cleanup, remove settings declarations Signed-off-by: saygo-png --- plugins/by-name/ledger/default.nix | 164 +---------------------------- 1 file changed, 2 insertions(+), 162 deletions(-) diff --git a/plugins/by-name/ledger/default.nix b/plugins/by-name/ledger/default.nix index 5fa82a8d..d04630b7 100644 --- a/plugins/by-name/ledger/default.nix +++ b/plugins/by-name/ledger/default.nix @@ -1,17 +1,14 @@ { lib, - helpers, ... }: -with lib; -with lib.nixvim.plugins; -mkVimPlugin { +lib.nixvim.plugins.mkVimPlugin { name = "ledger"; package = "vim-ledger"; globalPrefix = "ledger_"; description = "Filetype detection, syntax highlighting, auto-formatting, auto-completion, and other tools for working with ledger files."; - maintainers = [ maintainers.GaetanLepage ]; + maintainers = [ lib.maintainers.GaetanLepage ]; imports = [ # TODO: added 2025-04-07, remove after 25.05 @@ -23,163 +20,6 @@ mkVimPlugin { dependencies = [ "ledger" ]; - settingsOptions = { - bin = helpers.mkNullOrStr '' - Path to the `ledger` executable. - ''; - - is_hledger = helpers.mkNullOrOption types.bool '' - Whether to use ledger or hledger specific features. - Setting this value is optional and in most coses will be guessed correctly based on `bin`, - but in the event it isn't guessed correctly or you want to use different syntax features - even with your default tooling setup for the other engine this flag can be set to override - the value. - ''; - - extra_options = helpers.defaultNullOpts.mkStr "" '' - Additional default options for the `ledger` executable. - ''; - - accounts_cmd = helpers.mkNullOrStr '' - To use a custom external system command to generate a list of account names for completion, - set the following. - If `bin` is set, this will default to running that command with arguments to parse the - current file using the accounts subcommand (works with ledger or hledger), otherwise it will - parse the postings in the current file itself. - ''; - - descriptions_cmd = helpers.mkNullOrStr '' - To use a custom external system command to generate a list of descriptions for completion, - set the following. - If `bin` is set, this will default to running that command with arguments to parse the - current file using the descriptions subcommand (works with ledger or hledger), otherwise it - will parse the transactions in the current file itself. - ''; - - maxwidth = helpers.defaultNullOpts.mkUnsignedInt 0 '' - Number of columns that will be used to display the foldtext. - Set this when you think that the amount is too far off to the right. - When `maxwidth` is zero, the amount will be displayed at the far right side of the screen. - ''; - - fillstring = helpers.defaultNullOpts.mkStr " " '' - String that will be used to fill the space between account name and amount in the foldtext. - Set this to get some kind of lines or visual aid. - ''; - - detailed_first = helpers.defaultNullOpts.mkFlagInt 1 '' - If you want the account completion to be sorted by level of detail/depth instead of - alphabetical, set this option to `1`. - ''; - - fold_blanks = helpers.defaultNullOpts.mkFlagInt 0 '' - By default vim will fold ledger transactions, leaving surrounding blank lines unfolded. - You can use this option to hide blank lines following a transaction. - - A value of `0` will disable folding of blank lines, `1` will allow folding of a - single blank line between transactions; any larger value will enable folding - unconditionally. - - Note that only lines containing no trailing spaces are considered for folding. - You can take advantage of this to disable this feature on a case-by-case basis. - ''; - - decimal_sep = helpers.defaultNullOpts.mkStr "." '' - Decimal separator. - ''; - - align_last = helpers.defaultNullOpts.mkFlagInt 0 '' - Specify alignment on first or last matching separator. - ''; - - align_at = helpers.defaultNullOpts.mkUnsignedInt 60 '' - Specify at which column decimal separators should be aligned. - ''; - - default_commodity = helpers.defaultNullOpts.mkStr "" '' - Default commodity used by `ledger#align_amount_at_cursor()`. - ''; - - align_commodity = helpers.defaultNullOpts.mkFlagInt 0 '' - Align on the commodity location instead of the amount - ''; - - commodity_before = helpers.defaultNullOpts.mkFlagInt 1 '' - Flag that tells whether the commodity should be prepended or appended to the amount. - ''; - - commodity_sep = helpers.defaultNullOpts.mkStr "" '' - String to be put between the commodity and the amount: - ''; - - commodity_spell = helpers.defaultNullOpts.mkFlagInt 0 '' - Flag that enable the spelling of the amount. - ''; - - date_format = helpers.defaultNullOpts.mkStr "%Y/%m/%d" '' - Format of transaction date. - ''; - - main = helpers.defaultNullOpts.mkStr "%" '' - The file to be used to generate reports. - The default is to use the current file. - ''; - - winpos = helpers.defaultNullOpts.mkStr "B" '' - Position of a report buffer. - - Use `b` for bottom, `t` for top, `l` for left, `r` for right. - Use uppercase letters if you want the window to always occupy the full width or height. - ''; - - qf_register_format = helpers.mkNullOrStr '' - Format of quickfix register reports (see `|:Register|`). - The format is specified using the standard Ledger syntax for `--format`. - ''; - - qf_reconcile_format = helpers.mkNullOrStr '' - Format of the reconcile quickfix window (see `|:Reconcile|`). - The format is specified using the standard Ledger syntax for `--format`. - ''; - - use_location_list = helpers.defaultNullOpts.mkFlagInt 0 '' - Flag that tells whether a location list or a quickfix list should be used: - The default is to use the quickfix window. - Set to `1` to use a location list. - ''; - - qf_vertical = helpers.defaultNullOpts.mkFlagInt 0 '' - Position of the quickfix/location list. - Set to `1` to open the quickfix window in a vertical split. - ''; - - qf_size = helpers.defaultNullOpts.mkUnsignedInt 10 '' - Size of the quickfix window. - - This is the number of lines of a horizontal quickfix window, or the number of columns of a - vertical quickfix window. - ''; - - qf_hide_file = helpers.defaultNullOpts.mkFlagInt 1 '' - Flag to show or hide filenames in the quickfix window: - - Filenames in the quickfix window are hidden by default. Set this to 1 is - you want filenames to be visible. - ''; - - cleared_string = helpers.defaultNullOpts.mkStr "Cleared: " '' - Text of the output of the `|:Balance|` command. - ''; - - pending_string = helpers.defaultNullOpts.mkStr "Cleared or pending: " '' - Text of the output of the `|:Balance|` command. - ''; - - target_string = helpers.defaultNullOpts.mkStr "Difference from target: " '' - Text of the output of the `|:Balance|` command. - ''; - }; - settingsExample = { detailed_first = 1; fold_blanks = 0; From 77511e191555db691c847dd51bb5ac546fc1cac2 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 3 Nov 2025 02:11:26 +0100 Subject: [PATCH 04/24] plugins/cloak: cleanup, remove settings declarations Signed-off-by: saygo-png --- plugins/by-name/cloak/default.nix | 68 +------------------------------ 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/plugins/by-name/cloak/default.nix b/plugins/by-name/cloak/default.nix index 566694a4..15a53d4f 100644 --- a/plugins/by-name/cloak/default.nix +++ b/plugins/by-name/cloak/default.nix @@ -1,79 +1,13 @@ { lib, - helpers, ... }: -with lib; lib.nixvim.plugins.mkNeovimPlugin { name = "cloak"; package = "cloak-nvim"; description = "Cloak allows you to overlay *'s over defined patterns."; - maintainers = [ maintainers.GaetanLepage ]; - - settingsOptions = { - enabled = helpers.defaultNullOpts.mkBool true '' - Whether to enable the plugin. - ''; - - cloak_character = helpers.defaultNullOpts.mkStr "*" '' - Define the cloak character. - ''; - - highlight_group = helpers.defaultNullOpts.mkStr "Comment" '' - The applied highlight group (colors) on the cloaking, see `:h highlight`. - ''; - - cloak_length = helpers.mkNullOrOption types.ints.unsigned '' - Provide a number if you want to hide the true length of the value. - Applies the length of the replacement characters for all matched patterns, defaults to the - length of the matched pattern. - ''; - - try_all_patterns = helpers.defaultNullOpts.mkBool true '' - Whether it should try every pattern to find the best fit or stop after the first. - ''; - - cloak_telescope = helpers.defaultNullOpts.mkBool true '' - Set to true to cloak Telescope preview buffers. - (Required feature not in 0.1.x) - ''; - - patterns = - helpers.defaultNullOpts.mkListOf - (types.submodule { - options = { - file_pattern = helpers.defaultNullOpts.mkNullable (with types; either str (listOf str)) ".env*" '' - One or several patterns to match against. - They should be valid autocommand patterns. - ''; - - cloak_pattern = helpers.defaultNullOpts.mkNullable (with types; either str (listOf str)) "=.+" '' - One or several patterns to cloak. - - Example: `[":.+" "-.+"]` for yaml files. - ''; - - replace = helpers.mkNullOrOption types.anything '' - A function, table or string to generate the replacement. - The actual replacement will contain the `cloak_character` where it doesn't cover - the original text. - If left empty the legacy behavior of keeping the first character is retained. - ''; - }; - }) - [ - { - - file_pattern = ".env*"; - cloak_pattern = "=.+"; - replace = null; - } - ] - '' - List of pattern configurations. - ''; - }; + maintainers = [ lib.maintainers.GaetanLepage ]; settingsExample = { enabled = true; From aa3a1dfb028cd09b8061862f9dd8d859467fc7ed Mon Sep 17 00:00:00 2001 From: saygo-png Date: Fri, 31 Oct 2025 20:44:51 +0100 Subject: [PATCH 05/24] plugins/neocord: cleanup, remove settings declarations Signed-off-by: saygo-png --- plugins/by-name/neocord/default.nix | 151 +--------------------------- 1 file changed, 1 insertion(+), 150 deletions(-) diff --git a/plugins/by-name/neocord/default.nix b/plugins/by-name/neocord/default.nix index 3ac4bc20..0d626db3 100644 --- a/plugins/by-name/neocord/default.nix +++ b/plugins/by-name/neocord/default.nix @@ -1,164 +1,15 @@ { lib, - helpers, ... }: -with lib; lib.nixvim.plugins.mkNeovimPlugin { name = "neocord"; description = "Discord Rich Presence for Neovim (Fork of presence.nvim)."; maintainers = [ ]; - settingsOptions = { - # General options. - auto_update = helpers.defaultNullOpts.mkBool true '' - Update activity based on autocmd events. - If `false`, map or manually execute - `:lua package.loaded.neocord:update()` - ''; - - logo = helpers.defaultNullOpts.mkStr "auto" '' - Update the Logo to the specified option ("auto" or url). - ''; - - logo_tooltip = helpers.mkNullOrStr '' - Sets the logo tooltip - ''; - - main_image = - helpers.defaultNullOpts.mkEnumFirstDefault - [ - "language" - "logo" - ] - '' - Main image display (either "language" or "logo") - ''; - - client_id = helpers.defaultNullOpts.mkStr "1157438221865717891" '' - Use your own Discord application client id. (not recommended) - ''; - - log_level = - helpers.defaultNullOpts.mkEnum - [ - "debug" - "info" - "warn" - "error" - ] - null - '' - Log messages at or above this level. - ''; - - debounce_timeout = helpers.defaultNullOpts.mkInt 10 '' - Number of seconds to debounce events. - (or calls to `:lua package.loaded.neocord:update(, true)`) - ''; - - enable_line_number = helpers.defaultNullOpts.mkBool false '' - Displays the current line number instead of the current project. - ''; - - blacklist = helpers.defaultNullOpts.mkListOf types.str [ ] '' - A list of strings or Lua patterns that disable Rich Presence if the - current file name, path, or workspace matches. - ''; - - buttons = - helpers.defaultNullOpts.mkListOf - ( - with types; - submodule { - options = { - label = helpers.mkNullOrStr ""; - url = helpers.mkNullOrStr ""; - }; - } - ) - [ ] - '' - Button configurations which will always appear in Rich Presence. - Can be a list of attribute sets, each with the following attributes: - `label`: The label of the button. e.g. `"GitHub Profile"`. - `url`: The URL the button leads to. e.g. `"https://github.com/"`. - Can also be a lua function: `function(buffer: string, repo_url: string|nil): table` - ''; - - file_assets = helpers.mkNullOrOption (with types; attrsOf (listOf str)) '' - Custom file asset definitions keyed by file names and extensions. - List elements for each attribute (filetype): - `name`: The name of the asset shown as the title of the file in Discord. - `source`: The source of the asset, either an art asset key or the URL of an image asset. - Example: - ```nix - { - # Use art assets uploaded in Discord application for the configured client id - js = [ "JavaScript" "javascript" ]; - ts = [ "TypeScript" "typescript" ]; - # Use image URLs - rs = [ "Rust" "https://www.rust-lang.org/logos/rust-logo-512x512.png" ]; - go = [ "Go" "https://go.dev/blog/go-brand/Go-Logo/PNG/Go-Logo_Aqua.png" ]; - }; - ``` - ''; - - show_time = helpers.defaultNullOpts.mkBool true "Show the timer."; - - global_timer = helpers.defaultNullOpts.mkBool false "if set true, timer won't update when any event are triggered."; - - # Rich presence text options. - editing_text = helpers.defaultNullOpts.mkStr "Editing %s" '' - String rendered when an editable file is loaded in the buffer. - Can also be a lua function: - `function(filename: string): string` - ''; - - file_explorer_text = helpers.defaultNullOpts.mkStr "Browsing %s" '' - String rendered when browsing a file explorer. - Can also be a lua function: - `function(file_explorer_name: string): string` - ''; - - git_commit_text = helpers.defaultNullOpts.mkStr "Committing changes" '' - String rendered when committing changes in git. - Can also be a lua function: - `function(filename: string): string` - ''; - - plugin_manager_text = helpers.defaultNullOpts.mkStr "Managing plugins" '' - String rendered when managing plugins. - Can also be a lua function: - `function(plugin_manager_name: string): string` - ''; - - reading_text = helpers.defaultNullOpts.mkStr "Reading %s" '' - String rendered when a read-only/unmodifiable file is loaded into the buffer. - Can also be a lua function: - `function(filename: string): string` - ''; - - workspace_text = helpers.defaultNullOpts.mkStr "Working on %s" '' - String rendered when in a git repository. - Can also be a lua function: - `function(project_name: string|nil, filename: string): string` - ''; - - line_number_text = helpers.defaultNullOpts.mkStr "Line %s out of %s" '' - String rendered when `enableLineNumber` is set to `true` to display the current line number. - Can also be a lua function: - `function(line_number: number, line_count: number): string` - ''; - - terminal_text = helpers.defaultNullOpts.mkStr "Using Terminal" '' - Format string rendered when in terminal mode. - ''; - }; - settingsExample = { - #General options + # General options auto_update = true; logo = "auto"; logo_tooltip = null; From 9c2c9a1b35b6517bb1b0065ebafd40b4b14759f8 Mon Sep 17 00:00:00 2001 From: Ulises Britos <45952970+repparw@users.noreply.github.com> Date: Tue, 4 Nov 2025 18:21:39 -0300 Subject: [PATCH 06/24] plugins/lspkind: default cmp.enable option to plugins.cmp.enable --- plugins/by-name/lspkind/default.nix | 3 ++- tests/test-sources/plugins/by-name/lspkind/default.nix | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/plugins/by-name/lspkind/default.nix b/plugins/by-name/lspkind/default.nix index 82898e27..8455f6e3 100644 --- a/plugins/by-name/lspkind/default.nix +++ b/plugins/by-name/lspkind/default.nix @@ -23,7 +23,8 @@ lib.nixvim.plugins.mkNeovimPlugin { cmp = { enable = lib.mkOption { type = types.bool; - default = true; + default = config.plugins.cmp.enable; + defaultText = lib.literalExpression "config.plugins.cmp.enable"; description = "Integrate with nvim-cmp"; }; diff --git a/tests/test-sources/plugins/by-name/lspkind/default.nix b/tests/test-sources/plugins/by-name/lspkind/default.nix index 8f6c28a1..1cbf5282 100644 --- a/tests/test-sources/plugins/by-name/lspkind/default.nix +++ b/tests/test-sources/plugins/by-name/lspkind/default.nix @@ -1,9 +1,6 @@ { empty = { - plugins.lspkind = { - enable = true; - cmp.enable = false; - }; + plugins.lspkind.enable = true; }; example = { @@ -25,10 +22,6 @@ preset = "codicons"; symbol_map = null; }; - cmp = { - enable = false; - after = null; - }; }; }; } From 79d53a50e2ef7482b565abfd6e9e2db9c3c62cd3 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 27 Oct 2025 18:36:32 +0100 Subject: [PATCH 07/24] tests: use `__empty` and `__raw` Signed-off-by: saygo-png --- .../by-name/actions-preview/default.nix | 4 +-- .../plugins/by-name/aerial/default.nix | 14 ++++---- .../plugins/by-name/aider/default.nix | 2 +- .../plugins/by-name/airline/default.nix | 6 ++-- .../plugins/by-name/auto-save/default.nix | 2 +- .../plugins/by-name/auto-session/default.nix | 8 ++--- .../plugins/by-name/avante/default.nix | 2 +- .../plugins/by-name/barbar/default.nix | 18 +++++----- .../plugins/by-name/blame/default.nix | 4 +-- .../plugins/by-name/blink-cmp/default.nix | 22 ++++++------ .../plugins/by-name/bufferline/default.nix | 18 +++++----- .../plugins/by-name/ccc/default.nix | 4 +-- .../plugins/by-name/chadtree/default.nix | 4 +-- .../plugins/by-name/chatgpt/default.nix | 6 ++-- .../plugins/by-name/cloak/default.nix | 4 +-- .../plugins/by-name/cmake-tools/default.nix | 8 ++--- .../plugins/by-name/cmp-tabnine/default.nix | 2 +- .../plugins/by-name/codecompanion/default.nix | 2 +- .../plugins/by-name/codesnap/default.nix | 4 +-- .../plugins/by-name/colorizer/default.nix | 4 +-- .../plugins/by-name/comment/default.nix | 6 ++-- .../plugins/by-name/conform-nvim/default.nix | 4 +-- .../plugins/by-name/copilot-chat/default.nix | 14 ++++---- .../plugins/by-name/cord/default.nix | 34 +++++++++---------- .../plugins/by-name/cornelis/default.nix | 2 +- .../plugins/by-name/coverage/default.nix | 2 +- .../plugins/by-name/cutlass/default.nix | 4 +-- .../plugins/by-name/dap-go/default.nix | 2 +- .../plugins/by-name/dap-ui/default.nix | 2 +- .../plugins/by-name/dap-view/default.nix | 8 ++--- .../plugins/by-name/dashboard/default.nix | 8 ++--- .../plugins/by-name/dbee/default.nix | 22 ++++++------ .../plugins/by-name/devdocs/default.nix | 2 +- .../plugins/by-name/diagram/default.nix | 26 +++++++------- .../plugins/by-name/diffview/default.nix | 8 ++--- .../plugins/by-name/distant/default.nix | 16 ++++----- .../plugins/by-name/dressing/default.nix | 20 +++++------ .../plugins/by-name/easy-dotnet/default.nix | 2 +- .../plugins/by-name/edgy/default.nix | 16 ++++----- .../plugins/by-name/emmet/default.nix | 6 ++-- .../plugins/by-name/eyeliner/default.nix | 4 +-- .../plugins/by-name/faster/default.nix | 2 +- .../plugins/by-name/fidget/default.nix | 2 +- .../plugins/by-name/flash/default.nix | 8 ++--- .../plugins/by-name/flit/default.nix | 2 +- .../plugins/by-name/floaterm/default.nix | 2 +- .../plugins/by-name/flutter-tools/default.nix | 16 ++++----- .../plugins/by-name/fugit2/default.nix | 4 +-- .../plugins/by-name/git-conflict/default.nix | 2 +- .../plugins/by-name/gitblame/default.nix | 6 ++-- .../plugins/by-name/gitlab/default.nix | 2 +- .../plugins/by-name/gitlinker/default.nix | 2 +- .../plugins/by-name/gitmessenger/default.nix | 6 ++-- .../plugins/by-name/gitsigns/default.nix | 4 +-- .../plugins/by-name/glance/default.nix | 2 +- .../plugins/by-name/goto-preview/default.nix | 8 ++--- .../plugins/by-name/gx/default.nix | 6 ++-- .../plugins/by-name/helpview/default.nix | 10 +++--- .../by-name/highlight-colors/default.nix | 6 ++-- .../plugins/by-name/hlchunk/default.nix | 2 +- .../plugins/by-name/hop/default.nix | 8 ++--- .../plugins/by-name/hydra/default.nix | 14 ++++---- .../plugins/by-name/illuminate/default.nix | 14 ++++---- .../plugins/by-name/image/default.nix | 4 +-- .../plugins/by-name/inc-rename/default.nix | 4 +-- .../by-name/indent-blankline/default.nix | 14 ++++---- .../plugins/by-name/iron/default.nix | 28 +++++++-------- .../plugins/by-name/jdtls/default.nix | 4 +-- .../plugins/by-name/jupytext/default.nix | 6 ++-- .../plugins/by-name/kulala/default.nix | 6 ++-- .../plugins/by-name/lazygit/default.nix | 2 +- .../plugins/by-name/lean/default.nix | 6 ++-- .../plugins/by-name/ledger/default.nix | 12 +++---- .../plugins/by-name/leetcode/default.nix | 6 ++-- .../plugins/by-name/lensline/default.nix | 3 +- .../plugins/by-name/lightline/default.nix | 4 +-- .../by-name/lilypond-suite/default.nix | 18 +++++----- .../plugins/by-name/lir/default.nix | 6 ++-- .../plugins/by-name/llm/default.nix | 12 +++---- .../plugins/by-name/lsp-signature/default.nix | 14 ++++---- .../plugins/by-name/lsp-status/default.nix | 2 +- .../plugins/by-name/lspkind/default.nix | 2 +- .../plugins/by-name/lspsaga/default.nix | 4 +-- .../by-name/markdown-preview/default.nix | 14 ++++---- .../plugins/by-name/markview/default.nix | 12 +++---- .../plugins/by-name/minuet/default.nix | 30 ++++++++-------- .../plugins/by-name/mkdnflow/default.nix | 4 +-- .../plugins/by-name/modicator/default.nix | 2 +- .../plugins/by-name/molten/default.nix | 4 +-- .../plugins/by-name/multicursors/default.nix | 8 ++--- .../plugins/by-name/neo-tree/default.nix | 20 +++++------ .../plugins/by-name/neoclip/default.nix | 18 +++++----- .../plugins/by-name/neocord/default.nix | 14 ++++---- .../plugins/by-name/neogit/default.nix | 18 +++++----- .../plugins/by-name/neorg/default.nix | 4 +-- .../plugins/by-name/neoscroll/default.nix | 6 ++-- .../plugins/by-name/neotest/dart.nix | 2 +- .../plugins/by-name/neotest/default.nix | 10 +++--- .../plugins/by-name/neotest/foundry.nix | 4 +-- .../plugins/by-name/neotest/gtest.nix | 4 +-- .../plugins/by-name/neotest/phpunit.nix | 2 +- .../plugins/by-name/no-neck-pain/default.nix | 2 +- .../plugins/by-name/noice/default.nix | 24 ++++++------- .../plugins/by-name/none-ls/default.nix | 19 ++++++----- .../by-name/notebook-navigator/default.nix | 4 +-- .../plugins/by-name/notify/default.nix | 8 ++--- .../by-name/nvim-lightbulb/default.nix | 8 ++--- .../plugins/by-name/nvim-snippets/default.nix | 4 +-- .../plugins/by-name/nvim-tree/default.nix | 16 ++++----- .../plugins/by-name/nvim-ufo/default.nix | 6 ++-- .../plugins/by-name/obsidian/default.nix | 6 ++-- .../plugins/by-name/octo/default.nix | 4 +-- .../plugins/by-name/oil/default.nix | 10 +++--- .../plugins/by-name/opencode/default.nix | 2 +- .../plugins/by-name/overseer/default.nix | 18 +++++----- .../plugins/by-name/papis/default.nix | 2 +- .../plugins/by-name/parrot/default.nix | 2 +- .../plugins/by-name/pckr/default.nix | 2 +- .../plugins/by-name/persisted/default.nix | 4 +-- .../plugins/by-name/presence/default.nix | 8 ++--- .../plugins/by-name/project-nvim/default.nix | 4 +-- .../plugins/by-name/projections/default.nix | 10 +++--- .../plugins/by-name/qmk/default.nix | 2 +- .../plugins/by-name/quarto/default.nix | 4 +-- .../plugins/by-name/refactoring/default.nix | 6 ++-- .../plugins/by-name/remote-nvim/default.nix | 12 +++---- .../by-name/render-markdown/default.nix | 2 +- .../plugins/by-name/rest/default.nix | 2 +- .../plugins/by-name/roslyn/default.nix | 4 +-- .../plugins/by-name/rustaceanvim/default.nix | 12 +++---- .../plugins/by-name/scrollview/default.nix | 26 +++++++------- .../plugins/by-name/sg/default.nix | 4 +-- .../plugins/by-name/sidekick/default.nix | 6 ++-- .../plugins/by-name/smartcolumn/default.nix | 2 +- .../plugins/by-name/smear-cursor/default.nix | 6 ++-- .../plugins/by-name/sniprun/default.nix | 8 ++--- .../plugins/by-name/specs/default.nix | 4 +-- .../plugins/by-name/spectre/default.nix | 6 ++-- .../plugins/by-name/startify/default.nix | 2 +- .../plugins/by-name/startup/default.nix | 2 +- .../plugins/by-name/statuscol/default.nix | 4 +-- .../plugins/by-name/supermaven/default.nix | 6 ++-- .../by-name/tailwind-tools/default.nix | 8 ++--- .../by-name/telescope/advanced-git-search.nix | 6 ++-- .../by-name/telescope/file-browser.nix | 2 +- .../plugins/by-name/telescope/frecency.nix | 6 ++-- .../by-name/telescope/live-grep-args.nix | 2 +- .../plugins/by-name/telescope/manix.nix | 2 +- .../plugins/by-name/telescope/project.nix | 2 +- .../plugins/by-name/timerly/default.nix | 4 +-- .../tiny-devicons-auto-colors/default.nix | 4 +-- .../tiny-inline-diagnostic/default.nix | 6 ++-- .../plugins/by-name/tinygit/default.nix | 4 +-- .../plugins/by-name/todo-comments/default.nix | 2 +- .../plugins/by-name/toggleterm/default.nix | 28 +++++++-------- .../plugins/by-name/transparent/default.nix | 4 +-- .../by-name/treesitter-context/default.nix | 4 +-- .../treesitter-textobjects/default.nix | 8 ++--- .../plugins/by-name/treesitter/default.nix | 8 ++--- .../plugins/by-name/treesj/default.nix | 2 +- .../plugins/by-name/trim/default.nix | 4 +-- .../plugins/by-name/trouble/default.nix | 2 +- .../plugins/by-name/ts-autotag/default.nix | 2 +- .../plugins/by-name/twilight/default.nix | 2 +- .../by-name/typescript-tools/default.nix | 10 +++--- .../plugins/by-name/typst-preview/default.nix | 4 +-- .../plugins/by-name/venv-selector/default.nix | 10 +++--- .../plugins/by-name/vim-slime/default.nix | 2 +- .../plugins/by-name/vimade/default.nix | 5 ++- .../plugins/by-name/vimux/default.nix | 2 +- .../plugins/by-name/vimwiki/default.nix | 2 +- .../plugins/by-name/visual-multi/default.nix | 17 ++++++---- .../by-name/visual-whitespace/default.nix | 4 +-- .../plugins/by-name/which-key/default.nix | 12 +++---- .../plugins/by-name/whichpy/default.nix | 2 +- .../plugins/by-name/windsurf-nvim/default.nix | 16 ++++----- .../plugins/by-name/wtf/default.nix | 6 ++-- .../plugins/by-name/yanky/default.nix | 6 ++-- .../plugins/by-name/yazi/default.nix | 4 +-- .../plugins/by-name/zen-mode/default.nix | 2 +- tests/test-sources/plugins/cmp/default.nix | 2 +- .../test-sources/plugins/colorschemes/ayu.nix | 2 ++ .../plugins/colorschemes/catppuccin.nix | 31 +++++++++-------- .../plugins/colorschemes/cyberdream.nix | 4 +-- .../plugins/colorschemes/everforest.nix | 2 +- .../plugins/colorschemes/github-theme.nix | 10 +++--- .../plugins/colorschemes/gruvbox-baby.nix | 4 +-- .../colorschemes/gruvbox-material-nvim.nix | 8 ++--- .../plugins/colorschemes/kanagawa-paper.nix | 6 ++-- .../plugins/colorschemes/kanagawa.nix | 4 +-- .../plugins/colorschemes/modus.nix | 4 +-- .../plugins/colorschemes/nightfox.nix | 6 ++-- .../plugins/colorschemes/onedark.nix | 6 ++-- .../plugins/colorschemes/palette.nix | 6 ++-- .../plugins/colorschemes/poimandres.nix | 2 +- .../plugins/colorschemes/solazized-osaka.nix | 4 +-- .../plugins/colorschemes/tokyonight.nix | 4 +-- .../plugins/lsp/language-servers/lua-ls.nix | 30 ++++++++-------- .../plugins/lsp/language-servers/pylsp.nix | 2 ++ .../plugins/lsp/language-servers/tinymist.nix | 8 ++--- 200 files changed, 733 insertions(+), 718 deletions(-) diff --git a/tests/test-sources/plugins/by-name/actions-preview/default.nix b/tests/test-sources/plugins/by-name/actions-preview/default.nix index 1d03da5f..4c843850 100644 --- a/tests/test-sources/plugins/by-name/actions-preview/default.nix +++ b/tests/test-sources/plugins/by-name/actions-preview/default.nix @@ -16,7 +16,7 @@ diff = { ctxlen = 3; }; - highlight_command = [ ]; + highlight_command.__empty = { }; backend = [ "telescope" "minipick" @@ -35,7 +35,7 @@ ''; nui = { dir = "col"; - keymap = null; + keymap.__raw = "nil"; layout = { position = "50%"; size = { diff --git a/tests/test-sources/plugins/by-name/aerial/default.nix b/tests/test-sources/plugins/by-name/aerial/default.nix index 55aec696..32f7321a 100644 --- a/tests/test-sources/plugins/by-name/aerial/default.nix +++ b/tests/test-sources/plugins/by-name/aerial/default.nix @@ -20,16 +20,16 @@ 40 0.2 ]; - width = null; + width.__raw = "nil"; min_width = 10; - win_opts = { }; + win_opts.__empty = { }; default_direction = "prefer_right"; placement = "window"; resize_to_content = true; preserve_equality = false; }; attach_mode = "window"; - close_automatic_events = [ ]; + close_automatic_events.__empty = { }; keymaps = { "?" = "actions.show_help"; "g?" = "actions.show_help"; @@ -82,11 +82,11 @@ highlight_on_hover = false; highlight_on_jump = 300; autojump = false; - icons = [ ]; + icons.__empty = { }; ignore = { unlisted_buffers = false; diff_windows = true; - filetypes = [ ]; + filetypes.__empty = { }; buftypes = "special"; wintypes = "special"; }; @@ -126,7 +126,7 @@ border = "rounded"; relative = "cursor"; max_height = 0.9; - height = null; + height.__raw = "nil"; min_height = [ 8 0.1 @@ -171,7 +171,7 @@ diagnostics_trigger_update = false; update_when_errors = true; update_delay = 300; - priority = { }; + priority.__empty = { }; }; treesitter = { update_delay = 300; diff --git a/tests/test-sources/plugins/by-name/aider/default.nix b/tests/test-sources/plugins/by-name/aider/default.nix index 5a9b30b8..4471fa8d 100644 --- a/tests/test-sources/plugins/by-name/aider/default.nix +++ b/tests/test-sources/plugins/by-name/aider/default.nix @@ -29,7 +29,7 @@ default_bindings = false; debug = true; vim = true; - ignore_buffers = [ ]; + ignore_buffers.__empty = { }; border = { style = [ "╭" diff --git a/tests/test-sources/plugins/by-name/airline/default.nix b/tests/test-sources/plugins/by-name/airline/default.nix index cde77d4e..f25b83ed 100644 --- a/tests/test-sources/plugins/by-name/airline/default.nix +++ b/tests/test-sources/plugins/by-name/airline/default.nix @@ -26,7 +26,7 @@ inactive_collapse = 1; inactive_alt_sep = 1; theme = "dark"; - theme_patch_func = null; + theme_patch_func.__raw = "nil"; powerline_fonts = 0; symbols_ascii = 0; mode_map = { @@ -47,8 +47,8 @@ v = "V"; V = "V"; }; - exclude_filenames = [ ]; - exclude_filetypes = [ ]; + exclude_filenames.__empty = { }; + exclude_filetypes.__empty = { }; filetype_overrides = { coc-explorer = [ "CoC Explorer" diff --git a/tests/test-sources/plugins/by-name/auto-save/default.nix b/tests/test-sources/plugins/by-name/auto-save/default.nix index ab67d3d6..0ff39923 100644 --- a/tests/test-sources/plugins/by-name/auto-save/default.nix +++ b/tests/test-sources/plugins/by-name/auto-save/default.nix @@ -42,7 +42,7 @@ ]; cancel_deferred_save = [ "InsertEnter" ]; }; - condition = null; + condition.__raw = "nil"; write_all_buffers = false; noautocmd = false; lockmarks = false; diff --git a/tests/test-sources/plugins/by-name/auto-session/default.nix b/tests/test-sources/plugins/by-name/auto-session/default.nix index a1c23523..224dc4c9 100644 --- a/tests/test-sources/plugins/by-name/auto-session/default.nix +++ b/tests/test-sources/plugins/by-name/auto-session/default.nix @@ -13,12 +13,12 @@ auto_save = true; auto_restore = true; auto_create = true; - suppressed_dirs = null; - allowed_dirs = null; + suppressed_dirs.__raw = "nil"; + allowed_dirs.__raw = "nil"; auto_restore_last_session = false; use_git_branch = false; lazy_support = true; - bypass_save_filetypes = null; + bypass_save_filetypes.__raw = "nil"; close_unsupported_windows = true; args_allow_single_directory = true; args_allow_files_auto_save = false; @@ -27,7 +27,7 @@ log_level = "error"; session_lens = { load_on_setup = true; - theme_conf = { }; + theme_conf.__empty = { }; previewer = false; mappings = { delete_session = { diff --git a/tests/test-sources/plugins/by-name/avante/default.nix b/tests/test-sources/plugins/by-name/avante/default.nix index d87e60d8..46837d03 100644 --- a/tests/test-sources/plugins/by-name/avante/default.nix +++ b/tests/test-sources/plugins/by-name/avante/default.nix @@ -28,7 +28,7 @@ copilot = { endpoint = "https://api.githubcopilot.com"; model = "gpt-4o-2024-05-13"; - proxy = null; + proxy.__raw = "nil"; allow_insecure = false; timeout = 30000; extra_request_body = { diff --git a/tests/test-sources/plugins/by-name/barbar/default.nix b/tests/test-sources/plugins/by-name/barbar/default.nix index 2c13d93f..6f1252ec 100644 --- a/tests/test-sources/plugins/by-name/barbar/default.nix +++ b/tests/test-sources/plugins/by-name/barbar/default.nix @@ -30,8 +30,8 @@ animation = true; auto_hide = -1; clickable = true; - exclude_ft = [ ]; - exclude_name = [ ]; + exclude_ft.__empty = { }; + exclude_name.__empty = { }; focus_on_close = "left"; hide = { alternate = false; @@ -94,10 +94,10 @@ filename = false; separator.right = " "; }; - alternate = { }; - current = { }; - inactive = { }; - visible = { }; + alternate.__empty = { }; + current.__empty = { }; + inactive.__empty = { }; + visible.__empty = { }; preset = "default"; }; insert_at_start = false; @@ -107,9 +107,9 @@ maximum_length = 30; minimum_length = 0; minimum_padding = 1; - no_name_title = null; + no_name_title.__raw = "nil"; semantic_letters = true; - sidebar_filetypes = { }; + sidebar_filetypes.__empty = { }; tabpages = true; }; }; @@ -219,7 +219,7 @@ }; }; letters = "asdfjkl;ghnmxcvbziowerutyqpASDFJKLGHNMXCVBZIOWERUTYQP"; - no_name_title = null; + no_name_title.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/blame/default.nix b/tests/test-sources/plugins/by-name/blame/default.nix index 6840e317..3a56761b 100644 --- a/tests/test-sources/plugins/by-name/blame/default.nix +++ b/tests/test-sources/plugins/by-name/blame/default.nix @@ -18,8 +18,8 @@ focus_blame = true; merge_consecutive = false; max_summary_width = 30; - colors = null; # won't output literal nil - blame_options = null; # won't output literal nil + colors.__raw = "nil"; + blame_options.__raw = "nil"; format_fn.__raw = "require('blame.formats.default_formats').commit_date_author_fn"; commit_detail_view = "vsplit"; mappings = { diff --git a/tests/test-sources/plugins/by-name/blink-cmp/default.nix b/tests/test-sources/plugins/by-name/blink-cmp/default.nix index 985616aa..65dfa0c1 100644 --- a/tests/test-sources/plugins/by-name/blink-cmp/default.nix +++ b/tests/test-sources/plugins/by-name/blink-cmp/default.nix @@ -59,9 +59,9 @@ "(" ")" ]; - override_brackets_for_filetypes = { }; - force_allow_filetypes = [ ]; - blocked_filetypes = [ ]; + override_brackets_for_filetypes.__empty = { }; + force_allow_filetypes.__empty = { }; + blocked_filetypes.__empty = { }; kind_resolution = { enabled = true; blocked_filetypes = [ @@ -112,7 +112,7 @@ align_to = "label"; padding = 1; gap = 1; - treesitter = { }; + treesitter.__empty = { }; columns = [ [ "kind_icon" ] { @@ -232,9 +232,9 @@ prebuilt_binaries = { download = true; ignore_version_mismatch = false; - force_version = null; - force_system_triple = null; - extra_curl_args = [ ]; + force_version.__raw = "nil"; + force_system_triple.__raw = "nil"; + extra_curl_args.__empty = { }; }; }; sources = { @@ -244,7 +244,7 @@ "snippets" "buffer" ]; - per_filetype = { }; + per_filetype.__empty = { }; cmdline.__raw = '' function() local type = vim.fn.getcmdtype() @@ -310,8 +310,8 @@ enabled = false; trigger = { enabled = true; - blocked_trigger_characters = [ ]; - blocked_retrigger_characters = [ ]; + blocked_trigger_characters.__empty = { }; + blocked_retrigger_characters.__empty = { }; show_on_insert_on_trigger_character = true; }; window = { @@ -387,6 +387,8 @@ ''; }; }; + + # FIXME: This should be __empty but this config is out of date so it throws cmdline = [ ]; }; completion = { diff --git a/tests/test-sources/plugins/by-name/bufferline/default.nix b/tests/test-sources/plugins/by-name/bufferline/default.nix index 2f2a1ad4..a9fc6c34 100644 --- a/tests/test-sources/plugins/by-name/bufferline/default.nix +++ b/tests/test-sources/plugins/by-name/bufferline/default.nix @@ -74,7 +74,7 @@ close_command = "bdelete! %d"; left_mouse_command = "buffer %d"; right_mouse_command = "bdelete! %d"; - middle_mouse_command = null; + middle_mouse_command.__raw = "nil"; indicator = { icon = "▎"; style = "icon"; @@ -82,14 +82,14 @@ left_trunc_marker = ""; right_trunc_marker = ""; separator_style = "thin"; - name_formatter = null; + name_formatter.__raw = "nil"; truncate_names = true; tab_size = 18; max_name_length = 18; color_icons = true; show_buffer_icons = true; show_buffer_close_icons = true; - get_element_icon = null; + get_element_icon.__raw = "nil"; show_close_icon = true; show_tab_indicators = true; show_duplicate_prefix = true; @@ -102,27 +102,27 @@ max_prefix_length = 15; sort_by = "id"; diagnostics = false; - diagnostics_indicator = null; + diagnostics_indicator.__raw = "nil"; diagnostics_update_in_insert = true; diagnostics_update_on_event = true; - offsets = null; + offsets.__raw = "nil"; groups = { - items = [ ]; + items.__empty = { }; options = { toggle_hidden_on_enter = true; }; }; hover = { enabled = false; - reveal = [ ]; + reveal.__empty = { }; delay = 200; }; debug = { logging = false; }; - custom_filter = null; + custom_filter.__raw = "nil"; }; - highlights = { }; + highlights.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/ccc/default.nix b/tests/test-sources/plugins/by-name/ccc/default.nix index 9994adcf..26079cac 100644 --- a/tests/test-sources/plugins/by-name/ccc/default.nix +++ b/tests/test-sources/plugins/by-name/ccc/default.nix @@ -33,8 +33,8 @@ lsp = true; highlighter = { auto_enable = false; - filetypes = [ ]; - excludes = [ ]; + filetypes.__empty = { }; + excludes.__empty = { }; lsp = true; update_insert = true; }; diff --git a/tests/test-sources/plugins/by-name/chadtree/default.nix b/tests/test-sources/plugins/by-name/chadtree/default.nix index 2521f577..bb3dbb24 100644 --- a/tests/test-sources/plugins/by-name/chadtree/default.nix +++ b/tests/test-sources/plugins/by-name/chadtree/default.nix @@ -52,8 +52,8 @@ "thumbs.db" ".git" ]; - name_glob = [ ]; - path_glob = [ ]; + name_glob.__empty = { }; + path_glob.__empty = { }; }; view = { open_direction = "left"; diff --git a/tests/test-sources/plugins/by-name/chatgpt/default.nix b/tests/test-sources/plugins/by-name/chatgpt/default.nix index 8094fa02..77823ad2 100644 --- a/tests/test-sources/plugins/by-name/chatgpt/default.nix +++ b/tests/test-sources/plugins/by-name/chatgpt/default.nix @@ -11,9 +11,9 @@ enable = true; settings = { - api_key_cmd = null; + api_key_cmd.__raw = "nil"; yank_register = "+"; - extra_curl_params = [ ]; + extra_curl_params.__empty = { }; show_line_numbers = true; edit_with_instructions = { diff = false; @@ -182,7 +182,7 @@ n = 1; }; use_openai_functions_for_edits = false; - actions_paths = [ ]; + actions_paths.__empty = { }; show_quickfixes_cmd = "Trouble quickfix"; predefined_chat_gpt_prompts = "https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv"; highlights = { diff --git a/tests/test-sources/plugins/by-name/cloak/default.nix b/tests/test-sources/plugins/by-name/cloak/default.nix index 73a2833b..ea95a70f 100644 --- a/tests/test-sources/plugins/by-name/cloak/default.nix +++ b/tests/test-sources/plugins/by-name/cloak/default.nix @@ -11,14 +11,14 @@ enabled = true; cloak_character = "*"; highlight_group = "Comment"; - cloak_length = null; + cloak_length.__raw = "nil"; try_all_patterns = true; cloak_telescope = true; patterns = [ { file_pattern = ".env*"; cloak_pattern = "=.+"; - replace = null; + replace.__raw = "nil"; } ]; }; diff --git a/tests/test-sources/plugins/by-name/cmake-tools/default.nix b/tests/test-sources/plugins/by-name/cmake-tools/default.nix index face60bf..07268dc9 100644 --- a/tests/test-sources/plugins/by-name/cmake-tools/default.nix +++ b/tests/test-sources/plugins/by-name/cmake-tools/default.nix @@ -14,11 +14,11 @@ cmake_generate_options = { "-DCMAKE_EXPORT_COMPILE_COMMANDS" = 1; }; - cmake_build_options = { }; + cmake_build_options.__empty = { }; cmake_build_directory = "out/\${variant:buildType}"; cmake_soft_link_compile_commands = true; cmake_compile_commands_from_lsp = false; - cmake_kits_path = null; + cmake_kits_path.__raw = "nil"; cmake_variants_message = { short = { @@ -41,7 +41,7 @@ cmake_executor = { name = "quickfix"; - opts = { }; + opts.__empty = { }; default_opts = { quickfix = { show = "always"; @@ -84,7 +84,7 @@ cmake_runner = { name = "terminal"; - opts = { }; + opts.__empty = { }; default_opts = { quickfix = { show = "always"; diff --git a/tests/test-sources/plugins/by-name/cmp-tabnine/default.nix b/tests/test-sources/plugins/by-name/cmp-tabnine/default.nix index 3153f457..4e91d76d 100644 --- a/tests/test-sources/plugins/by-name/cmp-tabnine/default.nix +++ b/tests/test-sources/plugins/by-name/cmp-tabnine/default.nix @@ -18,7 +18,7 @@ sort = true; run_on_every_keystroke = true; snippet_placeholder = ".."; - ignored_file_types = { }; + ignored_file_types.__empty = { }; min_percent = 0; }; }; diff --git a/tests/test-sources/plugins/by-name/codecompanion/default.nix b/tests/test-sources/plugins/by-name/codecompanion/default.nix index 1c285adb..cf41d323 100644 --- a/tests/test-sources/plugins/by-name/codecompanion/default.nix +++ b/tests/test-sources/plugins/by-name/codecompanion/default.nix @@ -21,7 +21,7 @@ }; opts = { allow_insecure = false; - proxy = null; + proxy.__raw = "nil"; }; }; strategies = { diff --git a/tests/test-sources/plugins/by-name/codesnap/default.nix b/tests/test-sources/plugins/by-name/codesnap/default.nix index cb69269b..a3f5d7b1 100644 --- a/tests/test-sources/plugins/by-name/codesnap/default.nix +++ b/tests/test-sources/plugins/by-name/codesnap/default.nix @@ -8,14 +8,14 @@ enable = true; settings = { - save_path = null; + save_path.__raw = "nil"; mac_window_bar = true; title = "CodeSnap.nvim"; code_font_family = "CaskaydiaCove Nerd Font"; watermark_font_family = "Pacifico"; watermark = "CodeSnap.nvim"; bg_theme = "default"; - bg_color = null; + bg_color.__raw = "nil"; breadcrumbs_separator = "/"; has_breadcrumbs = false; has_line_number = false; diff --git a/tests/test-sources/plugins/by-name/colorizer/default.nix b/tests/test-sources/plugins/by-name/colorizer/default.nix index 6fdf208e..d2150960 100644 --- a/tests/test-sources/plugins/by-name/colorizer/default.nix +++ b/tests/test-sources/plugins/by-name/colorizer/default.nix @@ -8,7 +8,7 @@ enable = true; settings = { - filetypes = { }; + filetypes.__empty = { }; user_default_options = { RGB = true; RRGGBB = true; @@ -30,7 +30,7 @@ virtualtext_mode = "foreground"; always_update = false; }; - buftypes = { }; + buftypes.__empty = { }; user_commands = true; }; }; diff --git a/tests/test-sources/plugins/by-name/comment/default.nix b/tests/test-sources/plugins/by-name/comment/default.nix index e7997c82..07eb91b0 100644 --- a/tests/test-sources/plugins/by-name/comment/default.nix +++ b/tests/test-sources/plugins/by-name/comment/default.nix @@ -10,7 +10,7 @@ settings = { padding = true; sticky = true; - ignore = null; + ignore.__raw = "nil"; toggler = { line = "gcc"; block = "gbc"; @@ -28,8 +28,8 @@ basic = true; extra = true; }; - pre_hook = null; - post_hook = null; + pre_hook.__raw = "nil"; + post_hook.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/conform-nvim/default.nix b/tests/test-sources/plugins/by-name/conform-nvim/default.nix index 12a14349..4cc0aa16 100644 --- a/tests/test-sources/plugins/by-name/conform-nvim/default.nix +++ b/tests/test-sources/plugins/by-name/conform-nvim/default.nix @@ -24,7 +24,7 @@ enable = true; settings = { - formatters_by_ft = { }; + formatters_by_ft.__empty = { }; format_on_save = { lsp_format = "never"; timeout_ms = 1000; @@ -46,7 +46,7 @@ log_level = "error"; notify_on_error = true; notify_no_formatters = true; - formatters = { }; + formatters.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/copilot-chat/default.nix b/tests/test-sources/plugins/by-name/copilot-chat/default.nix index 246217f3..8f364fa4 100644 --- a/tests/test-sources/plugins/by-name/copilot-chat/default.nix +++ b/tests/test-sources/plugins/by-name/copilot-chat/default.nix @@ -13,12 +13,12 @@ system_prompt = "require('CopilotChat.config.prompts').COPILOT_INSTRUCTIONS"; model = "gpt-4-o"; agent = "none"; - context = null; - sticky = null; + context.__raw = "nil"; + sticky.__raw = "nil"; temperature = 0.1; headless = false; - callback = null; + callback.__raw = "nil"; selection.__raw = '' function(source) @@ -33,10 +33,10 @@ height = 0.5; relative = "editor"; border = "single"; - row = null; - col = null; + row.__raw = "nil"; + col.__raw = "nil"; title = "Copilot Chat"; - footer = null; + footer.__raw = "nil"; zindex = 1; }; @@ -50,7 +50,7 @@ debug = false; log_level = "info"; - proxy = null; + proxy.__raw = "nil"; allow_insecure = false; chat_autocomplete = true; diff --git a/tests/test-sources/plugins/by-name/cord/default.nix b/tests/test-sources/plugins/by-name/cord/default.nix index dc8207b3..18d6a093 100644 --- a/tests/test-sources/plugins/by-name/cord/default.nix +++ b/tests/test-sources/plugins/by-name/cord/default.nix @@ -17,7 +17,7 @@ editor = { client = "neovim"; tooltip = "The Superior Text Editor"; - icon = null; + icon.__raw = "nil"; }; display = { theme = "default"; @@ -38,12 +38,12 @@ unidle_on_focus = true; smart_idle = true; details = "Idling"; - state = null; + state.__raw = "nil"; tooltip = "💤"; - icon = null; + icon.__raw = "nil"; }; text = { - default = null; + default.__raw = "nil"; workspace.__raw = "function(opts) return 'In ' .. opts.workspace end"; viewing.__raw = "function(opts) return 'Viewing ' .. opts.filename end"; editing.__raw = "function(opts) return 'Editing ' .. opts.filename end"; @@ -60,19 +60,19 @@ terminal.__raw = "function(opts) return 'Running commands in ' .. opts.name end"; dashboard = "Home"; }; - buttons = null; - assets = null; - variables = null; + buttons.__raw = "nil"; + assets.__raw = "nil"; + variables.__raw = "nil"; hooks = { - ready = null; - shutdown = null; - pre_activity = null; - post_activity = null; - idle_enter = null; - idle_leave = null; - workspace_change = null; + ready.__raw = "nil"; + shutdown.__raw = "nil"; + pre_activity.__raw = "nil"; + post_activity.__raw = "nil"; + idle_enter.__raw = "nil"; + idle_leave.__raw = "nil"; + workspace_change.__raw = "nil"; }; - plugins = null; + plugins.__raw = "nil"; advanced = { plugin = { autocmds = true; @@ -81,8 +81,8 @@ }; server = { update = "fetch"; - pipe_path = null; - executable_path = null; + pipe_path.__raw = "nil"; + executable_path.__raw = "nil"; timeout = 300000; }; discord = { diff --git a/tests/test-sources/plugins/by-name/cornelis/default.nix b/tests/test-sources/plugins/by-name/cornelis/default.nix index a4150a83..13e12764 100644 --- a/tests/test-sources/plugins/by-name/cornelis/default.nix +++ b/tests/test-sources/plugins/by-name/cornelis/default.nix @@ -11,7 +11,7 @@ use_global_binary = 0; agda_prefix = ""; no_agda_input = 0; - bind_input_hook = null; + bind_input_hook.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/coverage/default.nix b/tests/test-sources/plugins/by-name/coverage/default.nix index 0253a7f9..38643835 100644 --- a/tests/test-sources/plugins/by-name/coverage/default.nix +++ b/tests/test-sources/plugins/by-name/coverage/default.nix @@ -87,7 +87,7 @@ coverage_file = "coverage/coverage.json"; }; }; - lcov_file = null; + lcov_file.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/cutlass/default.nix b/tests/test-sources/plugins/by-name/cutlass/default.nix index 7a659901..d8faccef 100644 --- a/tests/test-sources/plugins/by-name/cutlass/default.nix +++ b/tests/test-sources/plugins/by-name/cutlass/default.nix @@ -7,8 +7,8 @@ plugins.cutlass-nvim = { enable = true; settings = { - cut_key = "nil"; - override_del = "nil"; + cut_key.__raw = "nil"; + override_del.__raw = "nil"; exclude.__empty = { }; registers = { select = "_"; diff --git a/tests/test-sources/plugins/by-name/dap-go/default.nix b/tests/test-sources/plugins/by-name/dap-go/default.nix index bffacfe7..25c62312 100644 --- a/tests/test-sources/plugins/by-name/dap-go/default.nix +++ b/tests/test-sources/plugins/by-name/dap-go/default.nix @@ -21,7 +21,7 @@ path = "dlv"; initialize_timeout_sec = 20; port = "$\{port}"; - args = [ ]; + args.__empty = { }; build_flags = "-tags=unit"; }; }; diff --git a/tests/test-sources/plugins/by-name/dap-ui/default.nix b/tests/test-sources/plugins/by-name/dap-ui/default.nix index 78390065..727708bd 100644 --- a/tests/test-sources/plugins/by-name/dap-ui/default.nix +++ b/tests/test-sources/plugins/by-name/dap-ui/default.nix @@ -23,7 +23,7 @@ terminate = ""; }; }; - element_mappings = { }; + element_mappings.__empty = { }; expand_lines = true; floating = { border = "single"; diff --git a/tests/test-sources/plugins/by-name/dap-view/default.nix b/tests/test-sources/plugins/by-name/dap-view/default.nix index 43212196..2cb03e97 100644 --- a/tests/test-sources/plugins/by-name/dap-view/default.nix +++ b/tests/test-sources/plugins/by-name/dap-view/default.nix @@ -101,7 +101,7 @@ ''; }; }; - custom_sections = [ ]; + custom_sections.__empty = { }; controls = { enabled = false; position = "right"; @@ -115,7 +115,7 @@ "terminate" "disconnect" ]; - custom_buttons = [ ]; + custom_buttons.__empty = { }; }; }; windows = { @@ -124,7 +124,7 @@ terminal = { width = 0.5; position = "left"; - hide = { }; + hide.__empty = { }; start_hidden = false; }; }; @@ -144,7 +144,7 @@ terminate = ""; }; help = { - border = null; + border.__raw = "nil"; }; switchbuf = "usetab"; auto_toggle = false; diff --git a/tests/test-sources/plugins/by-name/dashboard/default.nix b/tests/test-sources/plugins/by-name/dashboard/default.nix index 0e85acd7..187a860f 100644 --- a/tests/test-sources/plugins/by-name/dashboard/default.nix +++ b/tests/test-sources/plugins/by-name/dashboard/default.nix @@ -22,7 +22,7 @@ week_header = { enable = false; concat = ""; - append = [ ]; + append.__empty = { }; }; header = [ "" @@ -43,7 +43,7 @@ preview = { command = ""; - file_path = null; + file_path.__raw = "nil"; file_height = 0; file_width = 0; }; @@ -85,7 +85,7 @@ cwd_only = false; }; - footer = [ ]; + footer.__empty = { }; }; }; }; @@ -111,7 +111,7 @@ action = ""; } ]; - footer = [ ]; + footer.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/dbee/default.nix b/tests/test-sources/plugins/by-name/dbee/default.nix index d1090454..304c5a67 100644 --- a/tests/test-sources/plugins/by-name/dbee/default.nix +++ b/tests/test-sources/plugins/by-name/dbee/default.nix @@ -8,16 +8,16 @@ plugins.dbee = { enable = true; settings = { - default_connection = null; + default_connection.__raw = "nil"; sources = [ (lib.nixvim.mkRaw "require('dbee.sources').EnvSource:new('DBEE_CONNECTIONS')") (lib.nixvim.mkRaw "require('dbee.sources').FileSource:new(vim.fn.stdpath('state') .. '/dbee/persistence.json')") ]; - extra_helpers = { }; - float_options = { }; + extra_helpers.__empty = { }; + float_options.__empty = { }; drawer = { - window_options = { }; - buffer_options = { }; + window_options.__empty = { }; + buffer_options.__empty = { }; disable_help = false; mappings = [ { @@ -176,8 +176,8 @@ }; }; result = { - window_options = { }; - buffer_options = { }; + window_options.__empty = { }; + buffer_options.__empty = { }; page_size = 100; focus_result = true; progress = { @@ -254,8 +254,8 @@ ]; }; editor = { - window_options = { }; - buffer_options = { }; + window_options.__empty = { }; + buffer_options.__empty = { }; mappings = [ { key = "BB"; @@ -270,8 +270,8 @@ ]; }; call_log = { - window_options = { }; - buffer_options = { }; + window_options.__empty = { }; + buffer_options.__empty = { }; mappings = [ { key = ""; diff --git a/tests/test-sources/plugins/by-name/devdocs/default.nix b/tests/test-sources/plugins/by-name/devdocs/default.nix index bedd381d..72c0de97 100644 --- a/tests/test-sources/plugins/by-name/devdocs/default.nix +++ b/tests/test-sources/plugins/by-name/devdocs/default.nix @@ -14,7 +14,7 @@ enable = true; settings = { - ensure_installed = [ ]; + ensure_installed.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/diagram/default.nix b/tests/test-sources/plugins/by-name/diagram/default.nix index 133f571a..61ad7258 100644 --- a/tests/test-sources/plugins/by-name/diagram/default.nix +++ b/tests/test-sources/plugins/by-name/diagram/default.nix @@ -16,26 +16,26 @@ settings = { renderer_options = { mermaid = { - background = null; - theme = null; + background.__raw = "nil"; + theme.__raw = "nil"; scale = 1; - width = null; - height = null; + width.__raw = "nil"; + height.__raw = "nil"; }; plantuml = { - charset = null; + charset.__raw = "nil"; }; d2 = { - theme_id = null; - dark_theme_id = null; - scale = null; - layout = null; - sketch = null; + theme_id.__raw = "nil"; + dark_theme_id.__raw = "nil"; + scale.__raw = "nil"; + layout.__raw = "nil"; + sketch.__raw = "nil"; }; gnuplot = { - size = null; - font = null; - theme = null; + size.__raw = "nil"; + font.__raw = "nil"; + theme.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/diffview/default.nix b/tests/test-sources/plugins/by-name/diffview/default.nix index ab7b7f7d..d0083865 100644 --- a/tests/test-sources/plugins/by-name/diffview/default.nix +++ b/tests/test-sources/plugins/by-name/diffview/default.nix @@ -50,7 +50,7 @@ win_config = { position = "right"; width = 20; - win_opts = { }; + win_opts.__empty = { }; }; }; file_history_panel = { @@ -63,14 +63,14 @@ multi_file.diff_merges = "first-parent"; }; hg = { - single_file = { }; - multi_file = { }; + single_file.__empty = { }; + multi_file.__empty = { }; }; }; win_config = { position = "top"; height = 10; - win_opts = { }; + win_opts.__empty = { }; }; }; diff --git a/tests/test-sources/plugins/by-name/distant/default.nix b/tests/test-sources/plugins/by-name/distant/default.nix index 5541ff05..c4fbc7cb 100644 --- a/tests/test-sources/plugins/by-name/distant/default.nix +++ b/tests/test-sources/plugins/by-name/distant/default.nix @@ -21,8 +21,8 @@ return os_name == 'windows' and 'distant.exe' or 'distant' end)() ''; - log_file = null; - log_level = null; + log_file.__raw = "nil"; + log_level.__raw = "nil"; }; keymap = { dir = { @@ -63,8 +63,8 @@ manager = { daemon = false; lazy = true; - log_file = null; - log_level = null; + log_file.__raw = "nil"; + log_level.__raw = "nil"; user = false; }; network = { @@ -73,15 +73,15 @@ max = 15000; interval = 256; }; - windows_pipe = null; - unix_socket = null; + windows_pipe.__raw = "nil"; + unix_socket.__raw = "nil"; }; servers = { "*" = { connect.default = { }; - cwd = null; + cwd.__raw = "nil"; launch.default = { }; - lsp = { }; + lsp.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/dressing/default.nix b/tests/test-sources/plugins/by-name/dressing/default.nix index b6a71050..7f7edd5e 100644 --- a/tests/test-sources/plugins/by-name/dressing/default.nix +++ b/tests/test-sources/plugins/by-name/dressing/default.nix @@ -18,7 +18,7 @@ border = "rounded"; relative = "cursor"; prefer_width = 40; - width = null; + width.__raw = "nil"; max_width = [ 140 0.9 @@ -46,7 +46,7 @@ }; }; override = "function(conf) return conf end"; - get_config = null; + get_config.__raw = "nil"; }; select = { enabled = true; @@ -58,15 +58,15 @@ "nui" ]; trim_prompt = true; - telescope = null; + telescope.__raw = "nil"; fzf.window = { width = 0.5; height = 0.4; }; - fzf_lua = { }; + fzf_lua.__empty = { }; nui = { position = "50%"; - size = null; + size.__raw = "nil"; relative = "editor"; border = { style = "rounded"; @@ -88,13 +88,13 @@ border = "rounded"; relative = "editor"; - buf_options = { }; + buf_options.__empty = { }; win_options = { cursorline = true; cursorlineopt = "both"; }; - width = null; + width.__raw = "nil"; max_width = [ 140 0.8 @@ -103,7 +103,7 @@ 40 0.2 ]; - height = null; + height.__raw = "nil"; max_height = 0.9; min_height = [ 10 @@ -118,8 +118,8 @@ override = "function(conf) return conf end"; }; - format_item_override = { }; - get_config = null; + format_item_override.__empty = { }; + get_config.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/easy-dotnet/default.nix b/tests/test-sources/plugins/by-name/easy-dotnet/default.nix index 96f66fd9..591c20c0 100644 --- a/tests/test-sources/plugins/by-name/easy-dotnet/default.nix +++ b/tests/test-sources/plugins/by-name/easy-dotnet/default.nix @@ -133,7 +133,7 @@ desc = "refresh testrunner"; }; }; - additional_args = [ ]; + additional_args.__empty = { }; }; csproj_mappings = true; fsproj_mappings = true; diff --git a/tests/test-sources/plugins/by-name/edgy/default.nix b/tests/test-sources/plugins/by-name/edgy/default.nix index 69961321..9bb74b90 100644 --- a/tests/test-sources/plugins/by-name/edgy/default.nix +++ b/tests/test-sources/plugins/by-name/edgy/default.nix @@ -8,26 +8,26 @@ enable = true; settings = { - left = [ ]; - bottom = [ ]; - right = [ ]; - top = [ ]; + left.__empty = { }; + bottom.__empty = { }; + right.__empty = { }; + top.__empty = { }; options = { left = { size = 30; - wo = null; + wo.__raw = "nil"; }; bottom = { size = 10; - wo = null; + wo.__raw = "nil"; }; right = { size = 30; - wo = null; + wo.__raw = "nil"; }; top = { size = 10; - wo = null; + wo.__raw = "nil"; }; }; animate = { diff --git a/tests/test-sources/plugins/by-name/emmet/default.nix b/tests/test-sources/plugins/by-name/emmet/default.nix index 64b2246f..f0fe43f0 100644 --- a/tests/test-sources/plugins/by-name/emmet/default.nix +++ b/tests/test-sources/plugins/by-name/emmet/default.nix @@ -17,11 +17,11 @@ html = { default_attributes = { option = { - value = null; + value.__raw = "nil"; }; textarea = { - id = null; - name = null; + id.__raw = "nil"; + name.__raw = "nil"; cols = 10; rows = 10; }; diff --git a/tests/test-sources/plugins/by-name/eyeliner/default.nix b/tests/test-sources/plugins/by-name/eyeliner/default.nix index 5e15502a..dd1a9f21 100644 --- a/tests/test-sources/plugins/by-name/eyeliner/default.nix +++ b/tests/test-sources/plugins/by-name/eyeliner/default.nix @@ -10,8 +10,8 @@ highlight_on_key = false; dim = false; max_length = 9999; - disabled_filetypes = [ ]; - disabled_buftypes = [ ]; + disabled_filetypes.__empty = { }; + disabled_buftypes.__empty = { }; default_keymaps = true; }; }; diff --git a/tests/test-sources/plugins/by-name/faster/default.nix b/tests/test-sources/plugins/by-name/faster/default.nix index d4596730..b1ab697a 100644 --- a/tests/test-sources/plugins/by-name/faster/default.nix +++ b/tests/test-sources/plugins/by-name/faster/default.nix @@ -22,7 +22,7 @@ ]; filesize = 2; pattern = "*"; - extra_patterns = [ ]; + extra_patterns.__empty = { }; }; fastmacro = { on = true; diff --git a/tests/test-sources/plugins/by-name/fidget/default.nix b/tests/test-sources/plugins/by-name/fidget/default.nix index b20f0ac2..6cf6c121 100644 --- a/tests/test-sources/plugins/by-name/fidget/default.nix +++ b/tests/test-sources/plugins/by-name/fidget/default.nix @@ -20,7 +20,7 @@ return client and client.name or nil end ''; - ignore = [ ]; + ignore.__empty = { }; display = { render_limit = 16; done_ttl = 3; diff --git a/tests/test-sources/plugins/by-name/flash/default.nix b/tests/test-sources/plugins/by-name/flash/default.nix index ecf6668c..f3cd80bf 100644 --- a/tests/test-sources/plugins/by-name/flash/default.nix +++ b/tests/test-sources/plugins/by-name/flash/default.nix @@ -38,8 +38,8 @@ register = false; nohlsearch = false; autojump = false; - inclusive = null; - offset = null; + inclusive.__raw = "nil"; + offset.__raw = "nil"; }; label = { uppercase = true; @@ -72,10 +72,10 @@ label = "FlashLabel"; }; }; - action = null; + action.__raw = "nil"; pattern = ""; continue = false; - config = null; + config.__raw = "nil"; prompt = { enabled = true; prefix = [ diff --git a/tests/test-sources/plugins/by-name/flit/default.nix b/tests/test-sources/plugins/by-name/flit/default.nix index 40a14fb2..f8599e8b 100644 --- a/tests/test-sources/plugins/by-name/flit/default.nix +++ b/tests/test-sources/plugins/by-name/flit/default.nix @@ -16,7 +16,7 @@ labeled_modes = "v"; clever_repeat = true; multiline = true; - opts = { }; + opts.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/floaterm/default.nix b/tests/test-sources/plugins/by-name/floaterm/default.nix index 08aa5527..90fbb668 100644 --- a/tests/test-sources/plugins/by-name/floaterm/default.nix +++ b/tests/test-sources/plugins/by-name/floaterm/default.nix @@ -8,7 +8,7 @@ enable = true; settings = { - shell = null; + shell.__raw = "nil"; title = "floaterm: $1/$2"; wintype = "float"; width = 0.6; diff --git a/tests/test-sources/plugins/by-name/flutter-tools/default.nix b/tests/test-sources/plugins/by-name/flutter-tools/default.nix index 888c3ce5..615a4644 100644 --- a/tests/test-sources/plugins/by-name/flutter-tools/default.nix +++ b/tests/test-sources/plugins/by-name/flutter-tools/default.nix @@ -20,11 +20,11 @@ }; debugger = { enabled = false; - exception_breakpoints = null; + exception_breakpoints.__raw = "nil"; evaluate_to_string_in_debug_views = true; - register_configurations = null; + register_configurations.__raw = "nil"; }; - flutter_path = null; + flutter_path.__raw = "nil"; flutter_lookup_cmd.__raw = '' (function() local exepath = vim.fn.exepath("flutter") @@ -48,7 +48,7 @@ }; dev_log = { enabled = true; - filter = null; + filter.__raw = "nil"; notify_errors = false; open_cmd.__raw = "('botright %dvnew'):format(math.max(vim.o.columns * 0.4, 50))"; focus_on_open = true; @@ -65,14 +65,14 @@ color = { enabled = false; background = false; - background_color = null; + background_color.__raw = "nil"; foreground = false; virtual_text = true; virtual_text_str = "■"; }; - on_attach = null; - capabilities = null; - settings = null; + on_attach.__raw = "nil"; + capabilities.__raw = "nil"; + settings.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/fugit2/default.nix b/tests/test-sources/plugins/by-name/fugit2/default.nix index 9390d21c..d3871772 100644 --- a/tests/test-sources/plugins/by-name/fugit2/default.nix +++ b/tests/test-sources/plugins/by-name/fugit2/default.nix @@ -14,13 +14,13 @@ content_width = 60; height = "60%"; show_patch = false; - libgit2_path = null; + libgit2_path.__raw = "nil"; gpgme_path = "gpgme"; external_diffview = false; blame_priority = 1; blame_info_width = 60; blame_info_height = 10; - colorscheme = null; + colorscheme.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/git-conflict/default.nix b/tests/test-sources/plugins/by-name/git-conflict/default.nix index d1b8a32f..ce5a1cba 100644 --- a/tests/test-sources/plugins/by-name/git-conflict/default.nix +++ b/tests/test-sources/plugins/by-name/git-conflict/default.nix @@ -15,7 +15,7 @@ highlights = { incoming = "DiffAdd"; current = "DiffText"; - ancestor = null; + ancestor.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/gitblame/default.nix b/tests/test-sources/plugins/by-name/gitblame/default.nix index b4736509..762e6750 100644 --- a/tests/test-sources/plugins/by-name/gitblame/default.nix +++ b/tests/test-sources/plugins/by-name/gitblame/default.nix @@ -13,11 +13,11 @@ date_format = "%c"; message_when_not_committed = " Not Committed Yet"; highlight_group = "Comment"; - set_extmark_options = { }; + set_extmark_options.__empty = { }; display_virtual_text = true; - ignored_filetypes = [ ]; + ignored_filetypes.__empty = { }; delay = 250; - virtual_text_column = null; + virtual_text_column.__raw = "nil"; use_blame_commit_file_urls = false; schedule_event = "CursorMoved"; clear_event = "CursorMovedI"; diff --git a/tests/test-sources/plugins/by-name/gitlab/default.nix b/tests/test-sources/plugins/by-name/gitlab/default.nix index 80b5f356..3c4cbb4d 100644 --- a/tests/test-sources/plugins/by-name/gitlab/default.nix +++ b/tests/test-sources/plugins/by-name/gitlab/default.nix @@ -56,7 +56,7 @@ }; telemetry = { enabled = true; - trackingUrl = null; + trackingUrl.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/gitlinker/default.nix b/tests/test-sources/plugins/by-name/gitlinker/default.nix index 0524c5ce..a2d582cf 100644 --- a/tests/test-sources/plugins/by-name/gitlinker/default.nix +++ b/tests/test-sources/plugins/by-name/gitlinker/default.nix @@ -30,7 +30,7 @@ settings = { opts = { - remote = null; + remote.__raw = "nil"; add_current_line_on_normal_mode = true; action_callback = lib.nixvim.mkRaw "require('gitlinker.actions').copy_to_clipboard"; print_url = true; diff --git a/tests/test-sources/plugins/by-name/gitmessenger/default.nix b/tests/test-sources/plugins/by-name/gitmessenger/default.nix index 30400f37..170a495a 100644 --- a/tests/test-sources/plugins/by-name/gitmessenger/default.nix +++ b/tests/test-sources/plugins/by-name/gitmessenger/default.nix @@ -16,11 +16,11 @@ always_into_popup = false; extra_blame_args = ""; preview_mods = ""; - max_popup_height = null; - max_popup_width = null; + max_popup_height.__raw = "nil"; + max_popup_width.__raw = "nil"; date_format = "%c"; conceal_word_diff_marker = true; - floating_win_opts = { }; + floating_win_opts.__empty = { }; popup_content_margins = true; }; }; diff --git a/tests/test-sources/plugins/by-name/gitsigns/default.nix b/tests/test-sources/plugins/by-name/gitsigns/default.nix index c0dcb893..5e637edc 100644 --- a/tests/test-sources/plugins/by-name/gitsigns/default.nix +++ b/tests/test-sources/plugins/by-name/gitsigns/default.nix @@ -45,13 +45,13 @@ internal = false; indent_heuristic = false; vertical = true; - linematch = null; + linematch.__raw = "nil"; ignore_blank_lines = true; ignore_whitespace_change = true; ignore_whitespace = true; ignore_whitespace_change_at_eol = true; }; - base = null; + base.__raw = "nil"; count_chars = { "__unkeyed_1" = "1"; "__unkeyed_2" = "2"; diff --git a/tests/test-sources/plugins/by-name/glance/default.nix b/tests/test-sources/plugins/by-name/glance/default.nix index bc06ac48..f8a9aa1d 100644 --- a/tests/test-sources/plugins/by-name/glance/default.nix +++ b/tests/test-sources/plugins/by-name/glance/default.nix @@ -65,7 +65,7 @@ "l".__raw = ''require('glance').actions.enter_win("list")''; }; }; - hooks = { }; + hooks.__empty = { }; folds = { fold_closed = ""; fold_open = ""; diff --git a/tests/test-sources/plugins/by-name/goto-preview/default.nix b/tests/test-sources/plugins/by-name/goto-preview/default.nix index ac4d8a70..ad9d135b 100644 --- a/tests/test-sources/plugins/by-name/goto-preview/default.nix +++ b/tests/test-sources/plugins/by-name/goto-preview/default.nix @@ -22,13 +22,13 @@ ]; default_mappings = false; debug = false; - opacity = null; + opacity.__raw = "nil"; resizing_mappings = false; - post_open_hook = null; - post_close_hook = null; + post_open_hook.__raw = "nil"; + post_close_hook.__raw = "nil"; references = { provider = "telescope"; - telescope = null; + telescope.__raw = "nil"; }; focus_on_open = true; dismiss_on_move = false; diff --git a/tests/test-sources/plugins/by-name/gx/default.nix b/tests/test-sources/plugins/by-name/gx/default.nix index c1ca0b39..585350c7 100644 --- a/tests/test-sources/plugins/by-name/gx/default.nix +++ b/tests/test-sources/plugins/by-name/gx/default.nix @@ -10,9 +10,9 @@ disableNetrwGx = true; settings = { - open_browser_app = null; - open_browser_args = [ ]; - handlers = { }; + open_browser_app.__raw = "nil"; + open_browser_args.__empty = { }; + handlers.__empty = { }; handler_options = { search_engine = "google"; select_for_search = false; diff --git a/tests/test-sources/plugins/by-name/helpview/default.nix b/tests/test-sources/plugins/by-name/helpview/default.nix index d8ced103..0198b244 100644 --- a/tests/test-sources/plugins/by-name/helpview/default.nix +++ b/tests/test-sources/plugins/by-name/helpview/default.nix @@ -8,16 +8,16 @@ enable = true; settings = { - buf_ignore = null; + buf_ignore.__raw = "nil"; mode = [ "n" "c" ]; - hybrid_modes = null; + hybrid_modes.__raw = "nil"; callback = { - on_enable = null; - on_disable = null; - on_mode_change = null; + on_enable.__raw = "nil"; + on_disable.__raw = "nil"; + on_mode_change.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/highlight-colors/default.nix b/tests/test-sources/plugins/by-name/highlight-colors/default.nix index fc54a5a4..3c2f31bd 100644 --- a/tests/test-sources/plugins/by-name/highlight-colors/default.nix +++ b/tests/test-sources/plugins/by-name/highlight-colors/default.nix @@ -18,13 +18,13 @@ enable_short_hex = true; enable_tailwind = false; enable_ansi = false; - custom_colors = null; + custom_colors.__raw = "nil"; virtual_symbol = "■"; virtual_symbol_prefix = ""; virtual_symbol_suffix = " "; virtual_symbol_position = "inline"; - exclude_filetypes = { }; - exclude_buftypes = { }; + exclude_filetypes.__empty = { }; + exclude_buftypes.__empty = { }; exclude_buffer.__raw = "function(bufnr) end"; }; }; diff --git a/tests/test-sources/plugins/by-name/hlchunk/default.nix b/tests/test-sources/plugins/by-name/hlchunk/default.nix index f427f567..e4bb6560 100644 --- a/tests/test-sources/plugins/by-name/hlchunk/default.nix +++ b/tests/test-sources/plugins/by-name/hlchunk/default.nix @@ -12,7 +12,7 @@ let modDefaultConfig = { enable = false; - style = { }; + style.__empty = { }; notify = false; priority = 0; exclude_filetypes = { diff --git a/tests/test-sources/plugins/by-name/hop/default.nix b/tests/test-sources/plugins/by-name/hop/default.nix index 500f0289..83ac488f 100644 --- a/tests/test-sources/plugins/by-name/hop/default.nix +++ b/tests/test-sources/plugins/by-name/hop/default.nix @@ -98,17 +98,17 @@ case_insensitive = true; create_hl_autocmd = true; dim_unmatched = true; - direction = null; + direction.__raw = "nil"; hint_position = "require'hop.hint'.HintPosition.BEGIN"; hint_type = "require'hop.hint'.HintType.OVERLAY"; hint_offset = 0; current_line_only = false; uppercase_labels = false; yank_register = ""; - extensions = null; + extensions.__raw = "nil"; multi_windows = false; - excluded_filetypes = [ ]; - match_mappings = [ ]; + excluded_filetypes.__empty = { }; + match_mappings.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/hydra/default.nix b/tests/test-sources/plugins/by-name/hydra/default.nix index 60fdd809..9fb9203d 100644 --- a/tests/test-sources/plugins/by-name/hydra/default.nix +++ b/tests/test-sources/plugins/by-name/hydra/default.nix @@ -10,14 +10,14 @@ settings = { debug = false; exit = false; - foreign_keys = null; + foreign_keys.__raw = "nil"; color = "red"; - buffer = null; + buffer.__raw = "nil"; invoke_on_body = false; - desc = null; - on_enter = null; - on_exit = null; - on_key = null; + desc.__raw = "nil"; + on_enter.__raw = "nil"; + on_exit.__raw = "nil"; + on_key.__raw = "nil"; timeout = false; hint = { show_name = true; @@ -42,7 +42,7 @@ color = "red"; buffer = true; invoke_on_body = false; - desc = null; + desc.__raw = "nil"; on_enter = '' function() print('hello') diff --git a/tests/test-sources/plugins/by-name/illuminate/default.nix b/tests/test-sources/plugins/by-name/illuminate/default.nix index 4dc99def..b127030f 100644 --- a/tests/test-sources/plugins/by-name/illuminate/default.nix +++ b/tests/test-sources/plugins/by-name/illuminate/default.nix @@ -14,20 +14,20 @@ "regex" ]; delay = 100; - filetype_overrides = { }; + filetype_overrides.__empty = { }; filetypes_denylist = [ "dirbuf" "dirvish" "fugitive" ]; - filetypes_allowlist = [ ]; - modes_denylist = [ ]; - modes_allowlist = [ ]; - providers_regex_syntax_denylist = [ ]; - providers_regex_syntax_allowlist = [ ]; + filetypes_allowlist.__empty = { }; + modes_denylist.__empty = { }; + modes_allowlist.__empty = { }; + providers_regex_syntax_denylist.__empty = { }; + providers_regex_syntax_allowlist.__empty = { }; under_cursor = true; large_file_cutoff = 10000; - large_file_overrides = null; + large_file_overrides.__raw = "nil"; min_count_to_highlight = 1; }; }; diff --git a/tests/test-sources/plugins/by-name/image/default.nix b/tests/test-sources/plugins/by-name/image/default.nix index 34d5c2d5..b622f0e1 100644 --- a/tests/test-sources/plugins/by-name/image/default.nix +++ b/tests/test-sources/plugins/by-name/image/default.nix @@ -26,8 +26,8 @@ html.enabled = false; css.enabled = false; }; - max_width = null; - max_height = null; + max_width.__raw = "nil"; + max_height.__raw = "nil"; max_width_window_percentage = 100; max_height_window_percentage = 50; scale_factor = 1.0; diff --git a/tests/test-sources/plugins/by-name/inc-rename/default.nix b/tests/test-sources/plugins/by-name/inc-rename/default.nix index 26ad2086..65d7e9d8 100644 --- a/tests/test-sources/plugins/by-name/inc-rename/default.nix +++ b/tests/test-sources/plugins/by-name/inc-rename/default.nix @@ -13,8 +13,8 @@ preview_empty_name = false; show_message = true; save_in_cmdline_history = true; - input_buffer_type = null; - post_hook = null; + input_buffer_type.__raw = "nil"; + post_hook.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/indent-blankline/default.nix b/tests/test-sources/plugins/by-name/indent-blankline/default.nix index 3eb35ca7..58d25bb6 100644 --- a/tests/test-sources/plugins/by-name/indent-blankline/default.nix +++ b/tests/test-sources/plugins/by-name/indent-blankline/default.nix @@ -48,29 +48,29 @@ }; indent = { char = "▎"; - tab_char = null; - highlight = null; + tab_char.__raw = "nil"; + highlight.__raw = "nil"; smart_indent_cap = true; priority = 1; }; whitespace = { - highlight = null; + highlight.__raw = "nil"; remove_blankline_trail = true; }; scope = { enabled = true; - char = null; + char.__raw = "nil"; show_start = true; show_end = true; show_exact_scope = false; injected_languages = true; - highlight = null; + highlight.__raw = "nil"; priority = 1024; include = { - node_type = { }; + node_type.__empty = { }; }; exclude = { - language = [ ]; + language.__empty = { }; node_type = { "*" = [ "source_file" diff --git a/tests/test-sources/plugins/by-name/iron/default.nix b/tests/test-sources/plugins/by-name/iron/default.nix index ae017471..c74b4f40 100644 --- a/tests/test-sources/plugins/by-name/iron/default.nix +++ b/tests/test-sources/plugins/by-name/iron/default.nix @@ -9,28 +9,28 @@ settings = { scratch_repl = false; - repl_definition = { }; + repl_definition.__empty = { }; repl_open_cmd.__raw = '' require("iron.view").split.botright(40) ''; - highlight = { }; + highlight.__empty = { }; highlight_last = "IronLastSent"; ignore_blank_lines = true; should_map_plug = false; bufListed = false; keymaps = { - send_motion = null; - visual_send = null; - send_file = null; - send_paragraph = null; - send_until_cursor = null; - send_mark = null; - mark_motion = null; - remove_mark = null; - cr = null; - interrupt = null; - exit = null; - clear = null; + send_motion.__raw = "nil"; + visual_send.__raw = "nil"; + send_file.__raw = "nil"; + send_paragraph.__raw = "nil"; + send_until_cursor.__raw = "nil"; + send_mark.__raw = "nil"; + mark_motion.__raw = "nil"; + remove_mark.__raw = "nil"; + cr.__raw = "nil"; + interrupt.__raw = "nil"; + exit.__raw = "nil"; + clear.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/jdtls/default.nix b/tests/test-sources/plugins/by-name/jdtls/default.nix index b102f91d..672a4e31 100644 --- a/tests/test-sources/plugins/by-name/jdtls/default.nix +++ b/tests/test-sources/plugins/by-name/jdtls/default.nix @@ -17,11 +17,11 @@ root_dir.__raw = "require('jdtls.setup').find_root({'.git', 'mvnw', 'gradlew'})"; settings = { - java = { }; + java.__empty = { }; }; init_options = { - bundles = { }; + bundles.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/jupytext/default.nix b/tests/test-sources/plugins/by-name/jupytext/default.nix index 697236f5..eec9f834 100644 --- a/tests/test-sources/plugins/by-name/jupytext/default.nix +++ b/tests/test-sources/plugins/by-name/jupytext/default.nix @@ -10,8 +10,8 @@ settings = { style = "hydrogen"; output_extension = "auto"; - force_ft = null; - custom_language_formatting = { }; + force_ft.__raw = "nil"; + custom_language_formatting.__empty = { }; }; }; }; @@ -23,7 +23,7 @@ settings = { style = "light"; output_extension = "auto"; - force_ft = null; + force_ft.__raw = "nil"; custom_language_formatting.python = { extension = "md"; style = "markdown"; diff --git a/tests/test-sources/plugins/by-name/kulala/default.nix b/tests/test-sources/plugins/by-name/kulala/default.nix index 72dc0034..2897c54f 100644 --- a/tests/test-sources/plugins/by-name/kulala/default.nix +++ b/tests/test-sources/plugins/by-name/kulala/default.nix @@ -53,7 +53,7 @@ "--html" "-" ]; - pathresolver = [ ]; + pathresolver.__empty = { }; }; }; show_icons = "on_request"; @@ -65,7 +65,7 @@ }; lualine = "🐼"; }; - additional_curl_options = { }; + additional_curl_options.__empty = { }; scratchpad_default_contents = [ "@MY_TOKEN_NAME=my_token_value" "" @@ -84,7 +84,7 @@ vscode_rest_client_environmentvars = false; disable_script_print_output = false; environment_scope = "b"; - certificates = { }; + certificates.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/lazygit/default.nix b/tests/test-sources/plugins/by-name/lazygit/default.nix index 1eec8dbf..ac778911 100644 --- a/tests/test-sources/plugins/by-name/lazygit/default.nix +++ b/tests/test-sources/plugins/by-name/lazygit/default.nix @@ -23,7 +23,7 @@ floating_window_use_plenary = 0; use_neovim_remote = 1; use_custom_config_file_path = 0; - config_file_path = [ ]; + config_file_path.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/lean/default.nix b/tests/test-sources/plugins/by-name/lean/default.nix index c04ca015..eca9b1ea 100644 --- a/tests/test-sources/plugins/by-name/lean/default.nix +++ b/tests/test-sources/plugins/by-name/lean/default.nix @@ -35,14 +35,14 @@ lean = { enable = true; settings = { - lsp = { }; + lsp.__empty = { }; ft = { default = "lean"; - nomodifiable = null; + nomodifiable.__raw = "nil"; }; abbreviations = { enable = true; - extra = { }; + extra.__empty = { }; leader = "\\"; }; mappings = false; diff --git a/tests/test-sources/plugins/by-name/ledger/default.nix b/tests/test-sources/plugins/by-name/ledger/default.nix index 720c1f77..8b5d6efa 100644 --- a/tests/test-sources/plugins/by-name/ledger/default.nix +++ b/tests/test-sources/plugins/by-name/ledger/default.nix @@ -8,11 +8,11 @@ enable = true; settings = { - bin = null; - is_hledger = null; + bin.__raw = "nil"; + is_hledger.__raw = "nil"; extra_options = ""; - accounts_cmd = null; - descriptions_cmd = null; + accounts_cmd.__raw = "nil"; + descriptions_cmd.__raw = "nil"; maxwidth = 0; fillstring = " "; detailed_first = 1; @@ -28,8 +28,8 @@ date_format = "%Y/%m/%d"; main = "%"; winpos = "B"; - qf_register_format = null; - qf_reconcile_format = null; + qf_register_format.__raw = "nil"; + qf_reconcile_format.__raw = "nil"; use_location_list = 0; qf_vertical = 0; qf_size = 10; diff --git a/tests/test-sources/plugins/by-name/leetcode/default.nix b/tests/test-sources/plugins/by-name/leetcode/default.nix index febf80bf..c09bedbd 100644 --- a/tests/test-sources/plugins/by-name/leetcode/default.nix +++ b/tests/test-sources/plugins/by-name/leetcode/default.nix @@ -38,7 +38,7 @@ non_standalone = false; }; logging = true; - injector = { }; + injector.__empty = { }; cache = { update_interval = 60 * 60 * 24 * 7; }; @@ -67,7 +67,7 @@ show_stats = true; }; picker = { - provider = null; + provider.__raw = "nil"; }; hooks = { "enter" = { }; @@ -82,7 +82,7 @@ focus_testcases = "H"; focus_result = "L"; }; - theme = { }; + theme.__empty = { }; image_support = false; }; }; diff --git a/tests/test-sources/plugins/by-name/lensline/default.nix b/tests/test-sources/plugins/by-name/lensline/default.nix index 0e594ffa..b2380e6b 100644 --- a/tests/test-sources/plugins/by-name/lensline/default.nix +++ b/tests/test-sources/plugins/by-name/lensline/default.nix @@ -43,8 +43,7 @@ } ]; limits = { - exclude = { - }; + exclude.__empty = { }; exclude_gitignored = true; max_lines = 1000; max_lenses = 70; diff --git a/tests/test-sources/plugins/by-name/lightline/default.nix b/tests/test-sources/plugins/by-name/lightline/default.nix index 6127fd44..382f513e 100644 --- a/tests/test-sources/plugins/by-name/lightline/default.nix +++ b/tests/test-sources/plugins/by-name/lightline/default.nix @@ -9,7 +9,7 @@ settings = { colorscheme = "default"; - component_function = { }; + component_function.__raw = "nil"; component = { mode = ''%{lightline#mode()}''; absolutepath = "%F"; @@ -134,7 +134,7 @@ ] ]; }; - inactive = null; + inactive.__raw = "nil"; mode_map = { "n" = "N"; "i" = "I"; diff --git a/tests/test-sources/plugins/by-name/lilypond-suite/default.nix b/tests/test-sources/plugins/by-name/lilypond-suite/default.nix index aa8387af..4863dcc8 100644 --- a/tests/test-sources/plugins/by-name/lilypond-suite/default.nix +++ b/tests/test-sources/plugins/by-name/lilypond-suite/default.nix @@ -27,11 +27,11 @@ pitches_language = "default"; hyphenation_language = "en_DEFAULT"; output = "pdf"; - backend = null; + backend.__raw = "nil"; main_file = "main.ly"; main_folder = "%:p:h"; - include_dir = null; - pdf_viewer = null; + include_dir.__raw = "nil"; + pdf_viewer.__raw = "nil"; errors = { diagnostics = true; quickfix = "external"; @@ -49,13 +49,13 @@ lilypond_syntax = ""; }; options = { - lilypond_book_flags = null; + lilypond_book_flags.__raw = "nil"; clean_logs = false; main_file = "main.tex"; main_folder = "%:p:h"; - include_dir = null; + include_dir.__raw = "nil"; lilypond_syntax_au = "BufEnter"; - pdf_viewer = null; + pdf_viewer.__raw = "nil"; errors = { diagnostics = true; quickfix = "external"; @@ -82,7 +82,7 @@ main_file = "main.texi"; main_folder = "%:p:h"; lilypond_syntax_au = "BufEnter"; - pdf_viewer = null; + pdf_viewer.__raw = "nil"; errors = { diagnostics = true; quickfix = "external"; @@ -119,8 +119,8 @@ border_style = "single"; winhighlight = "Normal:Normal,FloatBorder:Normal,FloatTitle:Normal"; midi_synth = "fluidsynth"; - fluidsynth_flags = null; - timidity_flags = null; + fluidsynth_flags.__raw = "nil"; + timidity_flags.__raw = "nil"; audio_format = "mp3"; mpv_flags = [ "--msg-level=cplayer=no,ffmpeg=no,alsa=no" diff --git a/tests/test-sources/plugins/by-name/lir/default.nix b/tests/test-sources/plugins/by-name/lir/default.nix index 13d2ddd1..024794a4 100644 --- a/tests/test-sources/plugins/by-name/lir/default.nix +++ b/tests/test-sources/plugins/by-name/lir/default.nix @@ -9,14 +9,14 @@ settings = { show_hidden_files = false; - ignore = [ ]; + ignore.__empty = { }; devicons = { enable = false; highlight_dirname = false; }; hide_cursor = false; on_init.__raw = "function() end"; - mappings = { }; + mappings.__empty = { }; float = { winblend = 0; curdir_window = { @@ -24,7 +24,7 @@ highlight_dirname = false; }; }; - get_filters = null; + get_filters.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/llm/default.nix b/tests/test-sources/plugins/by-name/llm/default.nix index b879c10a..c00cf09e 100644 --- a/tests/test-sources/plugins/by-name/llm/default.nix +++ b/tests/test-sources/plugins/by-name/llm/default.nix @@ -19,10 +19,10 @@ enable = true; settings = { - api_token = null; + api_token.__raw = "nil"; model = "bigcode/starcoder2-15b"; backend = "huggingface"; - url = null; + url.__raw = "nil"; tokens_to_clear = [ "<|endoftext|>" ]; request_body = { parameters = { @@ -42,11 +42,11 @@ dismiss_keymap = ""; tls_skip_verify_insecure = false; lsp = { - host = null; - port = null; - cmd_env = null; + host.__raw = "nil"; + port.__raw = "nil"; + cmd_env.__raw = "nil"; }; - tokenizer = null; + tokenizer.__raw = "nil"; context_window = 1024; enable_suggestions_on_startup = true; enable_suggestions_on_files = "*"; diff --git a/tests/test-sources/plugins/by-name/lsp-signature/default.nix b/tests/test-sources/plugins/by-name/lsp-signature/default.nix index ed2256a1..194d00b6 100644 --- a/tests/test-sources/plugins/by-name/lsp-signature/default.nix +++ b/tests/test-sources/plugins/by-name/lsp-signature/default.nix @@ -63,19 +63,19 @@ hi_parameter = "LspSignatureActiveParameter"; handler_opts.border = "rounded"; always_trigger = false; - auto_close_after = "nil"; - extra_trigger_chars = [ ]; + auto_close_after.__raw = "nil"; + extra_trigger_chars.__empty = { }; zindex = 200; padding = ""; - transparency = "nil"; + transparency.__raw = "nil"; shadow_blend = 36; shadow_guibg = "Green"; time_interval = 200; - toggle_key = null; + toggle_key.__raw = "nil"; toggle_flip_floatwin_setting = false; - select_signature_key = null; - move_cursor_key = null; - keymaps = [ ]; + select_signature_key.__raw = "nil"; + move_cursor_key.__raw = "nil"; + keymaps.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/lsp-status/default.nix b/tests/test-sources/plugins/by-name/lsp-status/default.nix index 44af92e8..6cb40061 100644 --- a/tests/test-sources/plugins/by-name/lsp-status/default.nix +++ b/tests/test-sources/plugins/by-name/lsp-status/default.nix @@ -13,7 +13,7 @@ enable = true; settings = { - kind_labels = { }; + kind_labels.__empty = { }; select_symbol = ""; current_function = true; show_filename = true; diff --git a/tests/test-sources/plugins/by-name/lspkind/default.nix b/tests/test-sources/plugins/by-name/lspkind/default.nix index 1cbf5282..2190b3ec 100644 --- a/tests/test-sources/plugins/by-name/lspkind/default.nix +++ b/tests/test-sources/plugins/by-name/lspkind/default.nix @@ -20,7 +20,7 @@ settings = { mode = "symbol_text"; preset = "codicons"; - symbol_map = null; + symbol_map.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/lspsaga/default.nix b/tests/test-sources/plugins/by-name/lspsaga/default.nix index c02d4d77..8f669a4f 100644 --- a/tests/test-sources/plugins/by-name/lspsaga/default.nix +++ b/tests/test-sources/plugins/by-name/lspsaga/default.nix @@ -24,7 +24,7 @@ "━" "┏" ]; - kind = { }; + kind.__empty = { }; imp_sign = "󰳛 "; }; hover = { @@ -87,7 +87,7 @@ default = "ref+imp"; layout = "float"; silent = false; - filter = { }; + filter.__empty = { }; keys = { shuttle = "[w"; toggle_or_open = "o"; diff --git a/tests/test-sources/plugins/by-name/markdown-preview/default.nix b/tests/test-sources/plugins/by-name/markdown-preview/default.nix index 96c019b4..dbac2c6f 100644 --- a/tests/test-sources/plugins/by-name/markdown-preview/default.nix +++ b/tests/test-sources/plugins/by-name/markdown-preview/default.nix @@ -18,18 +18,18 @@ echo_preview_url = 1; browser_func = ""; preview_options = { - mkit = [ ]; - katex = [ ]; - uml = [ ]; - maid = [ ]; + mkit.__empty = { }; + katex.__empty = { }; + uml.__empty = { }; + maid.__empty = { }; disable_sync_scroll = 0; sync_scroll_type = "middle"; hide_yaml_meta = 1; - sequence_diagrams = [ ]; - flowchart_diagrams = [ ]; + sequence_diagrams.__empty = { }; + flowchart_diagrams.__empty = { }; content_editable = 0; disable_filename = 0; - toc = [ ]; + toc.__empty = { }; }; markdown_css = "/Users/username/markdown.css"; highlight_css.__raw = "vim.fn.expand('~/highlight.css')"; diff --git a/tests/test-sources/plugins/by-name/markview/default.nix b/tests/test-sources/plugins/by-name/markview/default.nix index 91a31d66..ff074dd3 100644 --- a/tests/test-sources/plugins/by-name/markview/default.nix +++ b/tests/test-sources/plugins/by-name/markview/default.nix @@ -10,18 +10,18 @@ settings = { preview = { enable = true; - buf_ignore = [ ]; + buf_ignore.__empty = { }; icon_provider = "internal"; - filetypes = [ ]; - hybrid_modes = [ ]; - ignore_previews = [ ]; + filetypes.__empty = { }; + hybrid_modes.__empty = { }; + ignore_previews.__empty = { }; max_buf_lines = 1000; - modes = [ ]; + modes.__empty = { }; render_distance = [ 200 200 ]; - splitview_winopts = { }; + splitview_winopts.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/minuet/default.nix b/tests/test-sources/plugins/by-name/minuet/default.nix index 7d42ef51..6d468af5 100644 --- a/tests/test-sources/plugins/by-name/minuet/default.nix +++ b/tests/test-sources/plugins/by-name/minuet/default.nix @@ -15,22 +15,22 @@ enable_auto_complete = true; }; lsp = { - enabled_ft = [ ]; - disabled_ft = [ ]; - enabled_auto_trigger_ft = [ ]; - disabled_auto_trigger_ft = [ ]; + enabled_ft.__empty = { }; + disabled_ft.__empty = { }; + enabled_auto_trigger_ft.__empty = { }; + disabled_auto_trigger_ft.__empty = { }; warn_on_blink_or_cmp = true; }; virtualtext = { - auto_trigger_ft = [ ]; - auto_trigger_ignore_ft = [ ]; + auto_trigger_ft.__empty = { }; + auto_trigger_ignore_ft.__empty = { }; keymap = { - accept = null; - accept_line = null; - accept_n_lines = null; - next = null; - prev = null; - dismiss = null; + accept.__raw = "nil"; + accept_line.__raw = "nil"; + accept_n_lines.__raw = "nil"; + next.__raw = "nil"; + prev.__raw = "nil"; + dismiss.__raw = "nil"; }; show_on_completion_menu = false; }; @@ -44,8 +44,8 @@ add_single_line_entry = true; n_completions = 3; after_cursor_filter_length = 15; - proxy = null; - provider_options = { }; + proxy.__raw = "nil"; + provider_options.__empty = { }; default_system = { template = "..."; prompt = "..."; @@ -66,7 +66,7 @@ default_chat_input = [ "..." ]; default_few_shots_prefix_first = [ "..." ]; default_chat_input_prefix_first = [ "..." ]; - presets = [ ]; + presets.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/mkdnflow/default.nix b/tests/test-sources/plugins/by-name/mkdnflow/default.nix index ec51a6bf..d2b76039 100644 --- a/tests/test-sources/plugins/by-name/mkdnflow/default.nix +++ b/tests/test-sources/plugins/by-name/mkdnflow/default.nix @@ -36,7 +36,7 @@ }; wrap = false; bib = { - default_path = null; + default_path.__raw = "nil"; find_in_root = true; }; silent = false; @@ -44,7 +44,7 @@ style = "markdown"; conceal = false; context = 0; - implicit_extension = null; + implicit_extension.__raw = "nil"; transform_explicit = false; transform_implicit = '' function(text) diff --git a/tests/test-sources/plugins/by-name/modicator/default.nix b/tests/test-sources/plugins/by-name/modicator/default.nix index d6db8377..71b3a11f 100644 --- a/tests/test-sources/plugins/by-name/modicator/default.nix +++ b/tests/test-sources/plugins/by-name/modicator/default.nix @@ -19,7 +19,7 @@ integration = { lualine = { enabled = true; - mode_section = null; + mode_section.__raw = "nil"; highlight = "bg"; }; }; diff --git a/tests/test-sources/plugins/by-name/molten/default.nix b/tests/test-sources/plugins/by-name/molten/default.nix index bf460230..d446801b 100644 --- a/tests/test-sources/plugins/by-name/molten/default.nix +++ b/tests/test-sources/plugins/by-name/molten/default.nix @@ -13,11 +13,11 @@ auto_open_html_in_browser = false; auto_open_output = true; cover_empty_lines = false; - cover_lines_starting_with = [ ]; + cover_lines_starting_with.__empty = { }; copy_output = false; enter_output_behavior = "open_then_enter"; image_provider = "none"; - open_cmd = null; + open_cmd.__raw = "nil"; output_crop_border = true; output_show_more = false; output_virt_lines = false; diff --git a/tests/test-sources/plugins/by-name/multicursors/default.nix b/tests/test-sources/plugins/by-name/multicursors/default.nix index 5131ecc9..764446c3 100644 --- a/tests/test-sources/plugins/by-name/multicursors/default.nix +++ b/tests/test-sources/plugins/by-name/multicursors/default.nix @@ -33,7 +33,7 @@ insert = true; extend = true; config = { - column_count = null; + column_count.__raw = "nil"; max_hint_length = 25; }; }; @@ -82,15 +82,15 @@ }; }; }; - insert_keys = null; - extend_keys = null; + insert_keys.__raw = "nil"; + extend_keys.__raw = "nil"; hint_config = { type = "window"; position = "bottom"; offset = 0; border = "none"; show_name = true; - funcs = null; + funcs.__raw = "nil"; }; generate_hints = { normal = false; diff --git a/tests/test-sources/plugins/by-name/neo-tree/default.nix b/tests/test-sources/plugins/by-name/neo-tree/default.nix index dcf8cba6..170e891c 100644 --- a/tests/test-sources/plugins/by-name/neo-tree/default.nix +++ b/tests/test-sources/plugins/by-name/neo-tree/default.nix @@ -65,7 +65,7 @@ popup_border_style = "NC"; resize_timer_interval = 500; sort_case_insensitive = false; - sort_function = "nil"; + sort_function.__raw = "nil"; use_popups_for_input = true; use_default_mappings = true; source_selector = { @@ -93,14 +93,14 @@ content_layout = "start"; tabs_layout = "equal"; truncation_character = "…"; - tabs_min_width = null; - tabs_max_width = null; + tabs_min_width.__raw = "nil"; + tabs_max_width.__raw = "nil"; padding = 0; separator = { left = "▏"; right = "▕"; }; - separator_active = null; + separator_active.__raw = "nil"; show_separator_on_edge = false; highlight_tab = "NeoTreeTabInactive"; highlight_tab_active = "NeoTreeTabActive"; @@ -154,7 +154,7 @@ indent_marker = "│"; last_indent_marker = "└"; highlight = "NeoTreeIndentMarker"; - with_expanders = null; + with_expanders.__raw = "nil"; expander_collapsed = ""; expander_expanded = ""; expander_highlight = "NeoTreeExpander"; @@ -276,7 +276,7 @@ "bufnr" ]; }; - nesting_rules = { }; + nesting_rules.__empty = { }; window = { position = "left"; width = 40; @@ -380,10 +380,10 @@ ".DS_Store" "thumbs.db" ]; - hide_by_pattern = [ ]; - always_show = [ ]; - never_show = [ ]; - never_show_by_pattern = [ ]; + hide_by_pattern.__empty = { }; + always_show.__empty = { }; + never_show.__empty = { }; + never_show_by_pattern.__empty = { }; }; find_by_full_path_words = false; find_command = "fd"; diff --git a/tests/test-sources/plugins/by-name/neoclip/default.nix b/tests/test-sources/plugins/by-name/neoclip/default.nix index feb28e40..89bd7286 100644 --- a/tests/test-sources/plugins/by-name/neoclip/default.nix +++ b/tests/test-sources/plugins/by-name/neoclip/default.nix @@ -19,7 +19,7 @@ enable = true; settings = { - filter = null; + filter.__raw = "nil"; preview = true; default_register = "\""; content_spec_column = false; @@ -30,20 +30,20 @@ select = ""; paste = ""; paste_behind = ""; - custom = { }; + custom.__empty = { }; }; n = { select = ""; paste = "p"; paste_behind = "P"; - custom = { }; + custom.__empty = { }; }; }; fzf = { select = "default"; paste = "ctrl-l"; paste_behind = "ctrl-h"; - custom = { }; + custom.__empty = { }; }; }; }; @@ -60,9 +60,9 @@ length_limit = 1048576; continuous_sync = false; db_path.__raw = "vim.fn.stdpath('data') .. '/databases/neoclip.sqlite3'"; - filter = null; + filter.__raw = "nil"; preview = true; - prompt = null; + prompt.__raw = "nil"; default_register = "\""; default_register_macros = "q"; enable_macro_history = true; @@ -93,7 +93,7 @@ replay = ""; delete = ""; edit = ""; - custom = { }; + custom.__empty = { }; }; n = { select = ""; @@ -102,14 +102,14 @@ replay = "q"; delete = "d"; edit = "e"; - custom = { }; + custom.__empty = { }; }; }; fzf = { select = "default"; paste = "ctrl-p"; paste_behind = "ctrl-k"; - custom = { }; + custom.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/neocord/default.nix b/tests/test-sources/plugins/by-name/neocord/default.nix index 00c9c2e0..62474303 100644 --- a/tests/test-sources/plugins/by-name/neocord/default.nix +++ b/tests/test-sources/plugins/by-name/neocord/default.nix @@ -14,13 +14,13 @@ settings = { # General options. logo = "auto"; - logo_tooltip = null; + logo_tooltip.__raw = "nil"; main_image = "language"; client_id = "1157438221865717891"; - log_level = null; + log_level.__raw = "nil"; debounce_timeout = 10; - blacklist = [ ]; - file_assets = null; + blacklist.__empty = { }; + file_assets.__raw = "nil"; show_time = true; global_timer = false; @@ -50,11 +50,11 @@ logo_tooltip = "Nixvim"; main_image = "language"; client_id = "1157438221865717891"; - log_level = null; + log_level.__raw = "nil"; debounce_timeout = 10; enable_line_number = false; - blacklist = [ ]; - file_assets = null; + blacklist.__empty = { }; + file_assets.__raw = "nil"; show_time = true; global_timer = false; diff --git a/tests/test-sources/plugins/by-name/neogit/default.nix b/tests/test-sources/plugins/by-name/neogit/default.nix index 8a6b8624..4aadf40f 100644 --- a/tests/test-sources/plugins/by-name/neogit/default.nix +++ b/tests/test-sources/plugins/by-name/neogit/default.nix @@ -19,8 +19,8 @@ disable_signs = false; prompt_force_push = true; graph_style = "ascii"; - commit_date_format = null; - log_date_format = null; + commit_date_format.__raw = "nil"; + log_date_format.__raw = "nil"; process_spinner = false; filewatcher.enabled = true; telescope_sorter.__raw = '' @@ -50,7 +50,7 @@ tree = ""; }; }; - highlight = { }; + highlight.__empty = { }; disable_insert_on_commit = "auto"; use_per_project_settings = true; remember_settings = true; @@ -132,11 +132,11 @@ ]; }; integrations = { - telescope = null; - diffview = null; - fzf_lua = null; - mini_pick = null; - snacks = null; + telescope.__raw = "nil"; + diffview.__raw = "nil"; + fzf_lua.__raw = "nil"; + mini_pick.__raw = "nil"; + snacks.__raw = "nil"; }; sections = { sequencer = { @@ -188,7 +188,7 @@ hidden = false; }; }; - ignored_settings = [ ]; + ignored_settings.__empty = { }; mappings = { commit_editor = { q = "Close"; diff --git a/tests/test-sources/plugins/by-name/neorg/default.nix b/tests/test-sources/plugins/by-name/neorg/default.nix index 5238f0bb..30995577 100644 --- a/tests/test-sources/plugins/by-name/neorg/default.nix +++ b/tests/test-sources/plugins/by-name/neorg/default.nix @@ -15,9 +15,9 @@ enable = true; settings = { - hook = null; + hook.__raw = "nil"; lazy_loading = false; - load = { }; + load.__empty = { }; logger = { plugin = "neorg"; use_console = true; diff --git a/tests/test-sources/plugins/by-name/neoscroll/default.nix b/tests/test-sources/plugins/by-name/neoscroll/default.nix index f5ac3e4b..6acd46f2 100644 --- a/tests/test-sources/plugins/by-name/neoscroll/default.nix +++ b/tests/test-sources/plugins/by-name/neoscroll/default.nix @@ -60,9 +60,9 @@ step_eof = true; respect_scrolloff = false; cursor_scrolls_alone = true; - easing_function = null; - pre_hook = null; - post_hook = null; + easing_function.__raw = "nil"; + pre_hook.__raw = "nil"; + post_hook.__raw = "nil"; performance_mode = false; }; }; diff --git a/tests/test-sources/plugins/by-name/neotest/dart.nix b/tests/test-sources/plugins/by-name/neotest/dart.nix index 707d8c91..9f2eede2 100644 --- a/tests/test-sources/plugins/by-name/neotest/dart.nix +++ b/tests/test-sources/plugins/by-name/neotest/dart.nix @@ -11,7 +11,7 @@ settings = { command = "flutter"; use_lsp = true; - custom_test_method_names = [ ]; + custom_test_method_names.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/neotest/default.nix b/tests/test-sources/plugins/by-name/neotest/default.nix index 2ec9ade9..38144958 100644 --- a/tests/test-sources/plugins/by-name/neotest/default.nix +++ b/tests/test-sources/plugins/by-name/neotest/default.nix @@ -53,14 +53,14 @@ discovery = { enabled = true; concurrent = 0; - filter_dir = null; + filter_dir.__raw = "nil"; }; running = { concurrent = true; }; default_strategy = "integrated"; log_level = "warn"; - consumers = { }; + consumers.__empty = { }; icons = { child_indent = "│"; child_prefix = "├"; @@ -110,7 +110,7 @@ border = "rounded"; max_height = 0.6; max_width = 0.6; - options = { }; + options.__empty = { }; }; strategies = { integrated = { @@ -170,8 +170,8 @@ }; watch = { enabled = true; - symbol_queries = null; - filter_path = null; + symbol_queries.__raw = "nil"; + filter_path.__raw = "nil"; }; diagnostic = { enabled = true; diff --git a/tests/test-sources/plugins/by-name/neotest/foundry.nix b/tests/test-sources/plugins/by-name/neotest/foundry.nix index f8993117..a15216d3 100644 --- a/tests/test-sources/plugins/by-name/neotest/foundry.nix +++ b/tests/test-sources/plugins/by-name/neotest/foundry.nix @@ -10,8 +10,8 @@ settings = { foundryCommand = "forge test"; - foundryConfig = null; - env = { }; + foundryConfig.__raw = "nil"; + env.__empty = { }; cwd.__raw = '' function () return lib.files.match_root_pattern("foundry.toml") diff --git a/tests/test-sources/plugins/by-name/neotest/gtest.nix b/tests/test-sources/plugins/by-name/neotest/gtest.nix index f6bcd602..2cdf9ea5 100644 --- a/tests/test-sources/plugins/by-name/neotest/gtest.nix +++ b/tests/test-sources/plugins/by-name/neotest/gtest.nix @@ -33,7 +33,7 @@ history_size = 3; parsing_throttle_ms = 10; mappings = { - configure = null; + configure.__raw = "nil"; }; summary_view = { header_length = 80; @@ -45,7 +45,7 @@ bold = "\27[1m"; }; }; - extra_args = [ ]; + extra_args.__empty = { }; filter_dir.__raw = '' function(name, rel_path, root) end diff --git a/tests/test-sources/plugins/by-name/neotest/phpunit.nix b/tests/test-sources/plugins/by-name/neotest/phpunit.nix index a7ef6db8..6c99f256 100644 --- a/tests/test-sources/plugins/by-name/neotest/phpunit.nix +++ b/tests/test-sources/plugins/by-name/neotest/phpunit.nix @@ -26,7 +26,7 @@ env = { XDEBUG_CONFIG = "idekey=neotest"; }; - dap = null; + dap.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/no-neck-pain/default.nix b/tests/test-sources/plugins/by-name/no-neck-pain/default.nix index 66a973f8..5303d36e 100644 --- a/tests/test-sources/plugins/by-name/no-neck-pain/default.nix +++ b/tests/test-sources/plugins/by-name/no-neck-pain/default.nix @@ -28,7 +28,7 @@ buffers = { setNames = false; colors = { - background = null; + background.__raw = "nil"; blend = 0; }; left = { diff --git a/tests/test-sources/plugins/by-name/noice/default.nix b/tests/test-sources/plugins/by-name/noice/default.nix index 4da55c68..b1d2e1d7 100644 --- a/tests/test-sources/plugins/by-name/noice/default.nix +++ b/tests/test-sources/plugins/by-name/noice/default.nix @@ -11,7 +11,7 @@ cmdline = { enabled = true; view = "cmdline_popup"; - opts = { }; + opts.__empty = { }; format = { cmdline = { pattern = "^:"; @@ -44,7 +44,7 @@ pattern = "^:%s*he?l?p?%s+"; icon = ""; }; - input = { }; + input.__empty = { }; }; }; messages = { @@ -58,7 +58,7 @@ popupmenu = { enabled = true; backend = "nui"; - kind_icons = { }; + kind_icons.__empty = { }; }; redirect = { view = "popup"; @@ -147,8 +147,8 @@ }; hover = { enabled = true; - view = null; - opts = { }; + view.__raw = "nil"; + opts.__empty = { }; }; signature = { enabled = true; @@ -158,13 +158,13 @@ luasnip = true; throttle = 50; }; - view = null; - opts = { }; + view.__raw = "nil"; + opts.__empty = { }; }; message = { enabled = true; view = "notify"; - opts = { }; + opts.__empty = { }; }; documentation = { view = "hover"; @@ -213,10 +213,10 @@ lsp_doc_border = false; }; throttle = 1000 / 30; - views = { }; - routes = [ ]; - status = { }; - format = { }; + views.__empty = { }; + routes.__empty = { }; + status.__empty = { }; + format.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/none-ls/default.nix b/tests/test-sources/plugins/by-name/none-ls/default.nix index c71f5549..d9dfd36c 100644 --- a/tests/test-sources/plugins/by-name/none-ls/default.nix +++ b/tests/test-sources/plugins/by-name/none-ls/default.nix @@ -21,24 +21,27 @@ enable = true; settings = { - border = null; + border.__raw = "nil"; cmd = [ "nvim" ]; debounce = 250; debug = false; default_timeout = 5000; - diagnostic_config = { }; + diagnostic_config.__empty = { }; diagnostics_format = "#{m}"; fallback_severity.__raw = "vim.diagnostic.severity.ERROR"; log_level = "warn"; notify_format = "[null-ls] %s"; - on_attach = null; - on_init = null; - on_exit = null; + on_attach.__raw = "nil"; + on_init.__raw = "nil"; + on_exit.__raw = "nil"; root_dir = "require('null-ls.utils').root_pattern('.null-ls-root', 'Makefile', '.git')"; - root_dir_async = null; - should_attach = null; + root_dir_async.__raw = "nil"; + should_attach.__raw = "nil"; + + # FIXME: This option can't take raw lua sources = null; - temp_dir = null; + + temp_dir.__raw = "nil"; update_in_insert = false; }; }; diff --git a/tests/test-sources/plugins/by-name/notebook-navigator/default.nix b/tests/test-sources/plugins/by-name/notebook-navigator/default.nix index 2d6adefc..77f5b624 100644 --- a/tests/test-sources/plugins/by-name/notebook-navigator/default.nix +++ b/tests/test-sources/plugins/by-name/notebook-navigator/default.nix @@ -13,8 +13,8 @@ enable = true; settings = { - cell_markers = { }; - activate_hydra_keys = null; + cell_markers.__empty = { }; + activate_hydra_keys.__raw = "nil"; show_hydra_hint = true; hydra_keys = { comment = "c"; diff --git a/tests/test-sources/plugins/by-name/notify/default.nix b/tests/test-sources/plugins/by-name/notify/default.nix index cf4bf3f2..73178f5b 100644 --- a/tests/test-sources/plugins/by-name/notify/default.nix +++ b/tests/test-sources/plugins/by-name/notify/default.nix @@ -10,8 +10,8 @@ settings = { level = "info"; timeout = 5000; - max_width = null; - max_height = null; + max_width.__raw = "nil"; + max_height.__raw = "nil"; stages = "fade_in_slide_out"; background_colour = "NotifyBackground"; icons = { @@ -21,8 +21,8 @@ debug = ""; trace = "✎"; }; - on_open = null; - on_close = null; + on_open.__raw = "nil"; + on_close.__raw = "nil"; render = "default"; minimum_width = 50; fps = 30; diff --git a/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix b/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix index 429cbdc0..f9e35310 100644 --- a/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix +++ b/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix @@ -12,7 +12,7 @@ hide_in_unfocused_buffer = true; link_highlights = true; validate_config = "auto"; - action_kinds = null; + action_kinds.__raw = "nil"; sign = { enabled = true; text = "💡"; @@ -29,7 +29,7 @@ enabled = false; text = "💡"; hl = "LightBulbFloatWin"; - win_opts = { }; + win_opts.__empty = { }; }; status_text = { enabled = false; @@ -54,8 +54,8 @@ ]; }; ignore = { - clients = [ ]; - ft = [ ]; + clients.__empty = { }; + ft.__empty = { }; actions_without_kind = false; }; }; diff --git a/tests/test-sources/plugins/by-name/nvim-snippets/default.nix b/tests/test-sources/plugins/by-name/nvim-snippets/default.nix index a468d9bd..b6bb58ca 100644 --- a/tests/test-sources/plugins/by-name/nvim-snippets/default.nix +++ b/tests/test-sources/plugins/by-name/nvim-snippets/default.nix @@ -16,8 +16,8 @@ create_autocmd = false; create_cmp_source = true; friendly_snippets = false; - ignored_filetypes = null; - extended_filetypes = { }; + ignored_filetypes.__raw = "nil"; + extended_filetypes.__empty = { }; global_snippets = [ "all" ]; search_paths = [ { __raw = "vim.fn.stdpath('config') .. '/snippets'"; } ]; }; diff --git a/tests/test-sources/plugins/by-name/nvim-tree/default.nix b/tests/test-sources/plugins/by-name/nvim-tree/default.nix index 3f55233e..cc0b7936 100644 --- a/tests/test-sources/plugins/by-name/nvim-tree/default.nix +++ b/tests/test-sources/plugins/by-name/nvim-tree/default.nix @@ -19,7 +19,7 @@ sort_by = "name"; hijack_unnamed_buffer_when_opening = false; hijack_cursor = false; - root_dirs = [ ]; + root_dirs.__empty = { }; prefer_startup_root = false; sync_root_with_cwd = false; reload_on_bufenter = false; @@ -31,11 +31,11 @@ update_focused_file = { enable = false; update_root = false; - ignore_list = [ ]; + ignore_list.__empty = { }; }; system_open = { cmd = ""; - args = [ ]; + args.__empty = { }; }; diagnostics = { enable = false; @@ -68,7 +68,7 @@ filesystem_watchers = { enable = true; debounce_delay = 50; - ignore_dirs = [ ]; + ignore_dirs.__empty = { }; }; on_attach = "default"; select_prompts = false; @@ -168,8 +168,8 @@ dotfiles = false; git_clean = false; no_buffer = false; - custom = [ ]; - exclude = [ ]; + custom.__empty = { }; + exclude.__empty = { }; }; actions = { change_dir = { @@ -179,7 +179,7 @@ }; expand_all = { max_folder_discovery = 300; - exclude = [ ]; + exclude.__empty = { }; }; file_popup = { open_win_config = { @@ -227,7 +227,7 @@ sync = { open = false; close = false; - ignore = [ ]; + ignore.__empty = { }; }; }; notify = { diff --git a/tests/test-sources/plugins/by-name/nvim-ufo/default.nix b/tests/test-sources/plugins/by-name/nvim-ufo/default.nix index 87db4214..45e0c878 100644 --- a/tests/test-sources/plugins/by-name/nvim-ufo/default.nix +++ b/tests/test-sources/plugins/by-name/nvim-ufo/default.nix @@ -60,11 +60,11 @@ enable = true; settings = { open_fold_hl_timeout = 400; - provider_selector = null; + provider_selector.__raw = "nil"; close_fold_kinds_for_ft = { - default = { }; + default.__empty = { }; }; - fold_virt_text_handler = null; + fold_virt_text_handler.__raw = "nil"; enable_get_fold_virt_text = false; preview = { win_config = { diff --git a/tests/test-sources/plugins/by-name/obsidian/default.nix b/tests/test-sources/plugins/by-name/obsidian/default.nix index 7eb341c2..00e88460 100644 --- a/tests/test-sources/plugins/by-name/obsidian/default.nix +++ b/tests/test-sources/plugins/by-name/obsidian/default.nix @@ -29,7 +29,7 @@ # TODO 2025-07-25 explicitly disable legacy commands to suppress deprecation warning legacy_commands = false; - dir = null; + dir.__raw = "nil"; workspaces = [ { name = "work"; @@ -77,7 +77,7 @@ enable = false; settings = { - dir = null; + dir.__raw = "nil"; workspaces = [ { name = "work"; @@ -94,7 +94,7 @@ # subdir = "templates"; date_format = "%Y-%m-%d"; time_format = "%H:%M"; - substitutions = { }; + substitutions.__empty = { }; }; new_notes_location = "current_dir"; note_id_func = '' diff --git a/tests/test-sources/plugins/by-name/octo/default.nix b/tests/test-sources/plugins/by-name/octo/default.nix index dec99d5d..52ee7af2 100644 --- a/tests/test-sources/plugins/by-name/octo/default.nix +++ b/tests/test-sources/plugins/by-name/octo/default.nix @@ -78,8 +78,8 @@ "origin" ]; - gh_env = { }; - ssh_aliases = { }; + gh_env.__empty = { }; + ssh_aliases.__empty = { }; picker_config = { use_emojis = false; diff --git a/tests/test-sources/plugins/by-name/oil/default.nix b/tests/test-sources/plugins/by-name/oil/default.nix index fceb8412..181f372c 100644 --- a/tests/test-sources/plugins/by-name/oil/default.nix +++ b/tests/test-sources/plugins/by-name/oil/default.nix @@ -42,7 +42,7 @@ { __unkeyed = "type"; highlight = "Foo"; - icons = { }; + icons.__empty = { }; } { @@ -167,13 +167,13 @@ 40 0.4 ]; - width = null; + width.__raw = "nil"; max_height = 0.9; min_height = [ 5 0.1 ]; - height = null; + height.__raw = "nil"; border = "rounded"; win_options = { winblend = 0; @@ -186,13 +186,13 @@ 40 0.4 ]; - width = null; + width.__raw = "nil"; max_height = 0.9; min_height = [ 5 0.1 ]; - height = null; + height.__raw = "nil"; border = "rounded"; minimized_border = "none"; win_options = { diff --git a/tests/test-sources/plugins/by-name/opencode/default.nix b/tests/test-sources/plugins/by-name/opencode/default.nix index 24df0800..1a2c5d34 100644 --- a/tests/test-sources/plugins/by-name/opencode/default.nix +++ b/tests/test-sources/plugins/by-name/opencode/default.nix @@ -7,7 +7,7 @@ plugins.opencode = { enable = true; settings = { - port = null; + port.__raw = "nil"; auto_reload = true; auto_register_cmp_sources = [ "opencode" diff --git a/tests/test-sources/plugins/by-name/overseer/default.nix b/tests/test-sources/plugins/by-name/overseer/default.nix index ef9679d8..5defa106 100644 --- a/tests/test-sources/plugins/by-name/overseer/default.nix +++ b/tests/test-sources/plugins/by-name/overseer/default.nix @@ -20,13 +20,13 @@ 40 0.1 ]; - width = null; + width.__raw = "nil"; max_height = [ 20 0.1 ]; min_height = 8; - height = null; + height.__raw = "nil"; separator = "────────────────────────────────────────"; direction = "bottom"; bindings = { @@ -53,16 +53,16 @@ "q" = "Close"; }; }; - actions = { }; + actions.__empty = { }; form = { border = "rounded"; zindex = 40; min_width = 80; max_width = 0.9; - width = null; + width.__raw = "nil"; min_height = 10; max_height = 0.9; - height = null; + height.__raw = "nil"; win_opts = { winblend = 0; }; @@ -105,10 +105,10 @@ zindex = 40; min_width = 20; max_width = 0.5; - width = null; + width.__raw = "nil"; min_height = 6; max_height = 0.9; - height = null; + height.__raw = "nil"; win_opts = { winblend = 0; }; @@ -122,7 +122,7 @@ }; help_win = { border = "rounded"; - win_opts = { }; + win_opts.__empty = { }; }; component_aliases = { default = [ @@ -152,7 +152,7 @@ }; autostart_on_load = true; }; - preload_components = [ ]; + preload_components.__empty = { }; default_template_prompt = "allow"; template_timeout = 3000; template_cache_threshold = 100; diff --git a/tests/test-sources/plugins/by-name/papis/default.nix b/tests/test-sources/plugins/by-name/papis/default.nix index 78bf305b..19abecf6 100644 --- a/tests/test-sources/plugins/by-name/papis/default.nix +++ b/tests/test-sources/plugins/by-name/papis/default.nix @@ -315,7 +315,7 @@ key_name_conversions = { time_added = "time-added"; }; - tag_format = null; + tag_format.__raw = "nil"; required_keys = [ "papis_id" "ref" diff --git a/tests/test-sources/plugins/by-name/parrot/default.nix b/tests/test-sources/plugins/by-name/parrot/default.nix index 0790172e..7a541651 100644 --- a/tests/test-sources/plugins/by-name/parrot/default.nix +++ b/tests/test-sources/plugins/by-name/parrot/default.nix @@ -41,7 +41,7 @@ }; }; cmd_prefix = "Prt"; - curl_params = [ ]; + curl_params.__empty = { }; state_dir.__raw = "vim.fn.stdpath('data'):gsub('/$', '') .. '/parrot/persisted'"; chat_dir.__raw = "vim.fn.stdpath('data'):gsub('/$', '') .. '/parrot/chats'"; chat_user_prefix = "🗨:"; diff --git a/tests/test-sources/plugins/by-name/pckr/default.nix b/tests/test-sources/plugins/by-name/pckr/default.nix index ba21351e..53ac1248 100644 --- a/tests/test-sources/plugins/by-name/pckr/default.nix +++ b/tests/test-sources/plugins/by-name/pckr/default.nix @@ -9,7 +9,7 @@ settings = { pack_dir.__raw = "vim.fs.joinpath(vim.fn.stdpath('data'), 'site')"; - max_jobs = null; + max_jobs.__raw = "nil"; autoremove = false; autoinstall = true; git = { diff --git a/tests/test-sources/plugins/by-name/persisted/default.nix b/tests/test-sources/plugins/by-name/persisted/default.nix index 7c97674a..43d4ab15 100644 --- a/tests/test-sources/plugins/by-name/persisted/default.nix +++ b/tests/test-sources/plugins/by-name/persisted/default.nix @@ -19,8 +19,8 @@ use_git_branch = false; autoload = false; on_autoload_no_session.__raw = "function() end"; - allowed_dirs = [ ]; - ignored_dirs = [ ]; + allowed_dirs.__empty = { }; + ignored_dirs.__empty = { }; telescope = { mappings = { copy_session = ""; diff --git a/tests/test-sources/plugins/by-name/presence/default.nix b/tests/test-sources/plugins/by-name/presence/default.nix index 114b3ac4..a00dafbf 100644 --- a/tests/test-sources/plugins/by-name/presence/default.nix +++ b/tests/test-sources/plugins/by-name/presence/default.nix @@ -11,13 +11,13 @@ neovim_image_text = "The One True Text Editor"; main_image = "neovim"; client_id = "793271441293967371"; - log_level = null; + log_level.__raw = "nil"; debounce_timeout = 10; enable_line_number = false; - blacklist = [ ]; - file_assets = null; + blacklist.__empty = { }; + file_assets.__raw = "nil"; show_time = true; - buttons = [ ]; + buttons.__empty = { }; editing_text = "Editing %s"; file_explorer_text = "Browsing %s"; git_commit_text = "Committing changes"; diff --git a/tests/test-sources/plugins/by-name/project-nvim/default.nix b/tests/test-sources/plugins/by-name/project-nvim/default.nix index e6a4870f..4d1d75bf 100644 --- a/tests/test-sources/plugins/by-name/project-nvim/default.nix +++ b/tests/test-sources/plugins/by-name/project-nvim/default.nix @@ -44,8 +44,8 @@ "Makefile" "package.json" ]; - ignore_lsp = [ ]; - exclude_dirs = [ ]; + ignore_lsp.__empty = { }; + exclude_dirs.__empty = { }; show_hidden = false; silent_chdir = true; scope_chdir = "global"; diff --git a/tests/test-sources/plugins/by-name/projections/default.nix b/tests/test-sources/plugins/by-name/projections/default.nix index 07638d8f..98c87619 100644 --- a/tests/test-sources/plugins/by-name/projections/default.nix +++ b/tests/test-sources/plugins/by-name/projections/default.nix @@ -9,14 +9,14 @@ settings = { store_hooks = { - pre = null; - post = null; + pre.__raw = "nil"; + post.__raw = "nil"; }; restore_hooks = { - pre = null; - post = null; + pre.__raw = "nil"; + post.__raw = "nil"; }; - workspaces = [ ]; + workspaces.__empty = { }; patterns = [ ".git" ".svn" diff --git a/tests/test-sources/plugins/by-name/qmk/default.nix b/tests/test-sources/plugins/by-name/qmk/default.nix index 4c64f52c..b32ed54a 100644 --- a/tests/test-sources/plugins/by-name/qmk/default.nix +++ b/tests/test-sources/plugins/by-name/qmk/default.nix @@ -27,7 +27,7 @@ auto_format_pattern = "*keymap.c"; comment_preview = { position = "top"; - keymap_overrides = { }; + keymap_overrides.__empty = { }; symbols = { space = " "; horz = "─"; diff --git a/tests/test-sources/plugins/by-name/quarto/default.nix b/tests/test-sources/plugins/by-name/quarto/default.nix index d28c1837..aeafc105 100644 --- a/tests/test-sources/plugins/by-name/quarto/default.nix +++ b/tests/test-sources/plugins/by-name/quarto/default.nix @@ -37,8 +37,8 @@ }; codeRunner = { enabled = false; - default_method = null; - ft_runners = { }; + default_method.__raw = "nil"; + ft_runners.__empty = { }; never_run = [ "yaml" ]; }; }; diff --git a/tests/test-sources/plugins/by-name/refactoring/default.nix b/tests/test-sources/plugins/by-name/refactoring/default.nix index 6fe52917..985fb04b 100644 --- a/tests/test-sources/plugins/by-name/refactoring/default.nix +++ b/tests/test-sources/plugins/by-name/refactoring/default.nix @@ -62,9 +62,9 @@ hpp = false; cxx = false; }; - printf_statements = { }; - print_var_statements = { }; - extract_var_statements = { }; + printf_statements.__empty = { }; + print_var_statements.__empty = { }; + extract_var_statements.__empty = { }; show_success_message = false; }; }; diff --git a/tests/test-sources/plugins/by-name/remote-nvim/default.nix b/tests/test-sources/plugins/by-name/remote-nvim/default.nix index 3425304c..31e96e09 100644 --- a/tests/test-sources/plugins/by-name/remote-nvim/default.nix +++ b/tests/test-sources/plugins/by-name/remote-nvim/default.nix @@ -13,8 +13,8 @@ docker_binary = "docker"; search_style = "current_dir_only"; dotfiles = { - path = null; - install_script = null; + path.__raw = "nil"; + install_script.__raw = "nil"; }; gpg_agent_forwarding = false; container_list = "running_only"; @@ -57,26 +57,26 @@ dirs = "*"; compression = { enabled = false; - additional_opts = { }; + additional_opts.__empty = { }; }; }; data = { base.__raw = ''vim.fn.stdpath("data")''; - dirs = { }; + dirs.__empty = { }; compression = { enabled = true; }; }; cache = { base.__raw = ''vim.fn.stdpath("cache")''; - dirs = { }; + dirs.__empty = { }; compression = { enabled = true; }; }; state = { base.__raw = ''vim.fn.stdpath("state")''; - dirs = { }; + dirs.__empty = { }; compression = { enabled = true; }; diff --git a/tests/test-sources/plugins/by-name/render-markdown/default.nix b/tests/test-sources/plugins/by-name/render-markdown/default.nix index 2f0bd214..c84fa92f 100644 --- a/tests/test-sources/plugins/by-name/render-markdown/default.nix +++ b/tests/test-sources/plugins/by-name/render-markdown/default.nix @@ -44,7 +44,7 @@ sign.enabled = false; }; }; - filetype = { }; + filetype.__empty = { }; }; log_level = "error"; padding.highlight = "Normal"; diff --git a/tests/test-sources/plugins/by-name/rest/default.nix b/tests/test-sources/plugins/by-name/rest/default.nix index 32e7ca69..77050905 100644 --- a/tests/test-sources/plugins/by-name/rest/default.nix +++ b/tests/test-sources/plugins/by-name/rest/default.nix @@ -13,7 +13,7 @@ enable = true; settings = { - custom_dynamic_variables = { }; + custom_dynamic_variables.__empty = { }; request = { skip_ssl_verification = false; hooks = { diff --git a/tests/test-sources/plugins/by-name/roslyn/default.nix b/tests/test-sources/plugins/by-name/roslyn/default.nix index 36fb3b4f..8925f288 100644 --- a/tests/test-sources/plugins/by-name/roslyn/default.nix +++ b/tests/test-sources/plugins/by-name/roslyn/default.nix @@ -16,8 +16,8 @@ enable = true; settings = { filewatching = "auto"; - choose_target = null; - ignore_target = null; + choose_target.__raw = "nil"; + ignore_target.__raw = "nil"; broad_search = false; lock_target = false; silent = false; diff --git a/tests/test-sources/plugins/by-name/rustaceanvim/default.nix b/tests/test-sources/plugins/by-name/rustaceanvim/default.nix index 7d5b0fd2..0e59c125 100644 --- a/tests/test-sources/plugins/by-name/rustaceanvim/default.nix +++ b/tests/test-sources/plugins/by-name/rustaceanvim/default.nix @@ -13,10 +13,10 @@ executor = "termopen"; test_executor = "background"; crate_test_executor = "background"; - cargo_override = null; + cargo_override.__raw = "nil"; enable_nextest = true; enable_clippy = true; - on_initialized = null; + on_initialized.__raw = "nil"; reload_workspace_from_cargo_toml = true; hover_actions = { replace_builtin_hover = true; @@ -31,7 +31,7 @@ }; crate_graph = { backend = "x11"; - output = null; + output.__raw = "nil"; full = true; enabled_graphviz_backends = [ "bmp" @@ -89,7 +89,7 @@ "xlib" "x11" ]; - pipe = null; + pipe.__raw = "nil"; }; open_url = "require('rustaceanvim.os').open_url"; }; @@ -109,7 +109,7 @@ return vim.fn.executable(rs_bin) == 1 end ''; - on_attach = null; + on_attach.__raw = "nil"; cmd = '' function() return { 'rust-analyzer', '--log-file', RustaceanConfig.server.logfile } @@ -126,7 +126,7 @@ }; dap = { autoload_configurations = true; - adapter = null; + adapter.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/scrollview/default.nix b/tests/test-sources/plugins/by-name/scrollview/default.nix index 200f60f3..ae17d127 100644 --- a/tests/test-sources/plugins/by-name/scrollview/default.nix +++ b/tests/test-sources/plugins/by-name/scrollview/default.nix @@ -15,7 +15,7 @@ column = 1; consider_border = false; current_only = false; - excluded_filetypes = [ ]; + excluded_filetypes.__empty = { }; floating_windows = false; hide_bar_for_insert = false; hide_on_intersect = false; @@ -29,7 +29,7 @@ winblend = 50; winblend_gui = 0; zindex = 40; - signs_hidden_for_insert = [ ]; + signs_hidden_for_insert.__empty = { }; signs_max_per_row = -1; signs_on_startup = [ "diagnostics" @@ -39,11 +39,11 @@ signs_overflow = "left"; signs_show_in_folds = false; changelist_previous_priority = 15; - changelist_previous_symbol = null; + changelist_previous_symbol.__raw = "nil"; changelist_current_priority = 10; changelist_current_symbol = "@"; changelist_next_priority = 5; - changelist_next_symbol = null; + changelist_next_symbol.__raw = "nil"; conflicts_bottom_priority = 80; conflicts_bottom_symbol = ">"; conflicts_middle_priority = 75; @@ -51,26 +51,26 @@ conflicts_top_priority = 70; conflicts_top_symbol = "<"; cursor_priority = 0; - cursor_symbol = null; + cursor_symbol.__raw = "nil"; diagnostics_error_priority = 60; diagnostics_error_symbol = "E"; diagnostics_hint_priority = 30; diagnostics_hint_symbol = "H"; diagnostics_info_priority = 40; diagnostics_info_symbol.__raw = "'I'"; # test rawLua support - diagnostics_severities = null; + diagnostics_severities.__raw = "nil"; diagnostics_warn_priority = 50; diagnostics_warn_symbol = "W"; folds_priority = 30; - folds_symbol = null; + folds_symbol.__raw = "nil"; latestchange_priority = 10; - latestchange_symbol = null; + latestchange_symbol.__raw = "nil"; loclist_priority = 45; - loclist_symbol = null; - marks_characters = null; + loclist_symbol.__raw = "nil"; + marks_characters.__raw = "nil"; marks_priority = 50; quickfix_priority = 45; - quickfix_symbol = null; + quickfix_symbol.__raw = "nil"; search_priority = 70; search_symbol = [ "=" @@ -80,9 +80,9 @@ spell_priority = 20; spell_symbol = "~"; textwidth_priority = 20; - textwidth_symbol = null; + textwidth_symbol.__raw = "nil"; trail_priority = 50; - trail_symbol = null; + trail_symbol.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/sg/default.nix b/tests/test-sources/plugins/by-name/sg/default.nix index 4de35970..e00ce227 100644 --- a/tests/test-sources/plugins/by-name/sg/default.nix +++ b/tests/test-sources/plugins/by-name/sg/default.nix @@ -17,7 +17,7 @@ enable_cody = false; accept_tos = false; chat = { - default_model = null; + default_model.__raw = "nil"; }; download_binaries = true; node_executable = "node"; @@ -30,7 +30,7 @@ vim.keymap.set("n", "K", vim.lsp.buf.hover, { buffer = bufnr }) end ''; - src_headers = null; + src_headers.__raw = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/sidekick/default.nix b/tests/test-sources/plugins/by-name/sidekick/default.nix index 286951dc..2e4786c0 100644 --- a/tests/test-sources/plugins/by-name/sidekick/default.nix +++ b/tests/test-sources/plugins/by-name/sidekick/default.nix @@ -46,8 +46,8 @@ watch = true; win = { config = lib.nixvim.mkRaw "function(terminal) end"; - wo = { }; - bo = { }; + wo.__empty = { }; + bo.__empty = { }; layout = "right"; float = { width = 0.9; @@ -166,7 +166,7 @@ row = false; col = false; }; - position = { }; + position.__empty = { }; }; }; debug = false; diff --git a/tests/test-sources/plugins/by-name/smartcolumn/default.nix b/tests/test-sources/plugins/by-name/smartcolumn/default.nix index 0495fd0d..3395b4e1 100644 --- a/tests/test-sources/plugins/by-name/smartcolumn/default.nix +++ b/tests/test-sources/plugins/by-name/smartcolumn/default.nix @@ -13,7 +13,7 @@ "markdown" ]; scope = "file"; - custom_colorcolumn = { }; + custom_colorcolumn.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/smear-cursor/default.nix b/tests/test-sources/plugins/by-name/smear-cursor/default.nix index 61049ed8..bcc2be0d 100644 --- a/tests/test-sources/plugins/by-name/smear-cursor/default.nix +++ b/tests/test-sources/plugins/by-name/smear-cursor/default.nix @@ -17,7 +17,7 @@ hide_target_hack = true; max_kept_windows = 50; windows_zindex = 300; - filetypes_disabled = [ ]; + filetypes_disabled.__empty = { }; time_interval = 17; delay_animation_start = 5; stiffness = 0.6; @@ -36,8 +36,8 @@ minimum_volume_factor = 0.7; max_length = 25; logging_level.__raw = "vim.log.levels.INFO"; - cursor_color = null; - normal_bg = null; + cursor_color.__raw = "nil"; + normal_bg.__raw = "nil"; transparent_bg_fallback_color = "303030"; cterm_cursor_colors = [ 240 diff --git a/tests/test-sources/plugins/by-name/sniprun/default.nix b/tests/test-sources/plugins/by-name/sniprun/default.nix index 591e68a1..17054626 100644 --- a/tests/test-sources/plugins/by-name/sniprun/default.nix +++ b/tests/test-sources/plugins/by-name/sniprun/default.nix @@ -8,10 +8,10 @@ enable = true; settings = { - selected_interpreters = [ ]; - repl_enable = [ ]; - repl_disable = [ ]; - interpreter_options = { }; + selected_interpreters.__empty = { }; + repl_enable.__empty = { }; + repl_disable.__empty = { }; + interpreter_options.__empty = { }; display = [ "Classic" "VirtualTextOk" diff --git a/tests/test-sources/plugins/by-name/specs/default.nix b/tests/test-sources/plugins/by-name/specs/default.nix index 6a84fb4c..9b4db7e3 100644 --- a/tests/test-sources/plugins/by-name/specs/default.nix +++ b/tests/test-sources/plugins/by-name/specs/default.nix @@ -30,7 +30,7 @@ end ''; }; - ignore_filetypes = { }; + ignore_filetypes.__empty = { }; ignore_buftypes = { nofile = true; }; @@ -54,7 +54,7 @@ fader = "require('specs').linear_fader"; resizer = "require('specs').shrink_resizer"; }; - ignore_filetypes = { }; + ignore_filetypes.__empty = { }; ignore_buftypes = { nofile = true; }; diff --git a/tests/test-sources/plugins/by-name/spectre/default.nix b/tests/test-sources/plugins/by-name/spectre/default.nix index 6b8409a2..7fec64c2 100644 --- a/tests/test-sources/plugins/by-name/spectre/default.nix +++ b/tests/test-sources/plugins/by-name/spectre/default.nix @@ -249,7 +249,7 @@ }; oxi = { cmd = "oxi"; - args = [ ]; + args.__empty = { }; options = { ignore-case = { value = "i"; @@ -260,7 +260,7 @@ }; sd = { cmd = "sd"; - options = { }; + options.__empty = { }; }; }; default = { @@ -276,7 +276,7 @@ is_open_target_win = true; is_insert_mode = false; is_block_ui_break = false; - open_template = { }; + open_template.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/startify/default.nix b/tests/test-sources/plugins/by-name/startify/default.nix index aac7dd55..2e066ad7 100644 --- a/tests/test-sources/plugins/by-name/startify/default.nix +++ b/tests/test-sources/plugins/by-name/startify/default.nix @@ -98,7 +98,7 @@ "three lines" ] ]; - custom_footer = null; + custom_footer.__raw = "nil"; disable_at_vimenter = false; relative_path = false; use_env = false; diff --git a/tests/test-sources/plugins/by-name/startup/default.nix b/tests/test-sources/plugins/by-name/startup/default.nix index e4b4e564..81fe1269 100644 --- a/tests/test-sources/plugins/by-name/startup/default.nix +++ b/tests/test-sources/plugins/by-name/startup/default.nix @@ -13,7 +13,7 @@ options = { mapping_keys = true; cursor_column = 0.5; - after = null; + after.__raw = "nil"; empty_lines_between_mappings = true; disable_statuslines = true; paddings.__empty = { }; diff --git a/tests/test-sources/plugins/by-name/statuscol/default.nix b/tests/test-sources/plugins/by-name/statuscol/default.nix index fcdd0998..4dd45598 100644 --- a/tests/test-sources/plugins/by-name/statuscol/default.nix +++ b/tests/test-sources/plugins/by-name/statuscol/default.nix @@ -11,8 +11,8 @@ setopt = true; thousands = false; relculright = false; - ft_ignore = null; - bt_ignore = null; + ft_ignore.__raw = "nil"; + bt_ignore.__raw = "nil"; segments = [ { text = [ "%C" ]; diff --git a/tests/test-sources/plugins/by-name/supermaven/default.nix b/tests/test-sources/plugins/by-name/supermaven/default.nix index d3b567b1..8353acb5 100644 --- a/tests/test-sources/plugins/by-name/supermaven/default.nix +++ b/tests/test-sources/plugins/by-name/supermaven/default.nix @@ -16,10 +16,10 @@ clear_suggestions = ""; accept_word = ""; }; - ignore_filetypes = [ ]; + ignore_filetypes.__empty = { }; color = { - suggestion_color = null; - cterm = null; + suggestion_color.__raw = "nil"; + cterm.__raw = "nil"; }; log_level = "info"; disable_inline_completion = false; diff --git a/tests/test-sources/plugins/by-name/tailwind-tools/default.nix b/tests/test-sources/plugins/by-name/tailwind-tools/default.nix index e8853158..0e1f02ab 100644 --- a/tests/test-sources/plugins/by-name/tailwind-tools/default.nix +++ b/tests/test-sources/plugins/by-name/tailwind-tools/default.nix @@ -16,7 +16,7 @@ settings = { server = { override = true; - settings = { }; + settings.__empty = { }; on_attach.__raw = "function(client, bufnr) end"; }; document_color = { @@ -27,7 +27,7 @@ }; conceal = { enabled = false; - min_length = null; + min_length.__raw = "nil"; symbol = "󱏿"; highlight = { fg = "#38BDF8"; @@ -42,8 +42,8 @@ }; }; extension = { - queries = [ ]; - patterns = { }; + queries.__empty = { }; + patterns.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/telescope/advanced-git-search.nix b/tests/test-sources/plugins/by-name/telescope/advanced-git-search.nix index bb1a743c..f7797cbf 100644 --- a/tests/test-sources/plugins/by-name/telescope/advanced-git-search.nix +++ b/tests/test-sources/plugins/by-name/telescope/advanced-git-search.nix @@ -21,9 +21,9 @@ settings = { browse_command = "GBrowse {commit_hash}"; diff_plugin = "fugitive"; - git_flags = [ ]; - git_diff_flags = [ ]; - git_log_flags = [ ]; + git_flags.__empty = { }; + git_diff_flags.__empty = { }; + git_log_flags.__empty = { }; show_builtin_git_pickers = false; entry_default_author_or_date = "author"; diff --git a/tests/test-sources/plugins/by-name/telescope/file-browser.nix b/tests/test-sources/plugins/by-name/telescope/file-browser.nix index ce9e16d9..f4a767db 100644 --- a/tests/test-sources/plugins/by-name/telescope/file-browser.nix +++ b/tests/test-sources/plugins/by-name/telescope/file-browser.nix @@ -15,7 +15,7 @@ enable = true; settings = { - theme = null; + theme.__raw = "nil"; path.__raw = "vim.loop.cwd()"; cwd.__raw = "vim.loop.cwd()"; cwd_to_path = false; diff --git a/tests/test-sources/plugins/by-name/telescope/frecency.nix b/tests/test-sources/plugins/by-name/telescope/frecency.nix index 5c501462..e3ca9cea 100644 --- a/tests/test-sources/plugins/by-name/telescope/frecency.nix +++ b/tests/test-sources/plugins/by-name/telescope/frecency.nix @@ -25,7 +25,7 @@ db_root.__raw = "vim.fn.stdpath 'data'"; db_safe_mode = true; db_validate_threshold = 10; - default_workspace = null; + default_workspace.__raw = "nil"; disable_devicons = false; hide_current_buffer = false; filter_delimiter = ":"; @@ -38,8 +38,8 @@ show_filter_column = true; show_scores = false; show_unindexed = true; - workspace_scan_cmd = null; - workspaces = { }; + workspace_scan_cmd.__raw = "nil"; + workspaces.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/telescope/live-grep-args.nix b/tests/test-sources/plugins/by-name/telescope/live-grep-args.nix index c09b9717..4a6ed157 100644 --- a/tests/test-sources/plugins/by-name/telescope/live-grep-args.nix +++ b/tests/test-sources/plugins/by-name/telescope/live-grep-args.nix @@ -17,7 +17,7 @@ settings = { auto_quoting = true; - mappings = { }; + mappings.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/telescope/manix.nix b/tests/test-sources/plugins/by-name/telescope/manix.nix index b6a35b1d..bb68c5fc 100644 --- a/tests/test-sources/plugins/by-name/telescope/manix.nix +++ b/tests/test-sources/plugins/by-name/telescope/manix.nix @@ -15,7 +15,7 @@ enable = true; settings = { - manix_args = [ ]; + manix_args.__empty = { }; cword = false; }; }; diff --git a/tests/test-sources/plugins/by-name/telescope/project.nix b/tests/test-sources/plugins/by-name/telescope/project.nix index 00cd26a1..def1b274 100644 --- a/tests/test-sources/plugins/by-name/telescope/project.nix +++ b/tests/test-sources/plugins/by-name/telescope/project.nix @@ -19,7 +19,7 @@ enable = true; settings = { - base_dirs = null; + base_dirs.__raw = "nil"; cd_scope = [ "tab" "window" diff --git a/tests/test-sources/plugins/by-name/timerly/default.nix b/tests/test-sources/plugins/by-name/timerly/default.nix index 16f5be77..451730ea 100644 --- a/tests/test-sources/plugins/by-name/timerly/default.nix +++ b/tests/test-sources/plugins/by-name/timerly/default.nix @@ -9,7 +9,7 @@ enable = true; settings = { - on_start = null; + on_start.__raw = "nil"; on_finish.__raw = '' function() vim.notify "Time is up!" @@ -19,7 +19,7 @@ 30 10 ]; - mapping = null; + mapping.__raw = "nil"; position = "top-left"; }; }; diff --git a/tests/test-sources/plugins/by-name/tiny-devicons-auto-colors/default.nix b/tests/test-sources/plugins/by-name/tiny-devicons-auto-colors/default.nix index c45ef32d..5b4eb007 100644 --- a/tests/test-sources/plugins/by-name/tiny-devicons-auto-colors/default.nix +++ b/tests/test-sources/plugins/by-name/tiny-devicons-auto-colors/default.nix @@ -13,7 +13,7 @@ enable = true; settings = { - colors = null; + colors.__raw = "nil"; factors = { lightness = 1.75; chroma = 1; @@ -29,7 +29,7 @@ precision = 20; threshold = 23; }; - ignore = [ ]; + ignore.__empty = { }; autoreload = false; }; }; diff --git a/tests/test-sources/plugins/by-name/tiny-inline-diagnostic/default.nix b/tests/test-sources/plugins/by-name/tiny-inline-diagnostic/default.nix index 6c699261..cd1b5057 100644 --- a/tests/test-sources/plugins/by-name/tiny-inline-diagnostic/default.nix +++ b/tests/test-sources/plugins/by-name/tiny-inline-diagnostic/default.nix @@ -66,7 +66,7 @@ enabled = false; after = 30; }; - format = null; + format.__raw = "nil"; virt_texts = { priority = 2048; }; @@ -76,9 +76,9 @@ (lib.nixvim.mkRaw "vim.diagnostic.severity.INFO") (lib.nixvim.mkRaw "vim.diagnostic.severity.HINT") ]; - overwrite_events = null; + overwrite_events.__raw = "nil"; }; - disabled_ft = [ ]; + disabled_ft.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/tinygit/default.nix b/tests/test-sources/plugins/by-name/tinygit/default.nix index 7c2b109f..7ef4c09a 100644 --- a/tests/test-sources/plugins/by-name/tinygit/default.nix +++ b/tests/test-sources/plugins/by-name/tinygit/default.nix @@ -104,8 +104,8 @@ }; statusline = { blame = { - ignoreAuthors = [ ]; - hideAuthorNames = [ ]; + ignoreAuthors.__empty = { }; + hideAuthorNames.__empty = { }; maxMsgLen = 40; icon = "ﰖ"; }; diff --git a/tests/test-sources/plugins/by-name/todo-comments/default.nix b/tests/test-sources/plugins/by-name/todo-comments/default.nix index 3be84c5d..4df6de09 100644 --- a/tests/test-sources/plugins/by-name/todo-comments/default.nix +++ b/tests/test-sources/plugins/by-name/todo-comments/default.nix @@ -81,7 +81,7 @@ pattern = ''.*<(KEYWORDS)\s*:''; comments_only = true; max_line_len = 400; - exclude = [ ]; + exclude.__empty = { }; }; colors = { diff --git a/tests/test-sources/plugins/by-name/toggleterm/default.nix b/tests/test-sources/plugins/by-name/toggleterm/default.nix index 4ff8bcb4..a79a1d2a 100644 --- a/tests/test-sources/plugins/by-name/toggleterm/default.nix +++ b/tests/test-sources/plugins/by-name/toggleterm/default.nix @@ -87,15 +87,15 @@ settings = { size = 12; - open_mapping = null; - on_create = null; - on_open = null; - on_close = null; - on_stdout = null; - on_stderr = null; - on_exit = null; + open_mapping.__raw = "nil"; + on_create.__raw = "nil"; + on_open.__raw = "nil"; + on_close.__raw = "nil"; + on_stdout.__raw = "nil"; + on_stderr.__raw = "nil"; + on_exit.__raw = "nil"; hide_numbers = true; - shade_filetypes = [ ]; + shade_filetypes.__empty = { }; autochdir = false; highlights = { NormalFloat.link = "Normal"; @@ -118,13 +118,13 @@ shell.__raw = "vim.o.shell"; auto_scroll = true; float_opts = { - border = null; - width = null; - height = null; - row = null; - col = null; + border.__raw = "nil"; + width.__raw = "nil"; + height.__raw = "nil"; + row.__raw = "nil"; + col.__raw = "nil"; winblend = 0; - zindex = null; + zindex.__raw = "nil"; title_pos = "left"; }; winbar = { diff --git a/tests/test-sources/plugins/by-name/transparent/default.nix b/tests/test-sources/plugins/by-name/transparent/default.nix index 387b0f7c..59ad47a4 100644 --- a/tests/test-sources/plugins/by-name/transparent/default.nix +++ b/tests/test-sources/plugins/by-name/transparent/default.nix @@ -35,8 +35,8 @@ "StatusLineNC" "EndOfBuffer" ]; - extra_groups = [ ]; - exclude_groups = [ ]; + extra_groups.__empty = { }; + exclude_groups.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/treesitter-context/default.nix b/tests/test-sources/plugins/by-name/treesitter-context/default.nix index 9b61bed5..e697acc3 100644 --- a/tests/test-sources/plugins/by-name/treesitter-context/default.nix +++ b/tests/test-sources/plugins/by-name/treesitter-context/default.nix @@ -20,9 +20,9 @@ multiline_threshold = 20; trim_scope = "outer"; mode = "cursor"; - separator = null; + separator.__raw = "nil"; zindex = 20; - on_attach = null; + on_attach = "nil"; }; }; }; diff --git a/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix b/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix index 542b4193..ea5058bf 100644 --- a/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix +++ b/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix @@ -15,7 +15,7 @@ settings = { select = { enable = true; - disable = [ ]; + disable.__empty = { }; lookahead = true; keymaps = { af = "@function.outer"; @@ -35,7 +35,7 @@ }; swap = { enable = true; - disable = [ ]; + disable.__empty = { }; swap_next = { "a" = "@parameter.inner"; }; @@ -45,7 +45,7 @@ }; move = { enable = true; - disable = [ ]; + disable.__empty = { }; set_jumps = true; goto_next_start = { "]m" = "@function.outer"; @@ -77,7 +77,7 @@ "df" = "@function.outer"; "dF" = "@class.outer"; }; - floating_preview_opts = { }; + floating_preview_opts.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/treesitter/default.nix b/tests/test-sources/plugins/by-name/treesitter/default.nix index 2e079f34..4a52c29f 100644 --- a/tests/test-sources/plugins/by-name/treesitter/default.nix +++ b/tests/test-sources/plugins/by-name/treesitter/default.nix @@ -6,8 +6,8 @@ settings = { auto_install = false; - ensure_installed = [ ]; - ignore_install = [ ]; + ensure_installed.__empty = { }; + ignore_install.__empty = { }; # NOTE: This is our default, not the plugin's parser_install_dir.__raw = "vim.fs.joinpath(vim.fn.stdpath('data'), 'site')"; @@ -16,8 +16,8 @@ highlight = { additional_vim_regex_highlighting = false; enable = false; - custom_captures = { }; - disable = null; + custom_captures.__empty = { }; + disable.__raw = "nil"; }; incremental_selection = { diff --git a/tests/test-sources/plugins/by-name/treesj/default.nix b/tests/test-sources/plugins/by-name/treesj/default.nix index e26ee471..c48bdba5 100644 --- a/tests/test-sources/plugins/by-name/treesj/default.nix +++ b/tests/test-sources/plugins/by-name/treesj/default.nix @@ -15,7 +15,7 @@ notify = true; dot_repeat = true; on_error.__raw = "nil"; - langs = { }; + langs.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/trim/default.nix b/tests/test-sources/plugins/by-name/trim/default.nix index 3910bfc3..07c4e7b6 100644 --- a/tests/test-sources/plugins/by-name/trim/default.nix +++ b/tests/test-sources/plugins/by-name/trim/default.nix @@ -8,8 +8,8 @@ enable = true; settings = { - ft_blocklist = [ ]; - patterns = [ ]; + ft_blocklist.__empty = { }; + patterns.__empty = { }; trim_on_write = true; trim_trailing = true; trim_last_line = true; diff --git a/tests/test-sources/plugins/by-name/trouble/default.nix b/tests/test-sources/plugins/by-name/trouble/default.nix index 9ca09838..57b1b07a 100644 --- a/tests/test-sources/plugins/by-name/trouble/default.nix +++ b/tests/test-sources/plugins/by-name/trouble/default.nix @@ -35,7 +35,7 @@ pinned = false; warn_no_results = true; open_no_results = false; - win = { }; + win.__empty = { }; preview = { type = "main"; scratch = true; diff --git a/tests/test-sources/plugins/by-name/ts-autotag/default.nix b/tests/test-sources/plugins/by-name/ts-autotag/default.nix index d214a640..b92678c6 100644 --- a/tests/test-sources/plugins/by-name/ts-autotag/default.nix +++ b/tests/test-sources/plugins/by-name/ts-autotag/default.nix @@ -37,7 +37,7 @@ "hbs" = "glimmer"; "rust" = "rust"; }; - per_filetype = { }; + per_filetype.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/twilight/default.nix b/tests/test-sources/plugins/by-name/twilight/default.nix index c218cbe5..b909f5f4 100644 --- a/tests/test-sources/plugins/by-name/twilight/default.nix +++ b/tests/test-sources/plugins/by-name/twilight/default.nix @@ -27,7 +27,7 @@ "table" "if_statement" ]; - exclude = [ ]; + exclude.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/typescript-tools/default.nix b/tests/test-sources/plugins/by-name/typescript-tools/default.nix index dcfcaa90..51f388c8 100644 --- a/tests/test-sources/plugins/by-name/typescript-tools/default.nix +++ b/tests/test-sources/plugins/by-name/typescript-tools/default.nix @@ -9,12 +9,12 @@ settings = { separate_diagnostic_server = true; publish_diagnostic_on = "insert_leave"; - expose_as_code_action = null; - tsserver_path = null; - tsserver_plugins = null; + expose_as_code_action.__raw = "nil"; + tsserver_path.__raw = "nil"; + tsserver_plugins.__raw = "nil"; tsserver_max_memory = "auto"; - tsserver_format_options = null; - tsserver_file_preferences = null; + tsserver_format_options.__raw = "nil"; + tsserver_file_preferences.__raw = "nil"; tsserver_locale = "en"; complete_function_calls = false; include_completions_with_insert_text = true; diff --git a/tests/test-sources/plugins/by-name/typst-preview/default.nix b/tests/test-sources/plugins/by-name/typst-preview/default.nix index e5c28aa4..841087a9 100644 --- a/tests/test-sources/plugins/by-name/typst-preview/default.nix +++ b/tests/test-sources/plugins/by-name/typst-preview/default.nix @@ -9,11 +9,11 @@ settings = { debug = false; - open_cmd = null; + open_cmd.__raw = "nil"; port = 0; invert_colors = "never"; follow_cursor = true; - extra_args = null; + extra_args.__raw = "nil"; get_root.__raw = '' function(path_of_main_file) local root = os.getenv 'TYPST_ROOT' diff --git a/tests/test-sources/plugins/by-name/venv-selector/default.nix b/tests/test-sources/plugins/by-name/venv-selector/default.nix index 30ce949d..3f11f776 100644 --- a/tests/test-sources/plugins/by-name/venv-selector/default.nix +++ b/tests/test-sources/plugins/by-name/venv-selector/default.nix @@ -29,7 +29,7 @@ (lib.nixvim.mkRaw "require('venv-selector.hooks').dynamic_python_lsp_hook") ]; options = { - on_venv_activate_callback = null; + on_venv_activate_callback.__raw = "nil"; enable_default_searches = true; enable_cached_venvs = true; cached_venv_automatic_activation = true; @@ -40,11 +40,11 @@ debug = false; fd_binary_name = lib.nixvim.mkRaw "require('venv-selector.config').find_fd_command_name()"; require_lsp_activation = true; - on_telescope_result_callback = null; + on_telescope_result_callback.__raw = "nil"; picker_filter_type = "substring"; selected_venv_marker_color = "#00FF00"; selected_venv_marker_icon = "✔"; - picker_icons = [ ]; + picker_icons.__empty = { }; picker_columns = [ "marker" "search_icon" @@ -53,8 +53,8 @@ ]; picker = "auto"; statusline_func = { - nvchad = null; - lualine = null; + nvchad.__raw = "nil"; + lualine.__raw = "nil"; }; picker_options = { snacks = { diff --git a/tests/test-sources/plugins/by-name/vim-slime/default.nix b/tests/test-sources/plugins/by-name/vim-slime/default.nix index bca3f3fb..a2b6ea20 100644 --- a/tests/test-sources/plugins/by-name/vim-slime/default.nix +++ b/tests/test-sources/plugins/by-name/vim-slime/default.nix @@ -9,7 +9,7 @@ settings = { target = "screen"; - vimterminal_cmd = null; + vimterminal_cmd.__raw = "nil"; no_mappings = 0; paste_file = "$HOME/.slime_paste"; preserve_curpos = 1; diff --git a/tests/test-sources/plugins/by-name/vimade/default.nix b/tests/test-sources/plugins/by-name/vimade/default.nix index 4664a43f..f85e8b15 100644 --- a/tests/test-sources/plugins/by-name/vimade/default.nix +++ b/tests/test-sources/plugins/by-name/vimade/default.nix @@ -47,8 +47,7 @@ ncmode = "buffers"; fadelevel = 0.4; basebg = ""; - tint = { - }; + tint.__empty = { }; blocklist = { default = { highlights = { @@ -82,7 +81,7 @@ end ''; }; - link = [ ]; + link.__empty = { }; groupdiff = true; groupscrollbind = false; enablefocusfading = false; diff --git a/tests/test-sources/plugins/by-name/vimux/default.nix b/tests/test-sources/plugins/by-name/vimux/default.nix index 47a7f74e..bb77dc5f 100644 --- a/tests/test-sources/plugins/by-name/vimux/default.nix +++ b/tests/test-sources/plugins/by-name/vimux/default.nix @@ -20,7 +20,7 @@ ExpandCommand = 0; CloseOnExit = 0; CommandShell = 1; - RunnerQuery = { }; + RunnerQuery.__empty = { }; Debug = false; }; }; diff --git a/tests/test-sources/plugins/by-name/vimwiki/default.nix b/tests/test-sources/plugins/by-name/vimwiki/default.nix index c4b045f9..343dd32b 100644 --- a/tests/test-sources/plugins/by-name/vimwiki/default.nix +++ b/tests/test-sources/plugins/by-name/vimwiki/default.nix @@ -41,7 +41,7 @@ ".mw" = "media"; }; folding = ""; - filetypes = [ ]; + filetypes.__empty = { }; global_ext = 1; hl_cb_checked = 0; hl_headers = 0; diff --git a/tests/test-sources/plugins/by-name/visual-multi/default.nix b/tests/test-sources/plugins/by-name/visual-multi/default.nix index 006611a2..325300c5 100644 --- a/tests/test-sources/plugins/by-name/visual-multi/default.nix +++ b/tests/test-sources/plugins/by-name/visual-multi/default.nix @@ -22,19 +22,22 @@ case_setting = ""; disable_syntax_in_imode = 0; recursive_operations_at_cursors = 1; - custom_remaps = { }; - custom_noremaps = { }; - custom_motions = { }; - user_operators = [ ]; + custom_remaps.__empty = { }; + custom_noremaps.__empty = { }; + custom_motions.__empty = { }; + user_operators.__empty = { }; use_first_cursor_in_line = 0; insert_special_keys = [ "c-v" ]; single_mode_maps = 1; single_mode_auto_reset = 1; filesize_limit = 0; persistent_registers = 0; - reindent_filetypes = [ ]; - plugins_compatibilty = { }; - maps = { }; + reindent_filetypes.__empty = { }; + plugins_compatibilty.__empty = { }; + + # FIXME: This is not empty by default. it can't be or it throws + # maps.__empty = { }; + default_mappings = 1; mouse_mappings = 0; leader = "\\\\"; diff --git a/tests/test-sources/plugins/by-name/visual-whitespace/default.nix b/tests/test-sources/plugins/by-name/visual-whitespace/default.nix index 956a2c84..bf4517c2 100644 --- a/tests/test-sources/plugins/by-name/visual-whitespace/default.nix +++ b/tests/test-sources/plugins/by-name/visual-whitespace/default.nix @@ -32,8 +32,8 @@ dos = "↙"; }; ignore = { - filetypes = { }; - buftypes = { }; + filetypes.__empty = { }; + buftypes.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/by-name/which-key/default.nix b/tests/test-sources/plugins/by-name/which-key/default.nix index f1adefb6..64d45fe5 100644 --- a/tests/test-sources/plugins/by-name/which-key/default.nix +++ b/tests/test-sources/plugins/by-name/which-key/default.nix @@ -22,7 +22,7 @@ end ''; - spec = [ ]; + spec.__empty = { }; notify = true; @@ -70,8 +70,8 @@ title = true; title_pos = "center"; zindex = 1000; - bo = { }; - wo = { }; + bo.__empty = { }; + wo.__empty = { }; }; layout = { @@ -149,7 +149,7 @@ group = "+"; ellipsis = "…"; mappings = true; - rules = [ ]; + rules.__empty = { }; colors = true; keys = { Up = " "; @@ -187,8 +187,8 @@ show_keys = true; disable = { - bt = [ ]; - ft = [ ]; + bt.__empty = { }; + ft.__empty = { }; }; debug = false; diff --git a/tests/test-sources/plugins/by-name/whichpy/default.nix b/tests/test-sources/plugins/by-name/whichpy/default.nix index 09449a50..dca3b852 100644 --- a/tests/test-sources/plugins/by-name/whichpy/default.nix +++ b/tests/test-sources/plugins/by-name/whichpy/default.nix @@ -10,7 +10,7 @@ settings = { cache_dir.__raw = "vim.fn.stdpath('cache') .. '/whichpy.nvim'"; update_path_env = false; - after_handle_select = null; + after_handle_select.__raw = "nil"; picker = { name = "builtin"; }; diff --git a/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix b/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix index 847f0805..cb2515e4 100644 --- a/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix +++ b/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix @@ -28,7 +28,7 @@ enable = true; settings = { - manager_path = null; + manager_path.__raw = "nil"; bin_path.__raw = "vim.fn.stdpath('cache') .. '/codeium/bin'"; config_path.__raw = "vim.fn.stdpath('cache') .. '/codeium/config.json'"; language_server_download_url = "https://github.com"; @@ -38,10 +38,10 @@ path = "/"; portal_url = "codeium.com"; }; - enterprise_mode = null; - detect_proxy = null; - tools = { }; - wrapper = null; + enterprise_mode.__raw = "nil"; + detect_proxy.__raw = "nil"; + tools.__empty = { }; + wrapper.__raw = "nil"; enable_chat = true; enable_local_search = true; enable_index_service = true; @@ -50,13 +50,13 @@ enable_cmp_source = true; virtual_text = { enabled = false; - filetypes = [ ]; + filetypes.__empty = { }; default_filetype_enabled = true; manual = false; idle_delay = 75; virtual_text_priority = 65535; map_keys = true; - accept_fallback = null; + accept_fallback.__raw = "nil"; key_bindings = { accept = ""; accept_word = false; @@ -68,7 +68,7 @@ }; workspace_root = { use_lsp = true; - find_root = null; + find_root.__raw = "nil"; paths = [ ".bzr" ".git" diff --git a/tests/test-sources/plugins/by-name/wtf/default.nix b/tests/test-sources/plugins/by-name/wtf/default.nix index 182557f7..26218383 100644 --- a/tests/test-sources/plugins/by-name/wtf/default.nix +++ b/tests/test-sources/plugins/by-name/wtf/default.nix @@ -26,7 +26,7 @@ enable = true; settings = { - additional_instructions = null; + additional_instructions.__raw = "nil"; chat_dir = lib.nixvim.mkRaw "vim.fn.stdpath('data'):gsub('/$', \"\") .. '/wtf/chats'"; language = "english"; picker = "telescope"; @@ -36,8 +36,8 @@ # Extracting the default value would be annoying # providers = create_provider_defaults() hooks = { - request_started = null; - request_finished = null; + request_started.__raw = "nil"; + request_finished.__raw = "nil"; }; winhighlight = "Normal:Normal,FloatBorder:FloatBorder"; }; diff --git a/tests/test-sources/plugins/by-name/yanky/default.nix b/tests/test-sources/plugins/by-name/yanky/default.nix index 736f98d9..69c9f554 100644 --- a/tests/test-sources/plugins/by-name/yanky/default.nix +++ b/tests/test-sources/plugins/by-name/yanky/default.nix @@ -32,16 +32,18 @@ }; picker = { select = { + # FIXME: this can't be empty due to raw coercion action = null; }; telescope = { use_default_mappings = true; + # FIXME: this can't be empty due to raw coercion mappings = null; }; }; system_clipboard = { sync_with_ring = true; - clipboard_register = null; + clipboard_register.__raw = "nil"; }; highlight = { on_put = true; @@ -99,7 +101,7 @@ }; system_clipboard = { sync_with_ring = true; - clipboard_register = null; + clipboard_register.__raw = "nil"; }; highlight = { on_put = true; diff --git a/tests/test-sources/plugins/by-name/yazi/default.nix b/tests/test-sources/plugins/by-name/yazi/default.nix index a21ce9ff..2bf9c572 100644 --- a/tests/test-sources/plugins/by-name/yazi/default.nix +++ b/tests/test-sources/plugins/by-name/yazi/default.nix @@ -34,7 +34,7 @@ send_to_quickfix_list = ""; }; - set_keymappings_function = null; + set_keymappings_function.__raw = "nil"; hooks = { yazi_opened.__raw = '' @@ -55,7 +55,7 @@ }; highlight_groups = { - hovered_buffer = null; + hovered_buffer.__raw = "nil"; }; floating_window_scaling_factor = 0.9; diff --git a/tests/test-sources/plugins/by-name/zen-mode/default.nix b/tests/test-sources/plugins/by-name/zen-mode/default.nix index 4f6d332f..3cc74ed9 100644 --- a/tests/test-sources/plugins/by-name/zen-mode/default.nix +++ b/tests/test-sources/plugins/by-name/zen-mode/default.nix @@ -12,7 +12,7 @@ backdrop = 0.95; width = 120; height = 1; - options = { }; + options.__empty = { }; }; plugins = { options = { diff --git a/tests/test-sources/plugins/cmp/default.nix b/tests/test-sources/plugins/cmp/default.nix index efc74242..e4b9a5e0 100644 --- a/tests/test-sources/plugins/cmp/default.nix +++ b/tests/test-sources/plugins/cmp/default.nix @@ -104,7 +104,7 @@ "order" ]; }; - sources = [ ]; + sources.__empty = { }; experimental = { ghost_text = false; }; diff --git a/tests/test-sources/plugins/colorschemes/ayu.nix b/tests/test-sources/plugins/colorschemes/ayu.nix index 8ca1e74c..2499f21b 100644 --- a/tests/test-sources/plugins/colorschemes/ayu.nix +++ b/tests/test-sources/plugins/colorschemes/ayu.nix @@ -9,6 +9,8 @@ settings = { mirage = false; + + # FIXME: this can't be empty due to raw coercion overrides = { }; }; }; diff --git a/tests/test-sources/plugins/colorschemes/catppuccin.nix b/tests/test-sources/plugins/colorschemes/catppuccin.nix index df28bd07..c4db85e8 100644 --- a/tests/test-sources/plugins/colorschemes/catppuccin.nix +++ b/tests/test-sources/plugins/colorschemes/catppuccin.nix @@ -28,19 +28,22 @@ styles = { comments = [ "italic" ]; conditionals = [ "italic" ]; - loops = [ ]; - functions = [ ]; - keywords = [ ]; - strings = [ ]; - variables = [ ]; - numbers = [ ]; - booleans = [ ]; - properties = [ ]; - types = [ ]; - operators = [ ]; + loops.__empty = { }; + functions.__empty = { }; + keywords.__empty = { }; + strings.__empty = { }; + variables.__empty = { }; + numbers.__empty = { }; + booleans.__empty = { }; + properties.__empty = { }; + types.__empty = { }; + operators.__empty = { }; }; - color_overrides = { }; + color_overrides.__empty = { }; + + # FIXME: this can't be __empty due to raw coercion custom_highlights = { }; + default_integrations = true; integrations = { alpha = true; @@ -123,9 +126,9 @@ mantle = "#242424"; crust = "#474747"; }; - frappe = { }; - macchiato = { }; - mocha = { }; + frappe.__empty = { }; + macchiato.__empty = { }; + mocha.__empty = { }; }; styles = { booleans = [ diff --git a/tests/test-sources/plugins/colorschemes/cyberdream.nix b/tests/test-sources/plugins/colorschemes/cyberdream.nix index 628b5785..130bcf55 100644 --- a/tests/test-sources/plugins/colorschemes/cyberdream.nix +++ b/tests/test-sources/plugins/colorschemes/cyberdream.nix @@ -16,8 +16,8 @@ terminal_colors = true; theme = { - highlights = { }; - colors = { }; + highlights.__empty = { }; + colors.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/colorschemes/everforest.nix b/tests/test-sources/plugins/colorschemes/everforest.nix index 79b5b79c..bf239761 100644 --- a/tests/test-sources/plugins/colorschemes/everforest.nix +++ b/tests/test-sources/plugins/colorschemes/everforest.nix @@ -26,7 +26,7 @@ inlay_hints_background = "none"; disable_terminal_colors = 0; lightline_disable_bold = 0; - colors_override = { }; + colors_override.__raw = "nil"; # This option is broken when set to 1, because the plugin tries to write its cache in /nix/store better_performance = 0; diff --git a/tests/test-sources/plugins/colorschemes/github-theme.nix b/tests/test-sources/plugins/colorschemes/github-theme.nix index a2b6958e..df6a11f8 100644 --- a/tests/test-sources/plugins/colorschemes/github-theme.nix +++ b/tests/test-sources/plugins/colorschemes/github-theme.nix @@ -40,14 +40,14 @@ floats = true; sidebars = { enable = true; - list = [ ]; + list.__empty = { }; }; }; - modules = [ ]; + modules.__empty = { }; }; - palettes = [ ]; - specs = [ ]; - groups = [ ]; + palettes.__empty = { }; + specs.__empty = { }; + groups.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix b/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix index 2b3c3dbd..667829cd 100644 --- a/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix +++ b/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix @@ -15,8 +15,8 @@ _: { string_style = "nocombine"; function_style = "bold"; variable_style = "NONE"; - highlights = { }; - color_overrides = { }; + highlights.__empty = { }; + color_overrides.__empty = { }; use_original_palette = 0; }; }; diff --git a/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix b/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix index ef158cf7..1bc6a5e3 100644 --- a/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix +++ b/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix @@ -19,13 +19,13 @@ }; float = { force_background = false; - background_color = null; + background_color.__raw = "nil"; }; signs = { force_background = false; - background_color = null; + background_color.__raw = "nil"; }; - customize = null; + customize.__raw = "nil"; }; }; }; @@ -48,7 +48,7 @@ }; signs = { force_background = false; - background_color = null; + background_color.__raw = "nil"; }; customize = lib.nixvim.mkRaw '' function(g, o) diff --git a/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix b/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix index 5889e234..5516c507 100644 --- a/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix +++ b/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix @@ -15,10 +15,10 @@ settings = { cache = false; colors = { - palette = { }; + palette.__empty = { }; theme = { - ink = { }; - canvas = { }; + ink.__empty = { }; + canvas.__empty = { }; }; }; undercurl = true; diff --git a/tests/test-sources/plugins/colorschemes/kanagawa.nix b/tests/test-sources/plugins/colorschemes/kanagawa.nix index bde8fe41..a471fb8a 100644 --- a/tests/test-sources/plugins/colorschemes/kanagawa.nix +++ b/tests/test-sources/plugins/colorschemes/kanagawa.nix @@ -13,14 +13,14 @@ commentStyle = { italic = true; }; - functionStyle = { }; + functionStyle.__empty = { }; keywordStyle = { italic = true; }; statementStyle = { bold = true; }; - typeStyle = { }; + typeStyle.__empty = { }; transparent = false; dimInactive = false; terminalColors = true; diff --git a/tests/test-sources/plugins/colorschemes/modus.nix b/tests/test-sources/plugins/colorschemes/modus.nix index 7118da07..b7476305 100644 --- a/tests/test-sources/plugins/colorschemes/modus.nix +++ b/tests/test-sources/plugins/colorschemes/modus.nix @@ -16,8 +16,8 @@ styles = { comments.italic = true; keywords.italic = true; - functions = { }; - variables = { }; + functions.__empty = { }; + variables.__empty = { }; }; on_colors = "function(colors) end"; on_highlights = "function(highlights, colors) end"; diff --git a/tests/test-sources/plugins/colorschemes/nightfox.nix b/tests/test-sources/plugins/colorschemes/nightfox.nix index 9ad3a922..b8a98cfc 100644 --- a/tests/test-sources/plugins/colorschemes/nightfox.nix +++ b/tests/test-sources/plugins/colorschemes/nightfox.nix @@ -62,9 +62,9 @@ }; }; }; - palettes = { }; - specs = { }; - groups = { }; + palettes.__empty = { }; + specs.__empty = { }; + groups.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/colorschemes/onedark.nix b/tests/test-sources/plugins/colorschemes/onedark.nix index 8ce34c57..b570fa9a 100644 --- a/tests/test-sources/plugins/colorschemes/onedark.nix +++ b/tests/test-sources/plugins/colorschemes/onedark.nix @@ -40,7 +40,7 @@ term_colors = true; ending_tildes = false; cmp_itemkind_reverse = false; - toggle_style_key = null; + toggle_style_key.__raw = "nil"; toggle_style_list = [ "dark" "darker" @@ -60,8 +60,8 @@ lualine = { transparent = false; }; - colors = { }; - highlights = { }; + colors.__empty = { }; + highlights.__empty = { }; diagnostics = { darker = true; undercurl = true; diff --git a/tests/test-sources/plugins/colorschemes/palette.nix b/tests/test-sources/plugins/colorschemes/palette.nix index 359c3caa..abcaf629 100644 --- a/tests/test-sources/plugins/colorschemes/palette.nix +++ b/tests/test-sources/plugins/colorschemes/palette.nix @@ -14,9 +14,9 @@ state = "pastel"; }; custom_palettes = { - main = { }; - accent = { }; - state = { }; + main.__empty = { }; + accent.__empty = { }; + state.__empty = { }; }; italics = true; transparent_background = false; diff --git a/tests/test-sources/plugins/colorschemes/poimandres.nix b/tests/test-sources/plugins/colorschemes/poimandres.nix index 51e8ab63..04cbbfb9 100644 --- a/tests/test-sources/plugins/colorschemes/poimandres.nix +++ b/tests/test-sources/plugins/colorschemes/poimandres.nix @@ -46,7 +46,7 @@ h6 = "blue2"; }; }; - highlight_groups = { }; + highlight_groups.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/colorschemes/solazized-osaka.nix b/tests/test-sources/plugins/colorschemes/solazized-osaka.nix index ad02dce1..75a2bef8 100644 --- a/tests/test-sources/plugins/colorschemes/solazized-osaka.nix +++ b/tests/test-sources/plugins/colorschemes/solazized-osaka.nix @@ -14,8 +14,8 @@ styles = { comments.italic = true; keywords.italic = true; - functions = { }; - variables = { }; + functions.__empty = { }; + variables.__empty = { }; sidebars = "dark"; floats = "dark"; }; diff --git a/tests/test-sources/plugins/colorschemes/tokyonight.nix b/tests/test-sources/plugins/colorschemes/tokyonight.nix index 37772643..4460215b 100644 --- a/tests/test-sources/plugins/colorschemes/tokyonight.nix +++ b/tests/test-sources/plugins/colorschemes/tokyonight.nix @@ -15,8 +15,8 @@ styles = { comments.italic = true; keywords.italic = true; - functions = { }; - variables = { }; + functions.__empty = { }; + variables.__empty = { }; sidebars = "dark"; floats = "dark"; }; diff --git a/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix b/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix index 0a925681..7f8a243e 100644 --- a/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix +++ b/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix @@ -23,10 +23,10 @@ workspaceWord = true; }; diagnostics = { - disable = [ ]; + disable.__empty = { }; disableScheme = [ "git" ]; enable = true; - globals = [ ]; + globals.__empty = { }; groupFileStatus = { ambiguity = "Fallback"; await = "Fallback"; @@ -169,18 +169,18 @@ unused-local = "Hint"; unused-vararg = "Hint"; }; - unusedLocalExclude = [ ]; + unusedLocalExclude.__empty = { }; workspaceDelay = 3000; workspaceEvent = "OnSave"; workspaceRate = 100; }; doc = { - packageName = [ ]; - privateName = [ ]; - protectedName = [ ]; + packageName.__empty = { }; + privateName.__empty = { }; + protectedName.__empty = { }; }; format = { - defaultConfig = { }; + defaultConfig.__empty = { }; enable = true; }; hint = { @@ -202,7 +202,7 @@ viewStringMax = 1000; }; misc = { - parameters = [ ]; + parameters.__empty = { }; executablePath = ""; }; runtime = { @@ -227,15 +227,15 @@ }; fileEncoding = "utf8"; meta = "$\{version} $\{language} $\{encoding}"; - nonstandardSymbol = [ ]; + nonstandardSymbol.__empty = { }; path = [ "?.lua" "?/init.lua" ]; pathStrict = false; plugin = ""; - pluginArgs = [ ]; - special = { }; + pluginArgs.__empty = { }; + special.__empty = { }; unicodeName = false; version = "Lua 5.4"; }; @@ -249,10 +249,10 @@ enable = true; }; spell = { - dict = [ ]; + dict.__empty = { }; }; telemetry = { - enable = null; + enable.__raw = "nil"; }; type = { castNumberToInteger = false; @@ -267,7 +267,7 @@ checkThirdParty = true; ignoreDir = [ ".vscode" ]; ignoreSubmodules = true; - library = [ ]; + library.__empty = { }; maxPreload = 5000; preloadFileSize = 500; supportScheme = [ @@ -276,7 +276,7 @@ "git" ]; useGitIgnore = true; - userThirdParty = [ ]; + userThirdParty.__empty = { }; }; }; }; diff --git a/tests/test-sources/plugins/lsp/language-servers/pylsp.nix b/tests/test-sources/plugins/lsp/language-servers/pylsp.nix index 8be609b8..187a13b3 100644 --- a/tests/test-sources/plugins/lsp/language-servers/pylsp.nix +++ b/tests/test-sources/plugins/lsp/language-servers/pylsp.nix @@ -1,3 +1,5 @@ +# FIXME: This test uses a lot of "null" values that get ignored +# this should use raw values instead but cannot be implemented due to raw coercions { example = { plugins.lsp = { diff --git a/tests/test-sources/plugins/lsp/language-servers/tinymist.nix b/tests/test-sources/plugins/lsp/language-servers/tinymist.nix index 54fef0ce..27086c0d 100644 --- a/tests/test-sources/plugins/lsp/language-servers/tinymist.nix +++ b/tests/test-sources/plugins/lsp/language-servers/tinymist.nix @@ -9,16 +9,16 @@ settings = { outputPath = "$dir/$name"; exportPdf = "auto"; - rootPath = null; + rootPath.__raw = "nil"; semanticTokens = "enable"; systemFonts = true; - fontPaths = [ ]; + fontPaths.__empty = { }; compileStatus = "disable"; - typstExtraArgs = [ ]; + typstExtraArgs.__empty = { }; formatterMode = "disable"; formatterPrintWidth = 120; completion = { - triggerOnSnippetPlaceholders = null; + triggerOnSnippetPlaceholders.__raw = "nil"; postfix = true; postfixUfcs = true; postfixUfcsLeft = true; From dfdc4aebfb5319eb5f37ad96b1a8bbac5732e5a7 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 27 Oct 2025 18:38:03 +0100 Subject: [PATCH 08/24] plugins/emmet: use `nestedLiteralLua` Signed-off-by: saygo-png --- plugins/by-name/emmet/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/by-name/emmet/default.nix b/plugins/by-name/emmet/default.nix index b905dc11..bba1060b 100644 --- a/plugins/by-name/emmet/default.nix +++ b/plugins/by-name/emmet/default.nix @@ -4,7 +4,7 @@ }: let inherit (lib) types; - inherit (lib.nixvim) defaultNullOpts mkNullOrOption; + inherit (lib.nixvim) defaultNullOpts mkNullOrOption nestedLiteralLua; in lib.nixvim.plugins.mkVimPlugin { name = "emmet"; @@ -49,11 +49,11 @@ lib.nixvim.plugins.mkVimPlugin { html = { default_attributes = { option = { - value = null; + value = nestedLiteralLua "nil"; }; textarea = { - id = null; - name = null; + id = nestedLiteralLua "nil"; + name = nestedLiteralLua "nil"; cols = 10; rows = 10; }; From 68b07c2c349b1a622f46e12b72039c0647779c34 Mon Sep 17 00:00:00 2001 From: saygo-png Date: Mon, 3 Nov 2025 03:19:24 +0100 Subject: [PATCH 09/24] plugins/lazygit: use `nestedLiteralLua` Signed-off-by: saygo-png --- plugins/by-name/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/by-name/lazygit/default.nix b/plugins/by-name/lazygit/default.nix index 88b62db5..557f52e6 100644 --- a/plugins/by-name/lazygit/default.nix +++ b/plugins/by-name/lazygit/default.nix @@ -4,7 +4,7 @@ }: let inherit (lib) types; - inherit (lib.nixvim) defaultNullOpts; + inherit (lib.nixvim) defaultNullOpts nestedLiteral; in lib.nixvim.plugins.mkVimPlugin { name = "lazygit"; @@ -89,6 +89,6 @@ lib.nixvim.plugins.mkVimPlugin { floating_window_use_plenary = 0; use_neovim_remote = 1; use_custom_config_file_path = 0; - config_file_path = [ ]; + config_file_path = nestedLiteral "lib.nixvim.emptyTable"; }; } From deb32aecac40d21706f41004b52e0310943ec5c8 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 27 Feb 2025 19:12:51 -0300 Subject: [PATCH 10/24] plugins/alpha: migrate to mkNeovimPlugin --- plugins/by-name/alpha/default.nix | 266 +++++++----------- .../plugins/by-name/alpha/default.nix | 15 +- 2 files changed, 110 insertions(+), 171 deletions(-) diff --git a/plugins/by-name/alpha/default.nix b/plugins/by-name/alpha/default.nix index ccdf52da..56229140 100644 --- a/plugins/by-name/alpha/default.nix +++ b/plugins/by-name/alpha/default.nix @@ -1,177 +1,113 @@ -{ - lib, - config, - pkgs, - ... -}: -let - inherit (lib) types mkOption; +{ lib, ... }: +lib.nixvim.plugins.mkNeovimPlugin { + name = "alpha"; + package = "alpha-nvim"; - cfg = config.plugins.alpha; + maintainers = [ lib.maintainers.HeitorAugustoLN ]; - sectionType = types.submodule { - freeformType = with types; attrsOf anything; - options = { - type = mkOption { - type = types.enum [ - "button" - "group" - "padding" - "text" - "terminal" + # TODO Added 2025-10-26: remove after 26.05 + optionsRenamedToSettings = [ + "opts" + "layout" + ]; + + settingsExample = { + layout = [ + { + type = "padding"; + val = 2; + } + { + type = "text"; + val = [ + "███╗ ██╗██╗██╗ ██╗██╗ ██╗██╗███╗ ███╗" + "████╗ ██║██║╚██╗██╔╝██║ ██║██║████╗ ████║" + "██╔██╗ ██║██║ ╚███╔╝ ██║ ██║██║██╔████╔██║" + "██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║" + "██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║" + "╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝" ]; - description = "Type of section"; - }; + opts = { + position = "center"; + hl = "Type"; + }; + } + { + type = "padding"; + val = 2; + } + { + type = "group"; + val = [ + { + type = "button"; + val = " New file"; + on_press = lib.nixvim.nestedLiteralLua "function() vim.cmd[[ene]] end"; + opts.shortcut = "n"; + } + { + type = "button"; + val = " Quit Neovim"; + on_press = lib.nixvim.nestedLiteralLua "function() vim.cmd[[qa]] end"; + opts.shortcut = "q"; + } + ]; + } + { + type = "padding"; + val = 2; + } + { + type = "text"; + val = "Inspiring quote here."; + opts = { + position = "center"; + hl = "Keyword"; + }; + } + ]; + }; - val = lib.nixvim.mkNullOrOption ( - with types; - nullOr (oneOf [ - - # "button", "text" - (maybeRaw str) - # "padding" - int - (listOf ( - either - # "text" (list of strings) - str - # "group" - (attrsOf anything) - )) - ]) - ) "Value for section"; - - opts = mkOption { - type = with types; attrsOf anything; - default = { }; - description = "Additional options for the section"; - }; + extraOptions = { + theme = lib.mkOption { + type = + with lib.types; + let + # TODO: deprecated 2025-10-30, remove after 26.05 + old = nullOr (maybeRaw str); + new = nullOr str; + in + old // { inherit (new) description; }; + default = null; + example = "dashboard"; + description = "You can directly use a pre-defined theme."; }; }; -in -{ - options = { + + callSetup = false; + extraConfig = cfg: opts: { + assertions = lib.nixvim.mkAssertions "plugins.alpha" { + assertion = cfg.theme != null -> builtins.isString cfg.theme; + message = '' + Defining `${opts.theme}` as raw lua is deprecated. You can define `${opts.settings}` as raw lua instead: + ${opts.settings} = lib.nixvim.mkRaw ${lib.generators.toPretty { } cfg.theme.__raw}; + ''; + }; plugins.alpha = { - enable = lib.mkEnableOption "alpha-nvim"; + settings = lib.mkIf (cfg.theme != null) ( + lib.mkDerivedConfig opts.theme ( + value: + if builtins.isString value then + lib.nixvim.mkRaw "require('alpha.themes.${value}').config" + else + value + ) + ); - package = lib.mkPackageOption pkgs "alpha-nvim" { - default = [ - "vimPlugins" - "alpha-nvim" - ]; - }; - - theme = mkOption { - type = with types; nullOr (maybeRaw str); - apply = v: if lib.isString v then lib.nixvim.mkRaw "require'alpha.themes.${v}'.config" else v; - default = null; - example = "dashboard"; - description = "You can directly use a pre-defined theme."; - }; - - layout = mkOption { - type = with types; either (maybeRaw str) (listOf sectionType); - default = [ ]; - description = "List of sections to layout for the dashboard"; - example = [ - { - type = "padding"; - val = 2; - } - { - type = "text"; - val = [ - "███╗ ██╗██╗██╗ ██╗██╗ ██╗██╗███╗ ███╗" - "████╗ ██║██║╚██╗██╔╝██║ ██║██║████╗ ████║" - "██╔██╗ ██║██║ ╚███╔╝ ██║ ██║██║██╔████╔██║" - "██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║" - "██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║" - "╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═══╝ ╚═╝╚═╝ ╚═╝" - ]; - opts = { - position = "center"; - hl = "Type"; - }; - } - { - type = "padding"; - val = 2; - } - { - type = "group"; - val = [ - { - type = "button"; - val = " New file"; - on_press.__raw = "function() vim.cmd[[ene]] end"; - opts.shortcut = "n"; - } - { - type = "button"; - val = " Quit Neovim"; - on_press.__raw = "function() vim.cmd[[qa]] end"; - opts.shortcut = "q"; - } - ]; - } - { - type = "padding"; - val = 2; - } - { - type = "text"; - val = "Inspiring quote here."; - opts = { - position = "center"; - hl = "Keyword"; - }; - } - ]; - }; - - opts = lib.nixvim.mkNullOrOption (with types; attrsOf anything) '' - Optional global options. + luaConfig.content = '' + require('alpha').setup(${lib.nixvim.toLuaObject cfg.settings}) + require('alpha.term') ''; }; }; - - config = - let - layoutDefined = cfg.layout != [ ]; - themeDefined = cfg.theme != null; - in - lib.mkIf cfg.enable { - extraPlugins = [ cfg.package ]; - - assertions = lib.nixvim.mkAssertions "plugins.alpha" [ - { - assertion = themeDefined || layoutDefined; - message = '' - You have to either set a `theme` or define some sections in `layout`. - ''; - } - { - assertion = !(themeDefined && layoutDefined); - message = '' - You can't define both a `theme` and custom options. - Set `plugins.alpha.theme = null` if you want to configure alpha manually using the `layout` option. - ''; - } - ]; - - extraConfigLua = - let - setupOptions = - if themeDefined then - cfg.theme - else - (with cfg; { - inherit layout opts; - }); - in - '' - require('alpha').setup(${lib.nixvim.toLuaObject setupOptions}) - require('alpha.term') - ''; - }; } diff --git a/tests/test-sources/plugins/by-name/alpha/default.nix b/tests/test-sources/plugins/by-name/alpha/default.nix index 7f88586f..7ab0b935 100644 --- a/tests/test-sources/plugins/by-name/alpha/default.nix +++ b/tests/test-sources/plugins/by-name/alpha/default.nix @@ -1,22 +1,25 @@ +{ lib, ... }: { theme = { plugins.alpha = { enable = true; + theme = "dashboard"; }; }; - theme-lua = { + theme-raw-settings = { plugins.alpha = { enable = true; - theme.__raw = "require'alpha.themes.startify'.config"; + + settings = lib.nixvim.mkRaw "require('alpha.themes.dashboard').config"; }; }; terminal = { plugins.alpha = { enable = true; - layout = [ + settings.layout = [ { type = "terminal"; command = "echo 'Welcome to Nixvim!'"; @@ -34,7 +37,7 @@ plugins.alpha = { enable = true; - layout = [ + settings.layout = [ { type = "padding"; val = 2; @@ -88,7 +91,7 @@ }; } ]; - opts = { + settings.opts = { margin = 0; noautocmd = true; @@ -104,7 +107,7 @@ plugins.web-devicons.enable = false; plugins.alpha = { enable = true; - theme = "dashboard"; + settings = lib.nixvim.mkRaw "require('alpha.themes.dashboard').config"; }; }; } From beba0820c321d9a3f40eefb6ff3a4f81c4abf933 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 08:58:27 +0100 Subject: [PATCH 11/24] dev/list-plugins: remove 'state' feature as all plugins have been migrated --- flake/dev/list-plugins/list-plugins.py | 43 ++++---------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/flake/dev/list-plugins/list-plugins.py b/flake/dev/list-plugins/list-plugins.py index 25069edd..09a286c2 100755 --- a/flake/dev/list-plugins/list-plugins.py +++ b/flake/dev/list-plugins/list-plugins.py @@ -56,16 +56,9 @@ class Kind(Enum): MISC = 3 -class State(Enum): - UNKNOWN = "❔" - NEW = "✅" - OLD = "❌" - - KNOWN_PATHS: dict[ str, tuple[ - State, # If the implem is "legacy" or up to date Kind, # Vim / Neovim / misc bool, # Has deprecation warnings ], @@ -87,7 +80,6 @@ for telescope_extension_name, has_depr_warnings in { KNOWN_PATHS[ f"plugins/by-name/telescope/extensions/{telescope_extension_name}.nix" ] = ( - State.NEW, Kind.MISC, has_depr_warnings, ) @@ -107,12 +99,10 @@ DEPRECATION_REGEX: list[re.Pattern] = [ @dataclass class Plugin: path: str - state: State kind: Kind dep_warnings: bool def __str__(self) -> str: - state_icon: str = self.state.value kind_icon: str match self.kind: case Kind.NEOVIM: @@ -125,9 +115,7 @@ class Plugin: assert False deprecation_icon: str = "⚠️ " if self.dep_warnings else " " - return ( - f"| {kind_icon}\033[0m | {state_icon} | {deprecation_icon} | {self.path}" - ) + return f"| {kind_icon}\033[0m | {deprecation_icon} | {self.path}" def print_markdown(self) -> None: print(f"- [ ] {self.path} ({self.kind.name.lower()})") @@ -146,36 +134,26 @@ def parse_file(path: str) -> Optional[Plugin]: file_content = f.read() known_path: str - props: tuple[State, Kind, bool] + props: tuple[Kind, bool] for known_path, props in KNOWN_PATHS.items(): if known_path in path: return Plugin( path=path, - state=props[0], - kind=props[1], - dep_warnings=props[2], + kind=props[0], + dep_warnings=props[1], ) - state: State = State.UNKNOWN kind: Kind if re.match( re.compile(r".*mkNeovimPlugin", re.DOTALL), file_content, ): kind = Kind.NEOVIM - state = State.NEW - elif re.match( - re.compile(r".*require.+setup", re.DOTALL), - file_content, - ): - kind = Kind.NEOVIM - state = State.OLD elif re.match( re.compile(r".*mkVimPlugin", re.DOTALL), file_content, ): kind = Kind.VIM - state = State.NEW else: raise ValueError( f"I was not able to categorize `{path}`. Consider adding it to `EXCLUDES` or `KNOWN_PATHS`." @@ -183,7 +161,6 @@ def parse_file(path: str) -> Optional[Plugin]: return Plugin( path=path, - state=state, kind=kind, dep_warnings=has_deprecation_warnings(string=file_content), ) @@ -211,10 +188,8 @@ def main(args) -> None: for plugin_path in filtered_paths: plugin: Optional[Plugin] = parse_file(path=plugin_path) if plugin is not None: - if ( - (args.kind is None or plugin.kind.name.lower() == args.kind) - and (args.state is None or plugin.state.name.lower() == args.state) - and (not args.deprecation_warnings or plugin.dep_warnings) + if (args.kind is None or plugin.kind.name.lower() == args.kind) and ( + not args.deprecation_warnings or plugin.dep_warnings ): if args.markdown: plugin.print_markdown() @@ -246,12 +221,6 @@ if __name__ == "__main__": choices=[k.name.lower() for k in Kind], help="Filter plugins by kind (neovim, vim, misc)", ) - parser.add_argument( - "-s", - "--state", - choices=[s.name.lower() for s in State], - help="Filter plugins by state (new, old, unknown)", - ) parser.add_argument( "-d", "--deprecation-warnings", From d01e1c17e2690c10d3aa6abea28838befa1fd449 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 14:46:25 +0100 Subject: [PATCH 12/24] dev/list-plugins: drop As no more plugins are declared using the legacy approach, the list-plugins.py script has lost its use. Let's drop it altogether. --- CONTRIBUTING.md | 3 - flake/default.nix | 1 - flake/dev/default.nix | 1 - flake/dev/list-plugins/default.nix | 42 ----- flake/dev/list-plugins/list-plugins.py | 237 ------------------------- typos.toml | 1 - 6 files changed, 285 deletions(-) delete mode 100644 flake/dev/list-plugins/default.nix delete mode 100755 flake/dev/list-plugins/list-plugins.py diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b96aee06..e027907c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -182,9 +182,6 @@ cd nixvim # Either setup nix-direnv, or manually enter a devshell using: nix develop - -# List all created plugins with `mkVimPlugin` -list-plugins -k vim ``` #### Writing option examples diff --git a/flake/default.nix b/flake/default.nix index 78560d99..028e0e62 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -52,7 +52,6 @@ # Propagate `packages` from the `dev` partition: inherit (config.partitions.dev.module.flake.packages.${system}) generate-all-maintainers - list-plugins ; }; }; diff --git a/flake/dev/default.nix b/flake/dev/default.nix index 454b1d02..b3e15b8e 100644 --- a/flake/dev/default.nix +++ b/flake/dev/default.nix @@ -4,7 +4,6 @@ ./fmt.nix ./generate-all-maintainers ./git-hooks.nix - ./list-plugins ./package-tests.nix ./template-tests.nix ./tests.nix diff --git a/flake/dev/list-plugins/default.nix b/flake/dev/list-plugins/default.nix deleted file mode 100644 index 232abea7..00000000 --- a/flake/dev/list-plugins/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ self, ... }: -{ - perSystem = - { - lib, - pkgs, - ... - }: - let - package = pkgs.writers.writePython3Bin "list-plugins" { - # Disable flake8 checks that are incompatible with the ruff ones - flakeIgnore = [ - # Thinks shebang is a block comment - "E265" - # line too long - "E501" - # line break before binary operator - "W503" - ]; - } (builtins.readFile ./list-plugins.py); - in - { - packages.list-plugins = package; - - checks.list-plugins-test = - pkgs.runCommand "list-plugins-test" - { - nativeBuildInputs = [ package ]; - } - '' - list-plugins --root-path ${self} > $out - ''; - - devshells.default.commands = [ - { - name = "list-plugins"; - command = ''${lib.getExe package} "$@"''; - help = "List plugins and get implementation infos"; - } - ]; - }; -} diff --git a/flake/dev/list-plugins/list-plugins.py b/flake/dev/list-plugins/list-plugins.py deleted file mode 100755 index 09a286c2..00000000 --- a/flake/dev/list-plugins/list-plugins.py +++ /dev/null @@ -1,237 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python3 -p python3 - -import glob -import os -import re -from argparse import ArgumentParser, RawTextHelpFormatter -from dataclasses import dataclass -from enum import Enum -from typing import Optional - -# Ignore files that are not plugin definitions -EXCLUDES: list[str] = [ - # Patterns - "TEMPLATE.nix", - "deprecations.nix", - "helpers.nix", - "renamed-options", - "settings-options.nix", - # Specific files - "colorschemes/base16/theme-list.nix", - "plugins/by-name/blink-cmp/provider-config.nix", - "plugins/by-name/conform-nvim/auto-install.nix", - "plugins/by-name/conform-nvim/formatter-packages.nix", - "plugins/by-name/dap/dapHelpers.nix", - "plugins/by-name/efmls-configs/packages.nix", - "plugins/by-name/hydra/hydras-option.nix", - "plugins/by-name/hydra/settings-options.nix", - "plugins/by-name/neotest/adapters-list.nix", - "plugins/by-name/neotest/adapters.nix", - "plugins/by-name/none-ls/_mk-source-plugin.nix", - "plugins/by-name/none-ls/packages.nix", - "plugins/by-name/none-ls/prettier.nix", - "plugins/by-name/none-ls/prettierd.nix", - "plugins/by-name/none-ls/settings.nix", - "plugins/by-name/none-ls/sources.nix", - "plugins/by-name/openscad/fuzzy-finder-plugin-option.nix", - "plugins/by-name/rustaceanvim/renamed-options.nix", - "plugins/by-name/telescope/extensions/_mk-extension.nix", - "plugins/by-name/telescope/extensions/default.nix", - "plugins/by-name/telescope/extensions/zf-native.nix", - "plugins/cmp/auto-enable.nix", - "plugins/cmp/options/", - "plugins/cmp/sources/cmp-fish.nix", - "plugins/cmp/sources/default.nix", - "plugins/default.nix", - "plugins/deprecation.nix", - "plugins/lsp/language-servers/", - "plugins/lsp/lsp-packages.nix", -] - - -class Kind(Enum): - NEOVIM = 1 - VIM = 2 - MISC = 3 - - -KNOWN_PATHS: dict[ - str, - tuple[ - Kind, # Vim / Neovim / misc - bool, # Has deprecation warnings - ], -] = {} -for telescope_extension_name, has_depr_warnings in { - "advanced-git-search": False, - "file-browser": True, - "frecency": True, - "fzf-native": True, - "fzy-native": True, - "live-greps-args": False, - "manix": False, - "media-files": True, - "project": False, - "ui-select": False, - "undo": True, - "zoxide": False, -}.items(): - KNOWN_PATHS[ - f"plugins/by-name/telescope/extensions/{telescope_extension_name}.nix" - ] = ( - Kind.MISC, - has_depr_warnings, - ) - - -DEPRECATION_REGEX: list[re.Pattern] = [ - re.compile(rf".*{pattern}", re.DOTALL) - for pattern in [ - "deprecateExtra", - "mkRemovedOptionModule", - "mkRenamedOptionModule", - "optionsRenamedToSettings", - ] -] - - -@dataclass -class Plugin: - path: str - kind: Kind - dep_warnings: bool - - def __str__(self) -> str: - kind_icon: str - match self.kind: - case Kind.NEOVIM: - kind_icon = "\033[94m" + " " - case Kind.VIM: - kind_icon = "\033[92m" + " " - case Kind.MISC: - kind_icon = "\033[92m" + "🟢" - case _: - assert False - deprecation_icon: str = "⚠️ " if self.dep_warnings else " " - - return f"| {kind_icon}\033[0m | {deprecation_icon} | {self.path}" - - def print_markdown(self) -> None: - print(f"- [ ] {self.path} ({self.kind.name.lower()})") - - -def has_deprecation_warnings(string: str) -> bool: - for regex in DEPRECATION_REGEX: - if re.match(regex, string): - return True - return False - - -def parse_file(path: str) -> Optional[Plugin]: - file_content: str = "" - with open(path, "r") as f: - file_content = f.read() - - known_path: str - props: tuple[Kind, bool] - for known_path, props in KNOWN_PATHS.items(): - if known_path in path: - return Plugin( - path=path, - kind=props[0], - dep_warnings=props[1], - ) - - kind: Kind - if re.match( - re.compile(r".*mkNeovimPlugin", re.DOTALL), - file_content, - ): - kind = Kind.NEOVIM - elif re.match( - re.compile(r".*mkVimPlugin", re.DOTALL), - file_content, - ): - kind = Kind.VIM - else: - raise ValueError( - f"I was not able to categorize `{path}`. Consider adding it to `EXCLUDES` or `KNOWN_PATHS`." - ) - - return Plugin( - path=path, - kind=kind, - dep_warnings=has_deprecation_warnings(string=file_content), - ) - - -def _is_excluded(path: str) -> bool: - for exclude_pattern in EXCLUDES: - if exclude_pattern in path: - return False - return True - - -def main(args) -> None: - pathname: str = os.path.join(args.root_path, "plugins/**/*.nix") - paths: list[str] = glob.glob(pathname=pathname, recursive=True) - filtered_paths: list[str] = list(filter(_is_excluded, paths)) - filtered_paths.sort() - - if not args.markdown: - print("| Typ | Sty | DW | path") - print( - "|-----|-----|----|--------------------------------------------------------" - ) - - for plugin_path in filtered_paths: - plugin: Optional[Plugin] = parse_file(path=plugin_path) - if plugin is not None: - if (args.kind is None or plugin.kind.name.lower() == args.kind) and ( - not args.deprecation_warnings or plugin.dep_warnings - ): - if args.markdown: - plugin.print_markdown() - else: - print(plugin) - - -if __name__ == "__main__": - parser: ArgumentParser = ArgumentParser( - description=""" - Analyze Nixvim plugin files - Output formats a table showing: - If a plugin is written for Neovim or Vim. - If the plugin has been updated to latest style standards. - If a plugin contains any deprecation warnings. - """, - formatter_class=RawTextHelpFormatter, - ) - # TODO: consider automatically localizing the flake's root. - parser.add_argument( - "--root-path", - type=str, - default="./", - help="The path to the root of the nixvim repo", - ) - parser.add_argument( - "-k", - "--kind", - choices=[k.name.lower() for k in Kind], - help="Filter plugins by kind (neovim, vim, misc)", - ) - parser.add_argument( - "-d", - "--deprecation-warnings", - action="store_true", - help="Show only plugins with deprecation warnings", - ) - parser.add_argument( - "-m", - "--markdown", - action="store_true", - help="Markdown output", - ) - - main(parser.parse_args()) diff --git a/typos.toml b/typos.toml index 79d1d669..863ad310 100644 --- a/typos.toml +++ b/typos.toml @@ -16,7 +16,6 @@ tro = "tro" # ./plugins/utils/spectre.nix protols = "protols" # ./plugins/lsp/lsp-packages.nix compatibilty = "compatibilty" # ./plugins/by-name/visual-multi/default.nix Maco = "Maco" # ./plugins/by-name/femaco -Typ = "Typ" # ./flake/dev/list-plugins/list-plugins.py [type.patch] extend-glob = ["*.patch"] From 4dbcc266e7ab8cc511a18dd0566e13db66e9043a Mon Sep 17 00:00:00 2001 From: "nixvim-ci[bot]" <212996653+nixvim-ci[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 22:32:50 +0000 Subject: [PATCH 13/24] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/864599284fc7c0ba6357ed89ed5e2cd5040f0c04?narHash=sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4%3D' (2025-10-20) → 'github:hercules-ci/flake-parts/0010412d62a25d959151790968765a70c436598b?narHash=sha256-z5PlZ47j50VNF3R%2BIMS9LmzI5fYRGY/Z5O5tol1c9I4%3D' (2025-11-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e99366c665bdd53b7b500ccdc5226675cfc51f45?narHash=sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg%3D' (2025-10-28) → 'github:NixOS/nixpkgs/7241bcbb4f099a66aafca120d37c65e8dda32717?narHash=sha256-Yg7Ag7ov5%2B36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs%3D' (2025-11-03) --- flake.lock | 12 ++++++------ version-info.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index bc3094dd..1489a7ba 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1762040540, + "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "0010412d62a25d959151790968765a70c436598b", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761656231, - "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", + "lastModified": 1762156382, + "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "type": "github" }, "original": { diff --git a/version-info.toml b/version-info.toml index 6c01a4d1..5c9c0a27 100644 --- a/version-info.toml +++ b/version-info.toml @@ -1,6 +1,6 @@ # DO NOT MODIFY! # This file was generated by ci/version-info/default.nix -nixpkgs_rev = "e99366c665bdd53b7b500ccdc5226675cfc51f45" +nixpkgs_rev = "7241bcbb4f099a66aafca120d37c65e8dda32717" release = "25.11" unstable = true From a554f2b0f0ae655f6eaa28cbd02a1ac0509c3124 Mon Sep 17 00:00:00 2001 From: "nixvim-ci[bot]" <212996653+nixvim-ci[bot]@users.noreply.github.com> Date: Mon, 3 Nov 2025 22:33:02 +0000 Subject: [PATCH 14/24] flake/dev/flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'dev-nixpkgs': 'github:NixOS/nixpkgs/e99366c665bdd53b7b500ccdc5226675cfc51f45?narHash=sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg%3D' (2025-10-28) → 'github:NixOS/nixpkgs/7241bcbb4f099a66aafca120d37c65e8dda32717?narHash=sha256-Yg7Ag7ov5%2B36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs%3D' (2025-11-03) • Updated input 'home-manager': 'github:nix-community/home-manager/124b99dbd1594dbebdd575ac7142752ee96a98a0?narHash=sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8%3D' (2025-10-29) → 'github:nix-community/home-manager/95d65dddae7ae6300b22cf1d61cb5e71dca8da5b?narHash=sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC%2Bk%3D' (2025-11-03) • Updated input 'nix-darwin': 'github:lnl7/nix-darwin/7cd9aac79ee2924a85c211d21fafd394b06a38de?narHash=sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig%3D' (2025-10-24) → 'github:lnl7/nix-darwin/69921864a70b58787abf5ba189095566c3f0ffd3?narHash=sha256-dzLBZKccS0jMefj%2BWAYwsk7gKDluqavC7I4KfFwVh8k%3D' (2025-11-03) --- flake/dev/flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index 90316fe1..cb5311f3 100644 --- a/flake/dev/flake.lock +++ b/flake/dev/flake.lock @@ -2,11 +2,11 @@ "nodes": { "dev-nixpkgs": { "locked": { - "lastModified": 1761656231, - "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", + "lastModified": 1762156382, + "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1761770832, - "narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=", + "lastModified": 1762204486, + "narHash": "sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC+k=", "owner": "nix-community", "repo": "home-manager", - "rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0", + "rev": "95d65dddae7ae6300b22cf1d61cb5e71dca8da5b", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1761339987, - "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", + "lastModified": 1762186368, + "narHash": "sha256-dzLBZKccS0jMefj+WAYwsk7gKDluqavC7I4KfFwVh8k=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", + "rev": "69921864a70b58787abf5ba189095566c3f0ffd3", "type": "github" }, "original": { From 4363d100efe2bee0dd2f236c4c1cd58e453f96eb Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 6 Nov 2025 00:39:53 +0000 Subject: [PATCH 15/24] ci/rust-analyzer: print offending sub-enums When we throw "anyOf can only contain a single enum", let's also print the actual enums for debugging purposes. --- ci/rust-analyzer/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/rust-analyzer/default.nix b/ci/rust-analyzer/default.nix index d2d5492d..aa0c048b 100644 --- a/ci/rust-analyzer/default.nix +++ b/ci/rust-analyzer/default.nix @@ -200,9 +200,10 @@ let let subEnums = lib.filter (lib.hasAttr "enum") anyOf; subEnum = - assert lib.assertMsg ( - lib.length subEnums == 1 - ) "anyOf types may currently only contain a single enum"; + assert lib.assertMsg (lib.length subEnums == 1) + "anyOf types may currently only contain a single enum. Found ${ + lib.generators.toPretty { } subEnums + }"; lib.head subEnums; in if subEnum ? enumDescriptions then From 0a875e2d8a0071d98c6ea0d3dbd2fc119ba457ee Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 6 Nov 2025 00:40:56 +0000 Subject: [PATCH 16/24] ci/rust-analyzer: filter deprecated sub-types --- ci/rust-analyzer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/rust-analyzer/default.nix b/ci/rust-analyzer/default.nix index aa0c048b..255f9147 100644 --- a/ci/rust-analyzer/default.nix +++ b/ci/rust-analyzer/default.nix @@ -58,7 +58,9 @@ let } else if anyOf != null then let - possibleTypes = lib.filter (sub: !(sub.type == "null" && nullable)) anyOf; + possibleTypes = lib.filter ( + sub: !(sub.type or null == "null" && nullable) && !(sub.deprecated or false) + ) anyOf; in { kind = "oneOf"; @@ -198,7 +200,7 @@ let enumDesc enum enumDescriptions else let - subEnums = lib.filter (lib.hasAttr "enum") anyOf; + subEnums = lib.filter (sub: sub ? enum && !(sub.deprecated or false)) anyOf; subEnum = assert lib.assertMsg (lib.length subEnums == 1) "anyOf types may currently only contain a single enum. Found ${ From 6aa891918acd82ade61d586d781c5dba74cf2e95 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 6 Nov 2025 01:02:41 +0000 Subject: [PATCH 17/24] generated: Update - Updated lspconfig-servers.json - Updated rust-analyzer-options.json - Updated unsupported-lspconfig-servers.json --- generated/lspconfig-servers.json | 5 ++-- generated/rust-analyzer-options.json | 29 ++++++++++++++++---- generated/unsupported-lspconfig-servers.json | 1 + 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/generated/lspconfig-servers.json b/generated/lspconfig-servers.json index 10b84504..f3efbba3 100644 --- a/generated/lspconfig-servers.json +++ b/generated/lspconfig-servers.json @@ -36,7 +36,6 @@ "buck2": "https://github.com/facebook/buck2 Build system, successor to Buck To\nbetter detect Buck2 project files, the following can be added:\n\n vim.cmd [[ autocmd BufRead,BufNewFile *.bxl,BUCK,TARGETS set filetype=bzl ]]", "buddy_ls": "https://github.com/buddy-compiler/buddy-mlir#buddy-lsp-server The\nLanguage Server for the buddy-mlir, a drop-in replacement for\nmlir-lsp-server, supporting new dialects defined in buddy-mlir.\n`buddy-lsp-server` can be installed at the buddy-mlir repository\n(buddy-compiler/buddy-mlir)", "buf_ls": "", - "bufls": "https://github.com/bufbuild/buf-language-server `buf-language-server`\ncan be installed via `go install`:\n\n``` sh\ngo install github.com/bufbuild/buf-language-server/cmd/bufls@latest\n```\n\nbufls is a Protobuf language server compatible with Buf modules and\nworkspaces", "bzl": "https://bzl.io/ https://docs.stack.build/docs/cli/installation\nhttps://docs.stack.build/docs/vscode/starlark-language-server", "c3_lsp": "https://github.com/pherrymason/c3-lsp Language Server for c3.", "cairo_ls": "[Cairo Language\nServer](https://github.com/starkware-libs/cairo/tree/main/crates/cairo-lang-language-server)\nFirst, install Cairo following [this\ntutorial](https://book.cairo-lang.org/ch01-01-installation.html) Then\nenable Cairo Language Server in your Lua configuration.\n\n``` lua\nvim.lsp.enable('cairo_ls')\n```\n\n*cairo-language-server is still under active development, some features\nmight not work yet !*", @@ -154,7 +153,7 @@ "jqls": "https://github.com/wader/jq-lsp Language server for jq, written using\nGo. You can install the server easily using go install:\n\n``` sh\n# install directly\ngo install github.com/wader/jq-lsp@master\n# copy binary to $PATH\ncp $(go env GOPATH)/bin/jq-lsp /usr/local/bin\n```\n\nNote: To activate properly nvim needs to know the jq filetype. You can\nadd it via:\n\n``` lua\nvim.cmd([[au BufRead,BufNewFile *.jq setfiletype jq]])\n```", "jsonls": "https://github.com/hrsh7th/vscode-langservers-extracted\nvscode-json-language-server, a language server for JSON and JSON schema\n`vscode-json-language-server` can be installed via `npm`:\n\n``` sh\nnpm i -g vscode-langservers-extracted\n```\n\n`vscode-json-language-server` only provides completions when snippet\nsupport is enabled. If you use Neovim older than v0.10 you need to\nenable completion, install a snippet plugin and add the following\noverride to your language client capabilities during setup.\n\n``` lua\n--Enable (broadcasting) snippet capability for completion\nlocal capabilities = vim.lsp.protocol.make_client_capabilities()\ncapabilities.textDocument.completion.completionItem.snippetSupport = true\nvim.lsp.config('jsonls', {\n capabilities = capabilities,\n})\n```", "jsonnet_ls": "", - "julials": "https://github.com/julia-vscode/julia-vscode LanguageServer.jl can be\ninstalled with `julia` and `Pkg`:\n\n``` sh\njulia --project=~/.julia/environments/nvim-lspconfig -e 'using Pkg; Pkg.add(\"LanguageServer\")'\n```\n\nwhere `~/.julia/environments/nvim-lspconfig` is the location where the\ndefault configuration expects LanguageServer.jl to be installed. To\nupdate an existing install, use the following command:\n\n``` sh\njulia --project=~/.julia/environments/nvim-lspconfig -e 'using Pkg; Pkg.update()'\n```\n\nNote: In order to have LanguageServer.jl pick up installed packages or\ndependencies in a Julia project, you must make sure that the project is\ninstantiated:\n\n``` sh\njulia --project=/path/to/my/project -e 'using Pkg; Pkg.instantiate()'\n```\n\nNote: The julia programming language searches for global environments\nwithin the `environments/` folder of `$JULIA_DEPOT_PATH` entries. By\ndefault this simply `~/.julia/environments`", + "julials": "https://github.com/julia-vscode/julia-vscode LanguageServer.jl,\nSymbolServer.jl and StaticLint.jl can be installed with `julia` and\n`Pkg`:\n\n``` sh\njulia --project=~/.julia/environments/nvim-lspconfig -e 'using Pkg; Pkg.add(\"LanguageServer\"); Pkg.add(\"SymbolServer\"); Pkg.add(\"StaticLint\")'\n```\n\nwhere `~/.julia/environments/nvim-lspconfig` is the location where the\ndefault configuration expects LanguageServer.jl, SymbolServer.jl and\nStaticLint.jl to be installed. To update an existing install, use the\nfollowing command:\n\n``` sh\njulia --project=~/.julia/environments/nvim-lspconfig -e 'using Pkg; Pkg.update()'\n```\n\nNote: In order to have LanguageServer.jl pick up installed packages or\ndependencies in a Julia project, you must make sure that the project is\ninstantiated:\n\n``` sh\njulia --project=/path/to/my/project -e 'using Pkg; Pkg.instantiate()'\n```\n\nNote: The julia programming language searches for global environments\nwithin the `environments/` folder of `$JULIA_DEPOT_PATH` entries. By\ndefault this simply `~/.julia/environments`", "just": "https://github.com/terror/just-lsp `just-lsp` is an LSP for just built\non top of the tree-sitter-just parser.", "kcl": "https://github.com/kcl-lang/kcl.nvim Language server for the KCL\nconfiguration and policy language.", "koka": "https://koka-lang.github.io/koka/doc/index.html Koka is a functional\nprogramming language with effect types and handlers.", @@ -227,7 +226,7 @@ "please": "https://github.com/thought-machine/please High-performance extensible\nbuild system for reproducible multi-language builds. The `plz` binary\nwill automatically install the LSP for you on first run", "pli": "`pli_language_server` is a language server for the PL/I language used on\nIBM SystemZ mainframes. To learn how to configure the PL/I language\nserver, see the [PL/I Language Support\ndocumentation](https://github.com/zowe/zowe-pli-language-support).", "poryscript_pls": "https://github.com/huderlem/poryscript-pls Language server for\nporyscript (a high level scripting language for GBA-era Pokémon\ndecompilation projects)", - "postgres_lsp": "https://pgtools.dev A collection of language tools and a Language Server\nProtocol (LSP) implementation for Postgres, focusing on developer\nexperience and reliable SQL tooling.", + "postgres_lsp": "https://pg-language-server.com A collection of language tools and a\nLanguage Server Protocol (LSP) implementation for Postgres, focusing on\ndeveloper experience and reliable SQL tooling.", "powershell_es": "", "prismals": "Language Server for the Prisma JavaScript and TypeScript ORM\n`@prisma/language-server` can be installed via npm\n\n``` sh\nnpm install -g @prisma/language-server\n```", "prolog_ls": "https://github.com/jamesnvc/lsp_server Language Server Protocol server\nfor SWI-Prolog", diff --git a/generated/rust-analyzer-options.json b/generated/rust-analyzer-options.json index e28b5f5c..cc19f988 100644 --- a/generated/rust-analyzer-options.json +++ b/generated/rust-analyzer-options.json @@ -845,11 +845,16 @@ } }, "rust-analyzer.imports.granularity.group": { - "description": "How imports should be grouped into use statements.\n\nValues:\n- preserve: Do not change the granularity of any imports and preserve the original structure written by the developer.\n- crate: Merge imports from the same crate into a single use statement. Conversely, imports from different crates are split into separate statements.\n- module: Merge imports from the same module into a single use statement. Conversely, imports from different modules are split into separate statements.\n- item: Flatten imports so that each has its own use statement.\n- one: Merge all imports into a single use statement as long as they have the same visibility and attributes.\n", + "description": "How imports should be grouped into use statements.\n\nValues:\n- crate: Merge imports from the same crate into a single use statement. Conversely, imports from different crates are split into separate statements.\n- module: Merge imports from the same module into a single use statement. Conversely, imports from different modules are split into separate statements.\n- item: Flatten imports so that each has its own use statement.\n- one: Merge all imports into a single use statement as long as they have the same visibility and attributes.\n", "pluginDefault": "crate", "type": { - "kind": "enum", - "values": ["preserve", "crate", "module", "item", "one"] + "kind": "oneOf", + "subTypes": [ + { + "kind": "enum", + "values": ["crate", "module", "item", "one"] + } + ] } }, "rust-analyzer.imports.group.enable": { @@ -956,6 +961,13 @@ "values": ["always", "never", "fieldless"] } }, + "rust-analyzer.inlayHints.expressionAdjustmentHints.disableReborrows": { + "description": "Disable reborrows in expression adjustments inlay hints.\n\nReborrows are a pair of a builtin deref then borrow, i.e. `&*`. They are inserted by the compiler but are mostly useless to the programmer.\n\nNote: if the deref is not builtin (an overloaded deref), or the borrow is `&raw const`/`&raw mut`, they are not removed.\n", + "pluginDefault": true, + "type": { + "kind": "boolean" + } + }, "rust-analyzer.inlayHints.expressionAdjustmentHints.enable": { "description": "Show inlay hints for type adjustments.\n\nValues:\n- always: Always show all adjustment hints.\n- never: Never show adjustment hints.\n- reborrow: Only show auto borrow and dereference adjustment hints.\n", "pluginDefault": "never", @@ -1030,7 +1042,7 @@ } }, "rust-analyzer.inlayHints.maxLength": { - "description": "Maximum length for inlay hints. Set to null to have an unlimited length.\n", + "description": "Maximum length for inlay hints. Set to null to have an unlimited length.\n\n**Note:** This is mostly a hint, and we don't guarantee to strictly follow the limit.\n", "pluginDefault": 25, "type": { "kind": "integer", @@ -1321,7 +1333,7 @@ }, "rust-analyzer.runnables.extraTestBinaryArgs": { "description": "Additional arguments to be passed through Cargo to launched tests, benchmarks, or\ndoc-tests.\n\nUnless the launched target uses a\n[custom test harness](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#the-harness-field),\nthey will end up being interpreted as options to\n[`rustc`’s built-in test harness (“libtest”)](https://doc.rust-lang.org/rustc/tests/index.html#cli-arguments).\n", - "pluginDefault": ["--show-output"], + "pluginDefault": ["--nocapture"], "type": { "item": { "kind": "string" @@ -1363,6 +1375,13 @@ "kind": "boolean" } }, + "rust-analyzer.semanticHighlighting.comments.enable": { + "description": "Use semantic tokens for comments.\n\nIn some editors (e.g. vscode) semantic tokens override other highlighting grammars.\nBy disabling semantic tokens for comments, other grammars can be used to highlight\ntheir contents.\n", + "pluginDefault": true, + "type": { + "kind": "boolean" + } + }, "rust-analyzer.semanticHighlighting.doc.comment.inject.enable": { "description": "Inject additional highlighting into doc comments.\n\nWhen enabled, rust-analyzer will highlight rust source in doc comments as well as intra\ndoc links.\n", "pluginDefault": true, diff --git a/generated/unsupported-lspconfig-servers.json b/generated/unsupported-lspconfig-servers.json index fb61e7af..3ece3ed6 100644 --- a/generated/unsupported-lspconfig-servers.json +++ b/generated/unsupported-lspconfig-servers.json @@ -1,6 +1,7 @@ [ "bitbake_ls", "bqnlsp", + "bufls", "cadence", "clarity_lsp", "codeqlls", From a38fba5880821df4fd2699a210b29ae8fb851f17 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 23:33:40 +0100 Subject: [PATCH 18/24] tests: disable docker-language-server (build failure) Fixed in https://github.com/NixOS/nixpkgs/pull/458418 --- tests/all-package-defaults.nix | 4 ++++ tests/lsp-servers.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tests/all-package-defaults.nix b/tests/all-package-defaults.nix index 685de494..eab95703 100644 --- a/tests/all-package-defaults.nix +++ b/tests/all-package-defaults.nix @@ -15,6 +15,10 @@ let disabledTests = [ # 2025-10-12 dependency mbedtls is marked as insecure "haxe" + + # 2025-11-06 build failure + # Fixed in https://github.com/NixOS/nixpkgs/pull/458418 + "docker-language-server" ] ++ lib.optionals (hostPlatform.isLinux && hostPlatform.isAarch64) [ # "tabnine" diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix index 1924008d..ba26f6d8 100644 --- a/tests/lsp-servers.nix +++ b/tests/lsp-servers.nix @@ -40,6 +40,10 @@ let # TODO: 2025-07-25 build failure "mint" + # TODO: 2025-11-06 build failure + # Fixed in https://github.com/NixOS/nixpkgs/pull/458418 + "docker_language_server" + # DEPRECATED SERVERS # See https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig.lua "ruff_lsp" From 4728aae7cfdcc6b0b3172ee04f04f006019c4a7e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 23:37:02 +0100 Subject: [PATCH 19/24] plugins/ethersync: rename to teamtype https://github.com/NixOS/nixpkgs/pull/456770 --- plugins/by-name/{ethersync => teamtype}/default.nix | 2 +- plugins/deprecation.nix | 2 ++ tests/test-sources/plugins/by-name/ethersync/default.nix | 5 ----- tests/test-sources/plugins/by-name/teamtype/default.nix | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) rename plugins/by-name/{ethersync => teamtype}/default.nix (87%) delete mode 100644 tests/test-sources/plugins/by-name/ethersync/default.nix create mode 100644 tests/test-sources/plugins/by-name/teamtype/default.nix diff --git a/plugins/by-name/ethersync/default.nix b/plugins/by-name/teamtype/default.nix similarity index 87% rename from plugins/by-name/ethersync/default.nix rename to plugins/by-name/teamtype/default.nix index ac99eae0..80d265c9 100644 --- a/plugins/by-name/ethersync/default.nix +++ b/plugins/by-name/teamtype/default.nix @@ -1,6 +1,6 @@ { lib, ... }: lib.nixvim.plugins.mkNeovimPlugin { - name = "ethersync"; + name = "teamtype"; maintainers = [ lib.maintainers.GaetanLepage ]; diff --git a/plugins/deprecation.nix b/plugins/deprecation.nix index bd58f2ff..5402229b 100644 --- a/plugins/deprecation.nix +++ b/plugins/deprecation.nix @@ -41,6 +41,8 @@ let surround = "vim-surround"; # Added 2025-10-06 presence-nvim = "presence"; + # Added 2025-11-07 + ethersync = "teamtype"; }; # Added 2024-09-21; remove after 24.11 # `iconsPackage` options were briefly available in the following plugins for ~3 weeks diff --git a/tests/test-sources/plugins/by-name/ethersync/default.nix b/tests/test-sources/plugins/by-name/ethersync/default.nix deleted file mode 100644 index c508b8bd..00000000 --- a/tests/test-sources/plugins/by-name/ethersync/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - empty = { - plugins.ethersync.enable = true; - }; -} diff --git a/tests/test-sources/plugins/by-name/teamtype/default.nix b/tests/test-sources/plugins/by-name/teamtype/default.nix new file mode 100644 index 00000000..1e570edf --- /dev/null +++ b/tests/test-sources/plugins/by-name/teamtype/default.nix @@ -0,0 +1,5 @@ +{ + empty = { + plugins.teamtype.enable = true; + }; +} From 7c949f2faf6b546a4cc520ea8c11d52d8f89f250 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 23:37:37 +0100 Subject: [PATCH 20/24] plugins/lsp/packages (postgres_lsp): rename nixpkgs package --- plugins/lsp/lsp-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/lsp/lsp-packages.nix b/plugins/lsp/lsp-packages.nix index f3a32cf9..82766075 100644 --- a/plugins/lsp/lsp-packages.nix +++ b/plugins/lsp/lsp-packages.nix @@ -326,7 +326,7 @@ "phan" ]; phpactor = "phpactor"; - postgres_lsp = "postgres-lsp"; + postgres_lsp = "postgres-language-server"; protols = "protols"; psalm = [ "phpPackages" From 9256b49ec0967742d563199669eecb0a4706295e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 23:45:32 +0100 Subject: [PATCH 21/24] plugins/lsp/packages: remove bufls --- plugins/lsp/lsp-packages.nix | 1 - tests/lsp-servers.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/plugins/lsp/lsp-packages.nix b/plugins/lsp/lsp-packages.nix index 82766075..e4c8908a 100644 --- a/plugins/lsp/lsp-packages.nix +++ b/plugins/lsp/lsp-packages.nix @@ -18,7 +18,6 @@ "bright_script" "bsl_ls" "buddy_ls" - "bufls" "bzl" "c3_lsp" "cairo_ls" diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix index ba26f6d8..9f8a392d 100644 --- a/tests/lsp-servers.nix +++ b/tests/lsp-servers.nix @@ -47,7 +47,6 @@ let # DEPRECATED SERVERS # See https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig.lua "ruff_lsp" - "bufls" "typst_lsp" ]; in From f0dceb449af35c83a0e2bf23c71f50fc61aff42f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Nov 2025 00:34:10 +0100 Subject: [PATCH 22/24] plugins/leap: remove addDefaultMappings as it was removed upstream --- plugins/by-name/leap/default.nix | 38 ++++++++----------- .../plugins/by-name/leap/default.nix | 1 - 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/plugins/by-name/leap/default.nix b/plugins/by-name/leap/default.nix index a6e54002..f3b99c97 100644 --- a/plugins/by-name/leap/default.nix +++ b/plugins/by-name/leap/default.nix @@ -2,38 +2,32 @@ lib, ... }: -let - inherit (lib) types; -in lib.nixvim.plugins.mkNeovimPlugin { name = "leap"; package = "leap-nvim"; maintainers = [ lib.maintainers.khaneliman ]; - extraOptions = { - addDefaultMappings = lib.mkOption { - type = types.bool; - default = true; - description = "Whether to enable the default mappings."; - }; - }; - callSetup = false; extraConfig = cfg: { - plugins.leap.luaConfig.content = - lib.optionalString cfg.addDefaultMappings '' - require('leap').add_default_mappings() - '' - + lib.optionalString (cfg.settings != { }) '' - require('leap').opts = vim.tbl_deep_extend( - "keep", - ${lib.nixvim.toLuaObject cfg.settings}, - require('leap').opts - ) - ''; + plugins.leap.luaConfig.content = lib.optionalString (cfg.settings != { }) '' + require('leap').opts = vim.tbl_deep_extend( + "keep", + ${lib.nixvim.toLuaObject cfg.settings}, + require('leap').opts + ) + ''; }; + # TODO: Added 2025-11-07. Remove after 26.05 + imports = [ + (lib.mkRemovedOptionModule [ + "plugins" + "leap" + "addDefaultMappings" + ] "See `:help leap-mappings` to update your config") + ]; + # TODO: Deprecated 2025-10-04 inherit (import ./deprecations.nix) optionsRenamedToSettings diff --git a/tests/test-sources/plugins/by-name/leap/default.nix b/tests/test-sources/plugins/by-name/leap/default.nix index 31589162..ec6af93f 100644 --- a/tests/test-sources/plugins/by-name/leap/default.nix +++ b/tests/test-sources/plugins/by-name/leap/default.nix @@ -18,7 +18,6 @@ example = { plugins.leap = { enable = true; - addDefaultMappings = true; settings = { max_phase_one_targets = 10; highlight_unlabeled_phase_one_targets = false; From b402345fcbbe19a470dda58985ae09a29bd658a3 Mon Sep 17 00:00:00 2001 From: "nixvim-ci[bot]" <212996653+nixvim-ci[bot]@users.noreply.github.com> Date: Fri, 7 Nov 2025 00:07:34 +0000 Subject: [PATCH 23/24] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/0010412d62a25d959151790968765a70c436598b?narHash=sha256-z5PlZ47j50VNF3R%2BIMS9LmzI5fYRGY/Z5O5tol1c9I4%3D' (2025-11-01) → 'github:hercules-ci/flake-parts/26d05891e14c88eb4a5d5bee659c0db5afb609d8?narHash=sha256-xxdepIcb39UJ94%2BYydGP221rjnpkDZUlykKuF54PsqI%3D' (2025-11-06) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7241bcbb4f099a66aafca120d37c65e8dda32717?narHash=sha256-Yg7Ag7ov5%2B36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs%3D' (2025-11-03) → 'github:NixOS/nixpkgs/ffcdcf99d65c61956d882df249a9be53e5902ea5?narHash=sha256-lz718rr1BDpZBYk7%2BG8cE6wee3PiBUpn8aomG/vLLiY%3D' (2025-11-05) --- flake.lock | 12 ++++++------ version-info.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 1489a7ba..72e25e20 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1762040540, - "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", + "lastModified": 1762440070, + "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0010412d62a25d959151790968765a70c436598b", + "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762156382, - "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", + "lastModified": 1762361079, + "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", + "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5", "type": "github" }, "original": { diff --git a/version-info.toml b/version-info.toml index 5c9c0a27..0fa0758f 100644 --- a/version-info.toml +++ b/version-info.toml @@ -1,6 +1,6 @@ # DO NOT MODIFY! # This file was generated by ci/version-info/default.nix -nixpkgs_rev = "7241bcbb4f099a66aafca120d37c65e8dda32717" +nixpkgs_rev = "ffcdcf99d65c61956d882df249a9be53e5902ea5" release = "25.11" unstable = true From 6dcfa84ef85a497b6dfe6bf22679130b333eedba Mon Sep 17 00:00:00 2001 From: "nixvim-ci[bot]" <212996653+nixvim-ci[bot]@users.noreply.github.com> Date: Fri, 7 Nov 2025 00:07:45 +0000 Subject: [PATCH 24/24] flake/dev/flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'dev-nixpkgs': 'github:NixOS/nixpkgs/7241bcbb4f099a66aafca120d37c65e8dda32717?narHash=sha256-Yg7Ag7ov5%2B36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs%3D' (2025-11-03) → 'github:NixOS/nixpkgs/ffcdcf99d65c61956d882df249a9be53e5902ea5?narHash=sha256-lz718rr1BDpZBYk7%2BG8cE6wee3PiBUpn8aomG/vLLiY%3D' (2025-11-05) • Updated input 'git-hooks': 'github:cachix/git-hooks.nix/ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37?narHash=sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc%3D' (2025-10-17) → 'github:cachix/git-hooks.nix/8e7576e79b88c16d7ee3bbd112c8d90070832885?narHash=sha256-j%2BrNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0%3D' (2025-11-06) • Updated input 'home-manager': 'github:nix-community/home-manager/95d65dddae7ae6300b22cf1d61cb5e71dca8da5b?narHash=sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC%2Bk%3D' (2025-11-03) → 'github:nix-community/home-manager/0562fef070a1027325dd4ea10813d64d2c967b39?narHash=sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU%3D' (2025-11-06) • Updated input 'nix-darwin': 'github:lnl7/nix-darwin/69921864a70b58787abf5ba189095566c3f0ffd3?narHash=sha256-dzLBZKccS0jMefj%2BWAYwsk7gKDluqavC7I4KfFwVh8k%3D' (2025-11-03) → 'github:lnl7/nix-darwin/b8c7ac030211f18bd1f41eae0b815571853db7a2?narHash=sha256-ikVIPB/ea/BAODk6aksgkup9k2jQdrwr4%2BZRXtBgmSs%3D' (2025-11-05) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/2eddae033e4e74bf581c2d1dfa101f9033dbd2dc?narHash=sha256-Msq86cR5SjozQGCnC6H8C%2B0cD4rnx91BPltZ9KK613Y%3D' (2025-10-24) → 'github:numtide/treefmt-nix/97a30861b13c3731a84e09405414398fbf3e109f?narHash=sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g%2BmjR/p5TEg%3D' (2025-11-06) --- flake/dev/flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index cb5311f3..e829a697 100644 --- a/flake/dev/flake.lock +++ b/flake/dev/flake.lock @@ -2,11 +2,11 @@ "nodes": { "dev-nixpkgs": { "locked": { - "lastModified": 1762156382, - "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", + "lastModified": 1762361079, + "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", + "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1762204486, - "narHash": "sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC+k=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "95d65dddae7ae6300b22cf1d61cb5e71dca8da5b", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1762186368, - "narHash": "sha256-dzLBZKccS0jMefj+WAYwsk7gKDluqavC7I4KfFwVh8k=", + "lastModified": 1762304480, + "narHash": "sha256-ikVIPB/ea/BAODk6aksgkup9k2jQdrwr4+ZRXtBgmSs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "69921864a70b58787abf5ba189095566c3f0ffd3", + "rev": "b8c7ac030211f18bd1f41eae0b815571853db7a2", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1761311587, - "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", + "lastModified": 1762410071, + "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", + "rev": "97a30861b13c3731a84e09405414398fbf3e109f", "type": "github" }, "original": {