flake/dev/flake.lock: Update

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)

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

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762040540,
+        "lastModified": 1762440070,
-        "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
+        "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,
+        "lastModified": 1762361079,
-        "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
+        "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
+        "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
         "type": "github"
       },
       "original": {

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

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

flake/dev/flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "dev-nixpkgs": {
       "locked": {
-        "lastModified": 1762156382,
+        "lastModified": 1762361079,
-        "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
+        "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
+        "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760663237,
+        "lastModified": 1762441963,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "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,
+        "lastModified": 1762463325,
-        "narHash": "sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC+k=",
+        "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "95d65dddae7ae6300b22cf1d61cb5e71dca8da5b",
+        "rev": "0562fef070a1027325dd4ea10813d64d2c967b39",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762186368,
+        "lastModified": 1762304480,
-        "narHash": "sha256-dzLBZKccS0jMefj+WAYwsk7gKDluqavC7I4KfFwVh8k=",
+        "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,
+        "lastModified": 1762410071,
-        "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
+        "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
+        "rev": "97a30861b13c3731a84e09405414398fbf3e109f",
         "type": "github"
       },
       "original": {

flake/dev/list-plugins/default.nix

@@ -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";
-        }
-      ];
-    };
-}

flake/dev/list-plugins/list-plugins.py

@@ -1,268 +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
-
-
-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
-    ],
-] = {}
-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"
-    ] = (
-        State.NEW,
-        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
-    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:
-                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  | {state_icon}  | {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[State, 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],
-            )
-
-    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`."
-        )
-
-    return Plugin(
-        path=path,
-        state=state,
-        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 (args.state is None or plugin.state.name.lower() == args.state)
-                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(
-        "-s",
-        "--state",
-        choices=[s.name.lower() for s in State],
-        help="Filter plugins by state (new, old, unknown)",
-    )
-    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())

plugins/by-name/alpha/default.nix

@@ -1,177 +1,113 @@
-{
+{ lib, ... }:
-  lib,
+lib.nixvim.plugins.mkNeovimPlugin {
-  config,
+  name = "alpha";
-  pkgs,
+  package = "alpha-nvim";
-  ...
-}:
-let
-  inherit (lib) types mkOption;
 
-  cfg = config.plugins.alpha;
+  maintainers = [ lib.maintainers.HeitorAugustoLN ];
 
-  sectionType = types.submodule {
+  # TODO Added 2025-10-26: remove after 26.05
-    freeformType = with types; attrsOf anything;
+  optionsRenamedToSettings = [
-    options = {
+    "opts"
-      type = mkOption {
+    "layout"
-        type = types.enum [
+  ];
-          "button"
+
-          "group"
+  settingsExample = {
-          "padding"
+    layout = [
-          "text"
+      {
-          "terminal"
+        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 (
+  extraOptions = {
-        with types;
+    theme = lib.mkOption {
-        nullOr (oneOf [
+      type =
-
+        with lib.types;
-          # "button", "text"
+        let
-          (maybeRaw str)
+          # TODO: deprecated 2025-10-30, remove after 26.05
-          # "padding"
+          old = nullOr (maybeRaw str);
-          int
+          new = nullOr str;
-          (listOf (
+        in
-            either
+        old // { inherit (new) description; };
-              # "text" (list of strings)
+      default = null;
-              str
+      example = "dashboard";
-              # "group"
+      description = "You can directly use a pre-defined theme.";
-              (attrsOf anything)
-          ))
-        ])
-      ) "Value for section";
-
-      opts = mkOption {
-        type = with types; attrsOf anything;
-        default = { };
-        description = "Additional options for the section";
-      };
     };
   };
-in
+
-{
+  callSetup = false;
-  options = {
+  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" {
+      luaConfig.content = ''
-        default = [
+        require('alpha').setup(${lib.nixvim.toLuaObject cfg.settings})
-          "vimPlugins"
+        require('alpha.term')
-          "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.
       '';
     };
   };
-
-  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')
-        '';
-    };
 }

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 ];
+  maintainers = [ lib.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.
-        '';
-  };
 
   settingsExample = {
     enabled = true;

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: {

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;
+            id = nestedLiteralLua "nil";
-            name = null;
+            name = nestedLiteralLua "nil";
             cols = 10;
             rows = 10;
           };

plugins/by-name/flutter-tools/settings-options.nix

@@ -1,65 +1,9 @@
 lib:
 let
-  inherit (lib) types;
+  inherit (lib.nixvim) defaultNullOpts;
-  inherit (lib.nixvim)
-    defaultNullOpts
-    mkNullOrOption'
-    mkNullOrOption
-    literalLua
-    ;
 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 = "<full/path/if/needed>";
-    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 `<workspace>/.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 = [ "<path-to-flutter-sdk-packages>" ];
-        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.
-      '';
-    };
   };
 }

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

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 =
+    plugins.leap.luaConfig.content = lib.optionalString (cfg.settings != { }) ''
-      lib.optionalString cfg.addDefaultMappings ''
+      require('leap').opts = vim.tbl_deep_extend(
-        require('leap').add_default_mappings()
+        "keep",
-      ''
+        ${lib.nixvim.toLuaObject cfg.settings},
-      + lib.optionalString (cfg.settings != { }) ''
+        require('leap').opts
-        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

plugins/by-name/ledger/default.nix

@@ -1,17 +1,14 @@
 {
   lib,
-  helpers,
   ...
 }:
-with lib;
+lib.nixvim.plugins.mkVimPlugin {
-with 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;

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

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(<filename>, 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/<NAME>"`.
-          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;

plugins/by-name/teamtype/default.nix

@@ -1,6 +1,6 @@
 { lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
-  name = "ethersync";
+  name = "teamtype";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 

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

plugins/lsp/lsp-packages.nix

@@ -18,7 +18,6 @@
     "bright_script"
     "bsl_ls"
     "buddy_ls"
-    "bufls"
     "bzl"
     "c3_lsp"
     "cairo_ls"
@@ -326,7 +325,7 @@
       "phan"
     ];
     phpactor = "phpactor";
-    postgres_lsp = "postgres-lsp";
+    postgres_lsp = "postgres-language-server";
     protols = "protols";
     psalm = [
       "phpPackages"

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"

tests/lsp-servers.nix

@@ -40,10 +40,13 @@ 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"
-        "bufls"
         "typst_lsp"
       ];
     in

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 = {

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;

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 = [
             "╭"

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_filenames.__empty = { };
-        exclude_filetypes = [ ];
+        exclude_filetypes.__empty = { };
         filetype_overrides = {
           coc-explorer = [
             "CoC Explorer"

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

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;

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;
+        suppressed_dirs.__raw = "nil";
-        allowed_dirs = null;
+        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 = {

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 = {

tests/test-sources/plugins/by-name/barbar/default.nix

@@ -30,8 +30,8 @@
         animation = true;
         auto_hide = -1;
         clickable = true;
-        exclude_ft = [ ];
+        exclude_ft.__empty = { };
-        exclude_name = [ ];
+        exclude_name.__empty = { };
         focus_on_close = "left";
         hide = {
           alternate = false;
@@ -94,10 +94,10 @@
             filename = false;
             separator.right = " ";
           };
-          alternate = { };
+          alternate.__empty = { };
-          current = { };
+          current.__empty = { };
-          inactive = { };
+          inactive.__empty = { };
-          visible = { };
+          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";
       };
     };
   };

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
+        colors.__raw = "nil";
-        blame_options = null; # won't output literal nil
+        blame_options.__raw = "nil";
         format_fn.__raw = "require('blame.formats.default_formats').commit_date_author_fn";
         commit_detail_view = "vsplit";
         mappings = {

tests/test-sources/plugins/by-name/blink-cmp/default.nix

@@ -59,9 +59,9 @@
                 "("
                 ")"
               ];
-              override_brackets_for_filetypes = { };
+              override_brackets_for_filetypes.__empty = { };
-              force_allow_filetypes = [ ];
+              force_allow_filetypes.__empty = { };
-              blocked_filetypes = [ ];
+              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_version.__raw = "nil";
-            force_system_triple = null;
+            force_system_triple.__raw = "nil";
-            extra_curl_args = [ ];
+            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_trigger_characters.__empty = { };
-            blocked_retrigger_characters = [ ];
+            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 = {

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 = { };
       };
     };
   };

tests/test-sources/plugins/by-name/ccc/default.nix

@@ -33,8 +33,8 @@
         lsp = true;
         highlighter = {
           auto_enable = false;
-          filetypes = [ ];
+          filetypes.__empty = { };
-          excludes = [ ];
+          excludes.__empty = { };
           lsp = true;
           update_insert = true;
         };

tests/test-sources/plugins/by-name/chadtree/default.nix

@@ -52,8 +52,8 @@
               "thumbs.db"
               ".git"
             ];
-            name_glob = [ ];
+            name_glob.__empty = { };
-            path_glob = [ ];
+            path_glob.__empty = { };
           };
           view = {
             open_direction = "left";

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 = {

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

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

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

tests/test-sources/plugins/by-name/codecompanion/default.nix

@@ -21,7 +21,7 @@
           };
           opts = {
             allow_insecure = false;
-            proxy = null;
+            proxy.__raw = "nil";
           };
         };
         strategies = {

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;

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

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;
+        pre_hook.__raw = "nil";
-        post_hook = null;
+        post_hook.__raw = "nil";
       };
     };
   };

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 = { };
       };
     };
   };

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;
+        context.__raw = "nil";
-        sticky = null;
+        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;
+          row.__raw = "nil";
-          col = null;
+          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;

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;
+        buttons.__raw = "nil";
-        assets = null;
+        assets.__raw = "nil";
-        variables = null;
+        variables.__raw = "nil";
         hooks = {
-          ready = null;
+          ready.__raw = "nil";
-          shutdown = null;
+          shutdown.__raw = "nil";
-          pre_activity = null;
+          pre_activity.__raw = "nil";
-          post_activity = null;
+          post_activity.__raw = "nil";
-          idle_enter = null;
+          idle_enter.__raw = "nil";
-          idle_leave = null;
+          idle_leave.__raw = "nil";
-          workspace_change = null;
+          workspace_change.__raw = "nil";
         };
-        plugins = null;
+        plugins.__raw = "nil";
         advanced = {
           plugin = {
             autocmds = true;
@@ -81,8 +81,8 @@
           };
           server = {
             update = "fetch";
-            pipe_path = null;
+            pipe_path.__raw = "nil";
-            executable_path = null;
+            executable_path.__raw = "nil";
             timeout = 300000;
           };
           discord = {

tests/test-sources/plugins/by-name/cornelis/default.nix

@@ -11,7 +11,7 @@
         use_global_binary = 0;
         agda_prefix = "<localleader>";
         no_agda_input = 0;
-        bind_input_hook = null;
+        bind_input_hook.__raw = "nil";
       };
     };
   };

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

tests/test-sources/plugins/by-name/cutlass/default.nix

@@ -7,8 +7,8 @@
     plugins.cutlass-nvim = {
       enable = true;
       settings = {
-        cut_key = "nil";
+        cut_key.__raw = "nil";
-        override_del = "nil";
+        override_del.__raw = "nil";
         exclude.__empty = { };
         registers = {
           select = "_";

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

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

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;

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 = { };
         };
       };
     };

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 = { };
+        extra_helpers.__empty = { };
-        float_options = { };
+        float_options.__empty = { };
         drawer = {
-          window_options = { };
+          window_options.__empty = { };
-          buffer_options = { };
+          buffer_options.__empty = { };
           disable_help = false;
           mappings = [
             {
@@ -176,8 +176,8 @@
           };
         };
         result = {
-          window_options = { };
+          window_options.__empty = { };
-          buffer_options = { };
+          buffer_options.__empty = { };
           page_size = 100;
           focus_result = true;
           progress = {
@@ -254,8 +254,8 @@
           ];
         };
         editor = {
-          window_options = { };
+          window_options.__empty = { };
-          buffer_options = { };
+          buffer_options.__empty = { };
           mappings = [
             {
               key = "BB";
@@ -270,8 +270,8 @@
           ];
         };
         call_log = {
-          window_options = { };
+          window_options.__empty = { };
-          buffer_options = { };
+          buffer_options.__empty = { };
           mappings = [
             {
               key = "<CR>";

tests/test-sources/plugins/by-name/devdocs/default.nix

@@ -14,7 +14,7 @@
       enable = true;
 
       settings = {
-        ensure_installed = [ ];
+        ensure_installed.__empty = { };
       };
     };
   };

tests/test-sources/plugins/by-name/diagram/default.nix

@@ -16,26 +16,26 @@
       settings = {
         renderer_options = {
           mermaid = {
-            background = null;
+            background.__raw = "nil";
-            theme = null;
+            theme.__raw = "nil";
             scale = 1;
-            width = null;
+            width.__raw = "nil";
-            height = null;
+            height.__raw = "nil";
           };
           plantuml = {
-            charset = null;
+            charset.__raw = "nil";
           };
           d2 = {
-            theme_id = null;
+            theme_id.__raw = "nil";
-            dark_theme_id = null;
+            dark_theme_id.__raw = "nil";
-            scale = null;
+            scale.__raw = "nil";
-            layout = null;
+            layout.__raw = "nil";
-            sketch = null;
+            sketch.__raw = "nil";
           };
           gnuplot = {
-            size = null;
+            size.__raw = "nil";
-            font = null;
+            font.__raw = "nil";
-            theme = null;
+            theme.__raw = "nil";
           };
         };
       };

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 = { };
+              single_file.__empty = { };
-              multi_file = { };
+              multi_file.__empty = { };
             };
           };
           win_config = {
             position = "top";
             height = 10;
-            win_opts = { };
+            win_opts.__empty = { };
           };
         };
 

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_file.__raw = "nil";
-          log_level = null;
+          log_level.__raw = "nil";
         };
         keymap = {
           dir = {
@@ -63,8 +63,8 @@
         manager = {
           daemon = false;
           lazy = true;
-          log_file = null;
+          log_file.__raw = "nil";
-          log_level = null;
+          log_level.__raw = "nil";
           user = false;
         };
         network = {
@@ -73,15 +73,15 @@
             max = 15000;
             interval = 256;
           };
-          windows_pipe = null;
+          windows_pipe.__raw = "nil";
-          unix_socket = null;
+          unix_socket.__raw = "nil";
         };
         servers = {
           "*" = {
             connect.default = { };
-            cwd = null;
+            cwd.__raw = "nil";
             launch.default = { };
-            lsp = { };
+            lsp.__empty = { };
           };
         };
       };

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 = { };
+          format_item_override.__empty = { };
-          get_config = null;
+          get_config.__raw = "nil";
         };
       };
     };

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;

tests/test-sources/plugins/by-name/edgy/default.nix

@@ -8,26 +8,26 @@
       enable = true;
 
       settings = {
-        left = [ ];
+        left.__empty = { };
-        bottom = [ ];
+        bottom.__empty = { };
-        right = [ ];
+        right.__empty = { };
-        top = [ ];
+        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 = {

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;
+                id.__raw = "nil";
-                name = null;
+                name.__raw = "nil";
                 cols = 10;
                 rows = 10;
               };

tests/test-sources/plugins/by-name/ethersync/default.nix

@@ -1,5 +0,0 @@
-{
-  empty = {
-    plugins.ethersync.enable = true;
-  };
-}

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_filetypes.__empty = { };
-        disabled_buftypes = [ ];
+        disabled_buftypes.__empty = { };
         default_keymaps = true;
       };
     };

tests/test-sources/plugins/by-name/faster/default.nix

@@ -22,7 +22,7 @@
             ];
             filesize = 2;
             pattern = "*";
-            extra_patterns = [ ];
+            extra_patterns.__empty = { };
           };
           fastmacro = {
             on = true;

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;

tests/test-sources/plugins/by-name/flash/default.nix

@@ -38,8 +38,8 @@
           register = false;
           nohlsearch = false;
           autojump = false;
-          inclusive = null;
+          inclusive.__raw = "nil";
-          offset = null;
+          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 = [

tests/test-sources/plugins/by-name/flit/default.nix

@@ -16,7 +16,7 @@
         labeled_modes = "v";
         clever_repeat = true;
         multiline = true;
-        opts = { };
+        opts.__empty = { };
       };
     };
   };

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;

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;
+          on_attach.__raw = "nil";
-          capabilities = null;
+          capabilities.__raw = "nil";
-          settings = null;
+          settings.__raw = "nil";
         };
       };
     };

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

tests/test-sources/plugins/by-name/git-conflict/default.nix

@@ -15,7 +15,7 @@
         highlights = {
           incoming = "DiffAdd";
           current = "DiffText";
-          ancestor = null;
+          ancestor.__raw = "nil";
         };
       };
     };

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

tests/test-sources/plugins/by-name/gitlab/default.nix

@@ -56,7 +56,7 @@
             };
             telemetry = {
               enabled = true;
-              trackingUrl = null;
+              trackingUrl.__raw = "nil";
             };
           };
         };

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;

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_height.__raw = "nil";
-        max_popup_width = null;
+        max_popup_width.__raw = "nil";
         date_format = "%c";
         conceal_word_diff_marker = true;
-        floating_win_opts = { };
+        floating_win_opts.__empty = { };
         popup_content_margins = true;
       };
     };

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

tests/test-sources/plugins/by-name/glance/default.nix

@@ -65,7 +65,7 @@
             "<leader>l".__raw = ''require('glance').actions.enter_win("list")'';
           };
         };
-        hooks = { };
+        hooks.__empty = { };
         folds = {
           fold_closed = "";
           fold_open = "";

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_open_hook.__raw = "nil";
-        post_close_hook = null;
+        post_close_hook.__raw = "nil";
         references = {
           provider = "telescope";
-          telescope = null;
+          telescope.__raw = "nil";
         };
         focus_on_open = true;
         dismiss_on_move = false;

tests/test-sources/plugins/by-name/gx/default.nix

@@ -10,9 +10,9 @@
       disableNetrwGx = true;
 
       settings = {
-        open_browser_app = null;
+        open_browser_app.__raw = "nil";
-        open_browser_args = [ ];
+        open_browser_args.__empty = { };
-        handlers = { };
+        handlers.__empty = { };
         handler_options = {
           search_engine = "google";
           select_for_search = false;

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_enable.__raw = "nil";
-          on_disable = null;
+          on_disable.__raw = "nil";
-          on_mode_change = null;
+          on_mode_change.__raw = "nil";
         };
       };
     };

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_filetypes.__empty = { };
-        exclude_buftypes = { };
+        exclude_buftypes.__empty = { };
         exclude_buffer.__raw = "function(bufnr) end";
       };
     };

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 = {

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 = [ ];
+        excluded_filetypes.__empty = { };
-        match_mappings = [ ];
+        match_mappings.__empty = { };
       };
     };
   };

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;
+        desc.__raw = "nil";
-        on_enter = null;
+        on_enter.__raw = "nil";
-        on_exit = null;
+        on_exit.__raw = "nil";
-        on_key = null;
+        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')

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 = [ ];
+        filetypes_allowlist.__empty = { };
-        modes_denylist = [ ];
+        modes_denylist.__empty = { };
-        modes_allowlist = [ ];
+        modes_allowlist.__empty = { };
-        providers_regex_syntax_denylist = [ ];
+        providers_regex_syntax_denylist.__empty = { };
-        providers_regex_syntax_allowlist = [ ];
+        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;
       };
     };

tests/test-sources/plugins/by-name/image/default.nix

@@ -26,8 +26,8 @@
           html.enabled = false;
           css.enabled = false;
         };
-        max_width = null;
+        max_width.__raw = "nil";
-        max_height = null;
+        max_height.__raw = "nil";
         max_width_window_percentage = 100;
         max_height_window_percentage = 50;
         scale_factor = 1.0;

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;
+        input_buffer_type.__raw = "nil";
-        post_hook = null;
+        post_hook.__raw = "nil";
       };
     };
   };

tests/test-sources/plugins/by-name/indent-blankline/default.nix

@@ -48,29 +48,29 @@
         };
         indent = {
           char = "▎";
-          tab_char = null;
+          tab_char.__raw = "nil";
-          highlight = null;
+          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"

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;
+          send_motion.__raw = "nil";
-          visual_send = null;
+          visual_send.__raw = "nil";
-          send_file = null;
+          send_file.__raw = "nil";
-          send_paragraph = null;
+          send_paragraph.__raw = "nil";
-          send_until_cursor = null;
+          send_until_cursor.__raw = "nil";
-          send_mark = null;
+          send_mark.__raw = "nil";
-          mark_motion = null;
+          mark_motion.__raw = "nil";
-          remove_mark = null;
+          remove_mark.__raw = "nil";
-          cr = null;
+          cr.__raw = "nil";
-          interrupt = null;
+          interrupt.__raw = "nil";
-          exit = null;
+          exit.__raw = "nil";
-          clear = null;
+          clear.__raw = "nil";
         };
       };
     };

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 = { };
         };
       };
     };

tests/test-sources/plugins/by-name/jupytext/default.nix

@@ -10,8 +10,8 @@
       settings = {
         style = "hydrogen";
         output_extension = "auto";
-        force_ft = null;
+        force_ft.__raw = "nil";
-        custom_language_formatting = { };
+        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";

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 = { };
       };
     };
   };

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 = { };
       };
     };
   };

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;

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;

tests/test-sources/plugins/by-name/ledger/default.nix

@@ -8,11 +8,11 @@
       enable = true;
 
       settings = {
-        bin = null;
+        bin.__raw = "nil";
-        is_hledger = null;
+        is_hledger.__raw = "nil";
         extra_options = "";
-        accounts_cmd = null;
+        accounts_cmd.__raw = "nil";
-        descriptions_cmd = null;
+        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_register_format.__raw = "nil";
-        qf_reconcile_format = null;
+        qf_reconcile_format.__raw = "nil";
         use_location_list = 0;
         qf_vertical = 0;
         qf_size = 10;

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

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;