diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e027907c..b96aee06 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -182,6 +182,9 @@ cd nixvim
 
 # Either setup nix-direnv, or manually enter a devshell using:
 nix develop
+
+# List all created plugins with `mkVimPlugin`
+list-plugins -k vim
 ```
 
 #### Writing option examples
diff --git a/flake.lock b/flake.lock
index 72e25e20..1489a7ba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762440070,
-        "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=",
+        "lastModified": 1762040540,
+        "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8",
+        "rev": "0010412d62a25d959151790968765a70c436598b",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762361079,
-        "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
+        "lastModified": 1762156382,
+        "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
+        "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
         "type": "github"
       },
       "original": {
diff --git a/flake/default.nix b/flake/default.nix
index 028e0e62..78560d99 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -52,6 +52,7 @@
         # Propagate `packages` from the `dev` partition:
         inherit (config.partitions.dev.module.flake.packages.${system})
           generate-all-maintainers
+          list-plugins
           ;
       };
     };
diff --git a/flake/dev/default.nix b/flake/dev/default.nix
index b3e15b8e..454b1d02 100644
--- a/flake/dev/default.nix
+++ b/flake/dev/default.nix
@@ -4,6 +4,7 @@
     ./fmt.nix
     ./generate-all-maintainers
     ./git-hooks.nix
+    ./list-plugins
     ./package-tests.nix
     ./template-tests.nix
     ./tests.nix
diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock
index e829a697..cb5311f3 100644
--- a/flake/dev/flake.lock
+++ b/flake/dev/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "dev-nixpkgs": {
       "locked": {
-        "lastModified": 1762361079,
-        "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
+        "lastModified": 1762156382,
+        "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
+        "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762441963,
-        "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
+        "lastModified": 1760663237,
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -104,11 +104,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762463325,
-        "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=",
+        "lastModified": 1762204486,
+        "narHash": "sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC+k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0562fef070a1027325dd4ea10813d64d2c967b39",
+        "rev": "95d65dddae7ae6300b22cf1d61cb5e71dca8da5b",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762304480,
-        "narHash": "sha256-ikVIPB/ea/BAODk6aksgkup9k2jQdrwr4+ZRXtBgmSs=",
+        "lastModified": 1762186368,
+        "narHash": "sha256-dzLBZKccS0jMefj+WAYwsk7gKDluqavC7I4KfFwVh8k=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "b8c7ac030211f18bd1f41eae0b815571853db7a2",
+        "rev": "69921864a70b58787abf5ba189095566c3f0ffd3",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762410071,
-        "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=",
+        "lastModified": 1761311587,
+        "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "97a30861b13c3731a84e09405414398fbf3e109f",
+        "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
         "type": "github"
       },
       "original": {
diff --git a/flake/dev/list-plugins/default.nix b/flake/dev/list-plugins/default.nix
new file mode 100644
index 00000000..232abea7
--- /dev/null
+++ b/flake/dev/list-plugins/default.nix
@@ -0,0 +1,42 @@
+{ self, ... }:
+{
+  perSystem =
+    {
+      lib,
+      pkgs,
+      ...
+    }:
+    let
+      package = pkgs.writers.writePython3Bin "list-plugins" {
+        # Disable flake8 checks that are incompatible with the ruff ones
+        flakeIgnore = [
+          # Thinks shebang is a block comment
+          "E265"
+          # line too long
+          "E501"
+          # line break before binary operator
+          "W503"
+        ];
+      } (builtins.readFile ./list-plugins.py);
+    in
+    {
+      packages.list-plugins = package;
+
+      checks.list-plugins-test =
+        pkgs.runCommand "list-plugins-test"
+          {
+            nativeBuildInputs = [ package ];
+          }
+          ''
+            list-plugins --root-path ${self} > $out
+          '';
+
+      devshells.default.commands = [
+        {
+          name = "list-plugins";
+          command = ''${lib.getExe package} "$@"'';
+          help = "List plugins and get implementation infos";
+        }
+      ];
+    };
+}
diff --git a/flake/dev/list-plugins/list-plugins.py b/flake/dev/list-plugins/list-plugins.py
new file mode 100755
index 00000000..25069edd
--- /dev/null
+++ b/flake/dev/list-plugins/list-plugins.py
@@ -0,0 +1,268 @@
+#!/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())
diff --git a/plugins/by-name/alpha/default.nix b/plugins/by-name/alpha/default.nix
index 56229140..ccdf52da 100644
--- a/plugins/by-name/alpha/default.nix
+++ b/plugins/by-name/alpha/default.nix
@@ -1,113 +1,177 @@
-{ lib, ... }:
-lib.nixvim.plugins.mkNeovimPlugin {
-  name = "alpha";
-  package = "alpha-nvim";
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) types mkOption;
 
-  maintainers = [ lib.maintainers.HeitorAugustoLN ];
+  cfg = config.plugins.alpha;
 
-  # TODO Added 2025-10-26: remove after 26.05
-  optionsRenamedToSettings = [
-    "opts"
-    "layout"
-  ];
-
-  settingsExample = {
-    layout = [
-      {
-        type = "padding";
-        val = 2;
-      }
-      {
-        type = "text";
-        val = [
-          "███╗   ██╗██╗██╗  ██╗██╗   ██╗██╗███╗   ███╗"
-          "████╗  ██║██║╚██╗██╔╝██║   ██║██║████╗ ████║"
-          "██╔██╗ ██║██║ ╚███╔╝ ██║   ██║██║██╔████╔██║"
-          "██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║"
-          "██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║"
-          "╚═╝  ╚═══╝╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝     ╚═╝"
+  sectionType = types.submodule {
+    freeformType = with types; attrsOf anything;
+    options = {
+      type = mkOption {
+        type = types.enum [
+          "button"
+          "group"
+          "padding"
+          "text"
+          "terminal"
         ];
-        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";
-        };
-      }
-    ];
-  };
+        description = "Type of section";
+      };
 
-  extraOptions = {
-    theme = lib.mkOption {
-      type =
-        with lib.types;
-        let
-          # TODO: deprecated 2025-10-30, remove after 26.05
-          old = nullOr (maybeRaw str);
-          new = nullOr str;
-        in
-        old // { inherit (new) description; };
-      default = null;
-      example = "dashboard";
-      description = "You can directly use a pre-defined theme.";
+      val = lib.nixvim.mkNullOrOption (
+        with types;
+        nullOr (oneOf [
+
+          # "button", "text"
+          (maybeRaw str)
+          # "padding"
+          int
+          (listOf (
+            either
+              # "text" (list of strings)
+              str
+              # "group"
+              (attrsOf anything)
+          ))
+        ])
+      ) "Value for section";
+
+      opts = mkOption {
+        type = with types; attrsOf anything;
+        default = { };
+        description = "Additional options for the section";
+      };
     };
   };
-
-  callSetup = false;
-  extraConfig = cfg: opts: {
-    assertions = lib.nixvim.mkAssertions "plugins.alpha" {
-      assertion = cfg.theme != null -> builtins.isString cfg.theme;
-      message = ''
-        Defining `${opts.theme}` as raw lua is deprecated. You can define `${opts.settings}` as raw lua instead:
-        ${opts.settings} = lib.nixvim.mkRaw ${lib.generators.toPretty { } cfg.theme.__raw};
-      '';
-    };
+in
+{
+  options = {
     plugins.alpha = {
-      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
-        )
-      );
+      enable = lib.mkEnableOption "alpha-nvim";
 
-      luaConfig.content = ''
-        require('alpha').setup(${lib.nixvim.toLuaObject cfg.settings})
-        require('alpha.term')
+      package = lib.mkPackageOption pkgs "alpha-nvim" {
+        default = [
+          "vimPlugins"
+          "alpha-nvim"
+        ];
+      };
+
+      theme = mkOption {
+        type = with types; nullOr (maybeRaw str);
+        apply = v: if lib.isString v then lib.nixvim.mkRaw "require'alpha.themes.${v}'.config" else v;
+        default = null;
+        example = "dashboard";
+        description = "You can directly use a pre-defined theme.";
+      };
+
+      layout = mkOption {
+        type = with types; either (maybeRaw str) (listOf sectionType);
+        default = [ ];
+        description = "List of sections to layout for the dashboard";
+        example = [
+          {
+            type = "padding";
+            val = 2;
+          }
+          {
+            type = "text";
+            val = [
+              "███╗   ██╗██╗██╗  ██╗██╗   ██╗██╗███╗   ███╗"
+              "████╗  ██║██║╚██╗██╔╝██║   ██║██║████╗ ████║"
+              "██╔██╗ ██║██║ ╚███╔╝ ██║   ██║██║██╔████╔██║"
+              "██║╚██╗██║██║ ██╔██╗ ╚██╗ ██╔╝██║██║╚██╔╝██║"
+              "██║ ╚████║██║██╔╝ ██╗ ╚████╔╝ ██║██║ ╚═╝ ██║"
+              "╚═╝  ╚═══╝╚═╝╚═╝  ╚═╝  ╚═══╝  ╚═╝╚═╝     ╚═╝"
+            ];
+            opts = {
+              position = "center";
+              hl = "Type";
+            };
+          }
+          {
+            type = "padding";
+            val = 2;
+          }
+          {
+            type = "group";
+            val = [
+              {
+                type = "button";
+                val = "  New file";
+                on_press.__raw = "function() vim.cmd[[ene]] end";
+                opts.shortcut = "n";
+              }
+              {
+                type = "button";
+                val = " Quit Neovim";
+                on_press.__raw = "function() vim.cmd[[qa]] end";
+                opts.shortcut = "q";
+              }
+            ];
+          }
+          {
+            type = "padding";
+            val = 2;
+          }
+          {
+            type = "text";
+            val = "Inspiring quote here.";
+            opts = {
+              position = "center";
+              hl = "Keyword";
+            };
+          }
+        ];
+      };
+
+      opts = lib.nixvim.mkNullOrOption (with types; attrsOf anything) ''
+        Optional global options.
       '';
     };
   };
+
+  config =
+    let
+      layoutDefined = cfg.layout != [ ];
+      themeDefined = cfg.theme != null;
+    in
+    lib.mkIf cfg.enable {
+      extraPlugins = [ cfg.package ];
+
+      assertions = lib.nixvim.mkAssertions "plugins.alpha" [
+        {
+          assertion = themeDefined || layoutDefined;
+          message = ''
+            You have to either set a `theme` or define some sections in `layout`.
+          '';
+        }
+        {
+          assertion = !(themeDefined && layoutDefined);
+          message = ''
+            You can't define both a `theme` and custom options.
+            Set `plugins.alpha.theme = null` if you want to configure alpha manually using the `layout` option.
+          '';
+        }
+      ];
+
+      extraConfigLua =
+        let
+          setupOptions =
+            if themeDefined then
+              cfg.theme
+            else
+              (with cfg; {
+                inherit layout opts;
+              });
+        in
+        ''
+          require('alpha').setup(${lib.nixvim.toLuaObject setupOptions})
+          require('alpha.term')
+        '';
+    };
 }
diff --git a/plugins/by-name/cloak/default.nix b/plugins/by-name/cloak/default.nix
index 15a53d4f..566694a4 100644
--- a/plugins/by-name/cloak/default.nix
+++ b/plugins/by-name/cloak/default.nix
@@ -1,13 +1,79 @@
 {
   lib,
+  helpers,
   ...
 }:
+with lib;
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "cloak";
   package = "cloak-nvim";
   description = "Cloak allows you to overlay *'s over defined patterns.";
 
-  maintainers = [ lib.maintainers.GaetanLepage ];
+  maintainers = [ maintainers.GaetanLepage ];
+
+  settingsOptions = {
+    enabled = helpers.defaultNullOpts.mkBool true ''
+      Whether to enable the plugin.
+    '';
+
+    cloak_character = helpers.defaultNullOpts.mkStr "*" ''
+      Define the cloak character.
+    '';
+
+    highlight_group = helpers.defaultNullOpts.mkStr "Comment" ''
+      The applied highlight group (colors) on the cloaking, see `:h highlight`.
+    '';
+
+    cloak_length = helpers.mkNullOrOption types.ints.unsigned ''
+      Provide a number if you want to hide the true length of the value.
+      Applies the length of the replacement characters for all matched patterns, defaults to the
+      length of the matched pattern.
+    '';
+
+    try_all_patterns = helpers.defaultNullOpts.mkBool true ''
+      Whether it should try every pattern to find the best fit or stop after the first.
+    '';
+
+    cloak_telescope = helpers.defaultNullOpts.mkBool true ''
+      Set to true to cloak Telescope preview buffers.
+      (Required feature not in 0.1.x)
+    '';
+
+    patterns =
+      helpers.defaultNullOpts.mkListOf
+        (types.submodule {
+          options = {
+            file_pattern = helpers.defaultNullOpts.mkNullable (with types; either str (listOf str)) ".env*" ''
+              One or several patterns to match against.
+              They should be valid autocommand patterns.
+            '';
+
+            cloak_pattern = helpers.defaultNullOpts.mkNullable (with types; either str (listOf str)) "=.+" ''
+              One or several patterns to cloak.
+
+              Example: `[":.+" "-.+"]` for yaml files.
+            '';
+
+            replace = helpers.mkNullOrOption types.anything ''
+              A function, table or string to generate the replacement.
+              The actual replacement will contain the `cloak_character` where it doesn't cover
+              the original text.
+              If left empty the legacy behavior of keeping the first character is retained.
+            '';
+          };
+        })
+        [
+          {
+
+            file_pattern = ".env*";
+            cloak_pattern = "=.+";
+            replace = null;
+          }
+        ]
+        ''
+          List of pattern configurations.
+        '';
+  };
 
   settingsExample = {
     enabled = true;
diff --git a/plugins/by-name/dap-go/default.nix b/plugins/by-name/dap-go/default.nix
index df30a5aa..b1281122 100644
--- a/plugins/by-name/dap-go/default.nix
+++ b/plugins/by-name/dap-go/default.nix
@@ -2,6 +2,12 @@
   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";
@@ -9,6 +15,30 @@ 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: {
diff --git a/plugins/by-name/emmet/default.nix b/plugins/by-name/emmet/default.nix
index bba1060b..b905dc11 100644
--- a/plugins/by-name/emmet/default.nix
+++ b/plugins/by-name/emmet/default.nix
@@ -4,7 +4,7 @@
 }:
 let
   inherit (lib) types;
-  inherit (lib.nixvim) defaultNullOpts mkNullOrOption nestedLiteralLua;
+  inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
 in
 lib.nixvim.plugins.mkVimPlugin {
   name = "emmet";
@@ -49,11 +49,11 @@ lib.nixvim.plugins.mkVimPlugin {
       html = {
         default_attributes = {
           option = {
-            value = nestedLiteralLua "nil";
+            value = null;
           };
           textarea = {
-            id = nestedLiteralLua "nil";
-            name = nestedLiteralLua "nil";
+            id = null;
+            name = null;
             cols = 10;
             rows = 10;
           };
diff --git a/plugins/by-name/teamtype/default.nix b/plugins/by-name/ethersync/default.nix
similarity index 87%
rename from plugins/by-name/teamtype/default.nix
rename to plugins/by-name/ethersync/default.nix
index 80d265c9..ac99eae0 100644
--- a/plugins/by-name/teamtype/default.nix
+++ b/plugins/by-name/ethersync/default.nix
@@ -1,6 +1,6 @@
 { lib, ... }:
 lib.nixvim.plugins.mkNeovimPlugin {
-  name = "teamtype";
+  name = "ethersync";
 
   maintainers = [ lib.maintainers.GaetanLepage ];
 
diff --git a/plugins/by-name/flutter-tools/settings-options.nix b/plugins/by-name/flutter-tools/settings-options.nix
index 56831370..0fb782e5 100644
--- a/plugins/by-name/flutter-tools/settings-options.nix
+++ b/plugins/by-name/flutter-tools/settings-options.nix
@@ -1,9 +1,65 @@
 lib:
 let
-  inherit (lib.nixvim) defaultNullOpts;
+  inherit (lib) types;
+  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 = ''
@@ -21,7 +77,80 @@ 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.
 
@@ -29,5 +158,120 @@ 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.
+      '';
+    };
   };
 }
diff --git a/plugins/by-name/lazygit/default.nix b/plugins/by-name/lazygit/default.nix
index 557f52e6..88b62db5 100644
--- a/plugins/by-name/lazygit/default.nix
+++ b/plugins/by-name/lazygit/default.nix
@@ -4,7 +4,7 @@
 }:
 let
   inherit (lib) types;
-  inherit (lib.nixvim) defaultNullOpts nestedLiteral;
+  inherit (lib.nixvim) defaultNullOpts;
 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 = nestedLiteral "lib.nixvim.emptyTable";
+    config_file_path = [ ];
   };
 }
diff --git a/plugins/by-name/leap/default.nix b/plugins/by-name/leap/default.nix
index f3b99c97..a6e54002 100644
--- a/plugins/by-name/leap/default.nix
+++ b/plugins/by-name/leap/default.nix
@@ -2,31 +2,37 @@
   lib,
   ...
 }:
+let
+  inherit (lib) types;
+in
 lib.nixvim.plugins.mkNeovimPlugin {
   name = "leap";
   package = "leap-nvim";
 
   maintainers = [ lib.maintainers.khaneliman ];
 
-  callSetup = false;
-  extraConfig = cfg: {
-    plugins.leap.luaConfig.content = lib.optionalString (cfg.settings != { }) ''
-      require('leap').opts = vim.tbl_deep_extend(
-        "keep",
-        ${lib.nixvim.toLuaObject cfg.settings},
-        require('leap').opts
-      )
-    '';
+  extraOptions = {
+    addDefaultMappings = lib.mkOption {
+      type = types.bool;
+      default = true;
+      description = "Whether to enable the default mappings.";
+    };
   };
 
-  # TODO: Added 2025-11-07. Remove after 26.05
-  imports = [
-    (lib.mkRemovedOptionModule [
-      "plugins"
-      "leap"
-      "addDefaultMappings"
-    ] "See `:help leap-mappings` to update your config")
-  ];
+  callSetup = false;
+  extraConfig = cfg: {
+    plugins.leap.luaConfig.content =
+      lib.optionalString cfg.addDefaultMappings ''
+        require('leap').add_default_mappings()
+      ''
+      + lib.optionalString (cfg.settings != { }) ''
+        require('leap').opts = vim.tbl_deep_extend(
+          "keep",
+          ${lib.nixvim.toLuaObject cfg.settings},
+          require('leap').opts
+        )
+      '';
+  };
 
   # TODO: Deprecated 2025-10-04
   inherit (import ./deprecations.nix)
diff --git a/plugins/by-name/ledger/default.nix b/plugins/by-name/ledger/default.nix
index d04630b7..5fa82a8d 100644
--- a/plugins/by-name/ledger/default.nix
+++ b/plugins/by-name/ledger/default.nix
@@ -1,14 +1,17 @@
 {
   lib,
+  helpers,
   ...
 }:
-lib.nixvim.plugins.mkVimPlugin {
+with lib;
+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 = [ lib.maintainers.GaetanLepage ];
+  maintainers = [ maintainers.GaetanLepage ];
 
   imports = [
     # TODO: added 2025-04-07, remove after 25.05
@@ -20,6 +23,163 @@ lib.nixvim.plugins.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;
diff --git a/plugins/by-name/lspkind/default.nix b/plugins/by-name/lspkind/default.nix
index 8455f6e3..82898e27 100644
--- a/plugins/by-name/lspkind/default.nix
+++ b/plugins/by-name/lspkind/default.nix
@@ -23,8 +23,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
     cmp = {
       enable = lib.mkOption {
         type = types.bool;
-        default = config.plugins.cmp.enable;
-        defaultText = lib.literalExpression "config.plugins.cmp.enable";
+        default = true;
         description = "Integrate with nvim-cmp";
       };
 
diff --git a/plugins/by-name/neocord/default.nix b/plugins/by-name/neocord/default.nix
index 0d626db3..3ac4bc20 100644
--- a/plugins/by-name/neocord/default.nix
+++ b/plugins/by-name/neocord/default.nix
@@ -1,15 +1,164 @@
 {
   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;
diff --git a/plugins/deprecation.nix b/plugins/deprecation.nix
index 5402229b..bd58f2ff 100644
--- a/plugins/deprecation.nix
+++ b/plugins/deprecation.nix
@@ -41,8 +41,6 @@ let
     surround = "vim-surround";
     # Added 2025-10-06
     presence-nvim = "presence";
-    # Added 2025-11-07
-    ethersync = "teamtype";
   };
   # Added 2024-09-21; remove after 24.11
   # `iconsPackage` options were briefly available in the following plugins for ~3 weeks
diff --git a/plugins/lsp/lsp-packages.nix b/plugins/lsp/lsp-packages.nix
index e4c8908a..f3a32cf9 100644
--- a/plugins/lsp/lsp-packages.nix
+++ b/plugins/lsp/lsp-packages.nix
@@ -18,6 +18,7 @@
     "bright_script"
     "bsl_ls"
     "buddy_ls"
+    "bufls"
     "bzl"
     "c3_lsp"
     "cairo_ls"
@@ -325,7 +326,7 @@
       "phan"
     ];
     phpactor = "phpactor";
-    postgres_lsp = "postgres-language-server";
+    postgres_lsp = "postgres-lsp";
     protols = "protols";
     psalm = [
       "phpPackages"
diff --git a/tests/all-package-defaults.nix b/tests/all-package-defaults.nix
index eab95703..685de494 100644
--- a/tests/all-package-defaults.nix
+++ b/tests/all-package-defaults.nix
@@ -15,10 +15,6 @@ let
   disabledTests = [
     # 2025-10-12 dependency mbedtls is marked as insecure
     "haxe"
-
-    # 2025-11-06 build failure
-    # Fixed in https://github.com/NixOS/nixpkgs/pull/458418
-    "docker-language-server"
   ]
   ++ lib.optionals (hostPlatform.isLinux && hostPlatform.isAarch64) [
     # "tabnine"
diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix
index 9f8a392d..1924008d 100644
--- a/tests/lsp-servers.nix
+++ b/tests/lsp-servers.nix
@@ -40,13 +40,10 @@ let
         # TODO: 2025-07-25 build failure
         "mint"
 
-        # TODO: 2025-11-06 build failure
-        # Fixed in https://github.com/NixOS/nixpkgs/pull/458418
-        "docker_language_server"
-
         # DEPRECATED SERVERS
         # See https://github.com/neovim/nvim-lspconfig/blob/master/lua/lspconfig.lua
         "ruff_lsp"
+        "bufls"
         "typst_lsp"
       ];
     in
diff --git a/tests/test-sources/plugins/by-name/actions-preview/default.nix b/tests/test-sources/plugins/by-name/actions-preview/default.nix
index 4c843850..1d03da5f 100644
--- a/tests/test-sources/plugins/by-name/actions-preview/default.nix
+++ b/tests/test-sources/plugins/by-name/actions-preview/default.nix
@@ -16,7 +16,7 @@
           diff = {
             ctxlen = 3;
           };
-          highlight_command.__empty = { };
+          highlight_command = [ ];
           backend = [
             "telescope"
             "minipick"
@@ -35,7 +35,7 @@
           '';
           nui = {
             dir = "col";
-            keymap.__raw = "nil";
+            keymap = null;
             layout = {
               position = "50%";
               size = {
diff --git a/tests/test-sources/plugins/by-name/aerial/default.nix b/tests/test-sources/plugins/by-name/aerial/default.nix
index 32f7321a..55aec696 100644
--- a/tests/test-sources/plugins/by-name/aerial/default.nix
+++ b/tests/test-sources/plugins/by-name/aerial/default.nix
@@ -20,16 +20,16 @@
             40
             0.2
           ];
-          width.__raw = "nil";
+          width = null;
           min_width = 10;
-          win_opts.__empty = { };
+          win_opts = { };
           default_direction = "prefer_right";
           placement = "window";
           resize_to_content = true;
           preserve_equality = false;
         };
         attach_mode = "window";
-        close_automatic_events.__empty = { };
+        close_automatic_events = [ ];
         keymaps = {
           "?" = "actions.show_help";
           "g?" = "actions.show_help";
@@ -82,11 +82,11 @@
         highlight_on_hover = false;
         highlight_on_jump = 300;
         autojump = false;
-        icons.__empty = { };
+        icons = [ ];
         ignore = {
           unlisted_buffers = false;
           diff_windows = true;
-          filetypes.__empty = { };
+          filetypes = [ ];
           buftypes = "special";
           wintypes = "special";
         };
@@ -126,7 +126,7 @@
           border = "rounded";
           relative = "cursor";
           max_height = 0.9;
-          height.__raw = "nil";
+          height = null;
           min_height = [
             8
             0.1
@@ -171,7 +171,7 @@
           diagnostics_trigger_update = false;
           update_when_errors = true;
           update_delay = 300;
-          priority.__empty = { };
+          priority = { };
         };
         treesitter = {
           update_delay = 300;
diff --git a/tests/test-sources/plugins/by-name/aider/default.nix b/tests/test-sources/plugins/by-name/aider/default.nix
index 4471fa8d..5a9b30b8 100644
--- a/tests/test-sources/plugins/by-name/aider/default.nix
+++ b/tests/test-sources/plugins/by-name/aider/default.nix
@@ -29,7 +29,7 @@
         default_bindings = false;
         debug = true;
         vim = true;
-        ignore_buffers.__empty = { };
+        ignore_buffers = [ ];
         border = {
           style = [
             "╭"
diff --git a/tests/test-sources/plugins/by-name/airline/default.nix b/tests/test-sources/plugins/by-name/airline/default.nix
index f25b83ed..cde77d4e 100644
--- a/tests/test-sources/plugins/by-name/airline/default.nix
+++ b/tests/test-sources/plugins/by-name/airline/default.nix
@@ -26,7 +26,7 @@
         inactive_collapse = 1;
         inactive_alt_sep = 1;
         theme = "dark";
-        theme_patch_func.__raw = "nil";
+        theme_patch_func = null;
         powerline_fonts = 0;
         symbols_ascii = 0;
         mode_map = {
@@ -47,8 +47,8 @@
           v = "V";
           V = "V";
         };
-        exclude_filenames.__empty = { };
-        exclude_filetypes.__empty = { };
+        exclude_filenames = [ ];
+        exclude_filetypes = [ ];
         filetype_overrides = {
           coc-explorer = [
             "CoC Explorer"
diff --git a/tests/test-sources/plugins/by-name/alpha/default.nix b/tests/test-sources/plugins/by-name/alpha/default.nix
index 7ab0b935..7f88586f 100644
--- a/tests/test-sources/plugins/by-name/alpha/default.nix
+++ b/tests/test-sources/plugins/by-name/alpha/default.nix
@@ -1,25 +1,22 @@
-{ lib, ... }:
 {
   theme = {
     plugins.alpha = {
       enable = true;
-
       theme = "dashboard";
     };
   };
 
-  theme-raw-settings = {
+  theme-lua = {
     plugins.alpha = {
       enable = true;
-
-      settings = lib.nixvim.mkRaw "require('alpha.themes.dashboard').config";
+      theme.__raw = "require'alpha.themes.startify'.config";
     };
   };
 
   terminal = {
     plugins.alpha = {
       enable = true;
-      settings.layout = [
+      layout = [
         {
           type = "terminal";
           command = "echo 'Welcome to Nixvim!'";
@@ -37,7 +34,7 @@
     plugins.alpha = {
       enable = true;
 
-      settings.layout = [
+      layout = [
         {
           type = "padding";
           val = 2;
@@ -91,7 +88,7 @@
           };
         }
       ];
-      settings.opts = {
+      opts = {
         margin = 0;
         noautocmd = true;
 
@@ -107,7 +104,7 @@
     plugins.web-devicons.enable = false;
     plugins.alpha = {
       enable = true;
-      settings = lib.nixvim.mkRaw "require('alpha.themes.dashboard').config";
+      theme = "dashboard";
     };
   };
 }
diff --git a/tests/test-sources/plugins/by-name/auto-save/default.nix b/tests/test-sources/plugins/by-name/auto-save/default.nix
index 0ff39923..ab67d3d6 100644
--- a/tests/test-sources/plugins/by-name/auto-save/default.nix
+++ b/tests/test-sources/plugins/by-name/auto-save/default.nix
@@ -42,7 +42,7 @@
           ];
           cancel_deferred_save = [ "InsertEnter" ];
         };
-        condition.__raw = "nil";
+        condition = null;
         write_all_buffers = false;
         noautocmd = false;
         lockmarks = false;
diff --git a/tests/test-sources/plugins/by-name/auto-session/default.nix b/tests/test-sources/plugins/by-name/auto-session/default.nix
index 224dc4c9..a1c23523 100644
--- a/tests/test-sources/plugins/by-name/auto-session/default.nix
+++ b/tests/test-sources/plugins/by-name/auto-session/default.nix
@@ -13,12 +13,12 @@
         auto_save = true;
         auto_restore = true;
         auto_create = true;
-        suppressed_dirs.__raw = "nil";
-        allowed_dirs.__raw = "nil";
+        suppressed_dirs = null;
+        allowed_dirs = null;
         auto_restore_last_session = false;
         use_git_branch = false;
         lazy_support = true;
-        bypass_save_filetypes.__raw = "nil";
+        bypass_save_filetypes = null;
         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.__empty = { };
+          theme_conf = { };
           previewer = false;
           mappings = {
             delete_session = {
diff --git a/tests/test-sources/plugins/by-name/avante/default.nix b/tests/test-sources/plugins/by-name/avante/default.nix
index 46837d03..d87e60d8 100644
--- a/tests/test-sources/plugins/by-name/avante/default.nix
+++ b/tests/test-sources/plugins/by-name/avante/default.nix
@@ -28,7 +28,7 @@
           copilot = {
             endpoint = "https://api.githubcopilot.com";
             model = "gpt-4o-2024-05-13";
-            proxy.__raw = "nil";
+            proxy = null;
             allow_insecure = false;
             timeout = 30000;
             extra_request_body = {
diff --git a/tests/test-sources/plugins/by-name/barbar/default.nix b/tests/test-sources/plugins/by-name/barbar/default.nix
index 6f1252ec..2c13d93f 100644
--- a/tests/test-sources/plugins/by-name/barbar/default.nix
+++ b/tests/test-sources/plugins/by-name/barbar/default.nix
@@ -30,8 +30,8 @@
         animation = true;
         auto_hide = -1;
         clickable = true;
-        exclude_ft.__empty = { };
-        exclude_name.__empty = { };
+        exclude_ft = [ ];
+        exclude_name = [ ];
         focus_on_close = "left";
         hide = {
           alternate = false;
@@ -94,10 +94,10 @@
             filename = false;
             separator.right = " ";
           };
-          alternate.__empty = { };
-          current.__empty = { };
-          inactive.__empty = { };
-          visible.__empty = { };
+          alternate = { };
+          current = { };
+          inactive = { };
+          visible = { };
           preset = "default";
         };
         insert_at_start = false;
@@ -107,9 +107,9 @@
         maximum_length = 30;
         minimum_length = 0;
         minimum_padding = 1;
-        no_name_title.__raw = "nil";
+        no_name_title = null;
         semantic_letters = true;
-        sidebar_filetypes.__empty = { };
+        sidebar_filetypes = { };
         tabpages = true;
       };
     };
@@ -219,7 +219,7 @@
           };
         };
         letters = "asdfjkl;ghnmxcvbziowerutyqpASDFJKLGHNMXCVBZIOWERUTYQP";
-        no_name_title.__raw = "nil";
+        no_name_title = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/blame/default.nix b/tests/test-sources/plugins/by-name/blame/default.nix
index 3a56761b..6840e317 100644
--- a/tests/test-sources/plugins/by-name/blame/default.nix
+++ b/tests/test-sources/plugins/by-name/blame/default.nix
@@ -18,8 +18,8 @@
         focus_blame = true;
         merge_consecutive = false;
         max_summary_width = 30;
-        colors.__raw = "nil";
-        blame_options.__raw = "nil";
+        colors = null; # won't output literal nil
+        blame_options = null; # won't output literal nil
         format_fn.__raw = "require('blame.formats.default_formats').commit_date_author_fn";
         commit_detail_view = "vsplit";
         mappings = {
diff --git a/tests/test-sources/plugins/by-name/blink-cmp/default.nix b/tests/test-sources/plugins/by-name/blink-cmp/default.nix
index 65dfa0c1..985616aa 100644
--- a/tests/test-sources/plugins/by-name/blink-cmp/default.nix
+++ b/tests/test-sources/plugins/by-name/blink-cmp/default.nix
@@ -59,9 +59,9 @@
                 "("
                 ")"
               ];
-              override_brackets_for_filetypes.__empty = { };
-              force_allow_filetypes.__empty = { };
-              blocked_filetypes.__empty = { };
+              override_brackets_for_filetypes = { };
+              force_allow_filetypes = [ ];
+              blocked_filetypes = [ ];
               kind_resolution = {
                 enabled = true;
                 blocked_filetypes = [
@@ -112,7 +112,7 @@
               align_to = "label";
               padding = 1;
               gap = 1;
-              treesitter.__empty = { };
+              treesitter = { };
               columns = [
                 [ "kind_icon" ]
                 {
@@ -232,9 +232,9 @@
           prebuilt_binaries = {
             download = true;
             ignore_version_mismatch = false;
-            force_version.__raw = "nil";
-            force_system_triple.__raw = "nil";
-            extra_curl_args.__empty = { };
+            force_version = null;
+            force_system_triple = null;
+            extra_curl_args = [ ];
           };
         };
         sources = {
@@ -244,7 +244,7 @@
             "snippets"
             "buffer"
           ];
-          per_filetype.__empty = { };
+          per_filetype = { };
           cmdline.__raw = ''
             function()
               local type = vim.fn.getcmdtype()
@@ -310,8 +310,8 @@
           enabled = false;
           trigger = {
             enabled = true;
-            blocked_trigger_characters.__empty = { };
-            blocked_retrigger_characters.__empty = { };
+            blocked_trigger_characters = [ ];
+            blocked_retrigger_characters = [ ];
             show_on_insert_on_trigger_character = true;
           };
           window = {
@@ -387,8 +387,6 @@
               '';
             };
           };
-
-          # FIXME: This should be __empty but this config is out of date so it throws
           cmdline = [ ];
         };
         completion = {
diff --git a/tests/test-sources/plugins/by-name/bufferline/default.nix b/tests/test-sources/plugins/by-name/bufferline/default.nix
index a9fc6c34..2f2a1ad4 100644
--- a/tests/test-sources/plugins/by-name/bufferline/default.nix
+++ b/tests/test-sources/plugins/by-name/bufferline/default.nix
@@ -74,7 +74,7 @@
           close_command = "bdelete! %d";
           left_mouse_command = "buffer %d";
           right_mouse_command = "bdelete! %d";
-          middle_mouse_command.__raw = "nil";
+          middle_mouse_command = null;
           indicator = {
             icon = "▎";
             style = "icon";
@@ -82,14 +82,14 @@
           left_trunc_marker = "";
           right_trunc_marker = "";
           separator_style = "thin";
-          name_formatter.__raw = "nil";
+          name_formatter = null;
           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.__raw = "nil";
+          get_element_icon = null;
           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.__raw = "nil";
+          diagnostics_indicator = null;
           diagnostics_update_in_insert = true;
           diagnostics_update_on_event = true;
-          offsets.__raw = "nil";
+          offsets = null;
           groups = {
-            items.__empty = { };
+            items = [ ];
             options = {
               toggle_hidden_on_enter = true;
             };
           };
           hover = {
             enabled = false;
-            reveal.__empty = { };
+            reveal = [ ];
             delay = 200;
           };
           debug = {
             logging = false;
           };
-          custom_filter.__raw = "nil";
+          custom_filter = null;
         };
-        highlights.__empty = { };
+        highlights = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/ccc/default.nix b/tests/test-sources/plugins/by-name/ccc/default.nix
index 26079cac..9994adcf 100644
--- a/tests/test-sources/plugins/by-name/ccc/default.nix
+++ b/tests/test-sources/plugins/by-name/ccc/default.nix
@@ -33,8 +33,8 @@
         lsp = true;
         highlighter = {
           auto_enable = false;
-          filetypes.__empty = { };
-          excludes.__empty = { };
+          filetypes = [ ];
+          excludes = [ ];
           lsp = true;
           update_insert = true;
         };
diff --git a/tests/test-sources/plugins/by-name/chadtree/default.nix b/tests/test-sources/plugins/by-name/chadtree/default.nix
index bb3dbb24..2521f577 100644
--- a/tests/test-sources/plugins/by-name/chadtree/default.nix
+++ b/tests/test-sources/plugins/by-name/chadtree/default.nix
@@ -52,8 +52,8 @@
               "thumbs.db"
               ".git"
             ];
-            name_glob.__empty = { };
-            path_glob.__empty = { };
+            name_glob = [ ];
+            path_glob = [ ];
           };
           view = {
             open_direction = "left";
diff --git a/tests/test-sources/plugins/by-name/chatgpt/default.nix b/tests/test-sources/plugins/by-name/chatgpt/default.nix
index 77823ad2..8094fa02 100644
--- a/tests/test-sources/plugins/by-name/chatgpt/default.nix
+++ b/tests/test-sources/plugins/by-name/chatgpt/default.nix
@@ -11,9 +11,9 @@
       enable = true;
 
       settings = {
-        api_key_cmd.__raw = "nil";
+        api_key_cmd = null;
         yank_register = "+";
-        extra_curl_params.__empty = { };
+        extra_curl_params = [ ];
         show_line_numbers = true;
         edit_with_instructions = {
           diff = false;
@@ -182,7 +182,7 @@
           n = 1;
         };
         use_openai_functions_for_edits = false;
-        actions_paths.__empty = { };
+        actions_paths = [ ];
         show_quickfixes_cmd = "Trouble quickfix";
         predefined_chat_gpt_prompts = "https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv";
         highlights = {
diff --git a/tests/test-sources/plugins/by-name/cloak/default.nix b/tests/test-sources/plugins/by-name/cloak/default.nix
index ea95a70f..73a2833b 100644
--- a/tests/test-sources/plugins/by-name/cloak/default.nix
+++ b/tests/test-sources/plugins/by-name/cloak/default.nix
@@ -11,14 +11,14 @@
         enabled = true;
         cloak_character = "*";
         highlight_group = "Comment";
-        cloak_length.__raw = "nil";
+        cloak_length = null;
         try_all_patterns = true;
         cloak_telescope = true;
         patterns = [
           {
             file_pattern = ".env*";
             cloak_pattern = "=.+";
-            replace.__raw = "nil";
+            replace = null;
           }
         ];
       };
diff --git a/tests/test-sources/plugins/by-name/cmake-tools/default.nix b/tests/test-sources/plugins/by-name/cmake-tools/default.nix
index 07268dc9..face60bf 100644
--- a/tests/test-sources/plugins/by-name/cmake-tools/default.nix
+++ b/tests/test-sources/plugins/by-name/cmake-tools/default.nix
@@ -14,11 +14,11 @@
         cmake_generate_options = {
           "-DCMAKE_EXPORT_COMPILE_COMMANDS" = 1;
         };
-        cmake_build_options.__empty = { };
+        cmake_build_options = { };
         cmake_build_directory = "out/\${variant:buildType}";
         cmake_soft_link_compile_commands = true;
         cmake_compile_commands_from_lsp = false;
-        cmake_kits_path.__raw = "nil";
+        cmake_kits_path = null;
 
         cmake_variants_message = {
           short = {
@@ -41,7 +41,7 @@
 
         cmake_executor = {
           name = "quickfix";
-          opts.__empty = { };
+          opts = { };
           default_opts = {
             quickfix = {
               show = "always";
@@ -84,7 +84,7 @@
 
         cmake_runner = {
           name = "terminal";
-          opts.__empty = { };
+          opts = { };
           default_opts = {
             quickfix = {
               show = "always";
diff --git a/tests/test-sources/plugins/by-name/cmp-tabnine/default.nix b/tests/test-sources/plugins/by-name/cmp-tabnine/default.nix
index 4e91d76d..3153f457 100644
--- a/tests/test-sources/plugins/by-name/cmp-tabnine/default.nix
+++ b/tests/test-sources/plugins/by-name/cmp-tabnine/default.nix
@@ -18,7 +18,7 @@
           sort = true;
           run_on_every_keystroke = true;
           snippet_placeholder = "..";
-          ignored_file_types.__empty = { };
+          ignored_file_types = { };
           min_percent = 0;
         };
       };
diff --git a/tests/test-sources/plugins/by-name/codecompanion/default.nix b/tests/test-sources/plugins/by-name/codecompanion/default.nix
index cf41d323..1c285adb 100644
--- a/tests/test-sources/plugins/by-name/codecompanion/default.nix
+++ b/tests/test-sources/plugins/by-name/codecompanion/default.nix
@@ -21,7 +21,7 @@
           };
           opts = {
             allow_insecure = false;
-            proxy.__raw = "nil";
+            proxy = null;
           };
         };
         strategies = {
diff --git a/tests/test-sources/plugins/by-name/codesnap/default.nix b/tests/test-sources/plugins/by-name/codesnap/default.nix
index a3f5d7b1..cb69269b 100644
--- a/tests/test-sources/plugins/by-name/codesnap/default.nix
+++ b/tests/test-sources/plugins/by-name/codesnap/default.nix
@@ -8,14 +8,14 @@
       enable = true;
 
       settings = {
-        save_path.__raw = "nil";
+        save_path = null;
         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.__raw = "nil";
+        bg_color = null;
         breadcrumbs_separator = "/";
         has_breadcrumbs = false;
         has_line_number = false;
diff --git a/tests/test-sources/plugins/by-name/colorizer/default.nix b/tests/test-sources/plugins/by-name/colorizer/default.nix
index d2150960..6fdf208e 100644
--- a/tests/test-sources/plugins/by-name/colorizer/default.nix
+++ b/tests/test-sources/plugins/by-name/colorizer/default.nix
@@ -8,7 +8,7 @@
       enable = true;
 
       settings = {
-        filetypes.__empty = { };
+        filetypes = { };
         user_default_options = {
           RGB = true;
           RRGGBB = true;
@@ -30,7 +30,7 @@
           virtualtext_mode = "foreground";
           always_update = false;
         };
-        buftypes.__empty = { };
+        buftypes = { };
         user_commands = true;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/comment/default.nix b/tests/test-sources/plugins/by-name/comment/default.nix
index 07eb91b0..e7997c82 100644
--- a/tests/test-sources/plugins/by-name/comment/default.nix
+++ b/tests/test-sources/plugins/by-name/comment/default.nix
@@ -10,7 +10,7 @@
       settings = {
         padding = true;
         sticky = true;
-        ignore.__raw = "nil";
+        ignore = null;
         toggler = {
           line = "gcc";
           block = "gbc";
@@ -28,8 +28,8 @@
           basic = true;
           extra = true;
         };
-        pre_hook.__raw = "nil";
-        post_hook.__raw = "nil";
+        pre_hook = null;
+        post_hook = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/conform-nvim/default.nix b/tests/test-sources/plugins/by-name/conform-nvim/default.nix
index 4cc0aa16..12a14349 100644
--- a/tests/test-sources/plugins/by-name/conform-nvim/default.nix
+++ b/tests/test-sources/plugins/by-name/conform-nvim/default.nix
@@ -24,7 +24,7 @@
       enable = true;
 
       settings = {
-        formatters_by_ft.__empty = { };
+        formatters_by_ft = { };
         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.__empty = { };
+        formatters = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/copilot-chat/default.nix b/tests/test-sources/plugins/by-name/copilot-chat/default.nix
index 8f364fa4..246217f3 100644
--- a/tests/test-sources/plugins/by-name/copilot-chat/default.nix
+++ b/tests/test-sources/plugins/by-name/copilot-chat/default.nix
@@ -13,12 +13,12 @@
         system_prompt = "require('CopilotChat.config.prompts').COPILOT_INSTRUCTIONS";
         model = "gpt-4-o";
         agent = "none";
-        context.__raw = "nil";
-        sticky.__raw = "nil";
+        context = null;
+        sticky = null;
 
         temperature = 0.1;
         headless = false;
-        callback.__raw = "nil";
+        callback = null;
 
         selection.__raw = ''
           function(source)
@@ -33,10 +33,10 @@
           height = 0.5;
           relative = "editor";
           border = "single";
-          row.__raw = "nil";
-          col.__raw = "nil";
+          row = null;
+          col = null;
           title = "Copilot Chat";
-          footer.__raw = "nil";
+          footer = null;
           zindex = 1;
         };
 
@@ -50,7 +50,7 @@
 
         debug = false;
         log_level = "info";
-        proxy.__raw = "nil";
+        proxy = null;
         allow_insecure = false;
 
         chat_autocomplete = true;
diff --git a/tests/test-sources/plugins/by-name/cord/default.nix b/tests/test-sources/plugins/by-name/cord/default.nix
index 18d6a093..dc8207b3 100644
--- a/tests/test-sources/plugins/by-name/cord/default.nix
+++ b/tests/test-sources/plugins/by-name/cord/default.nix
@@ -17,7 +17,7 @@
         editor = {
           client = "neovim";
           tooltip = "The Superior Text Editor";
-          icon.__raw = "nil";
+          icon = null;
         };
         display = {
           theme = "default";
@@ -38,12 +38,12 @@
           unidle_on_focus = true;
           smart_idle = true;
           details = "Idling";
-          state.__raw = "nil";
+          state = null;
           tooltip = "💤";
-          icon.__raw = "nil";
+          icon = null;
         };
         text = {
-          default.__raw = "nil";
+          default = null;
           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.__raw = "nil";
-        assets.__raw = "nil";
-        variables.__raw = "nil";
+        buttons = null;
+        assets = null;
+        variables = null;
         hooks = {
-          ready.__raw = "nil";
-          shutdown.__raw = "nil";
-          pre_activity.__raw = "nil";
-          post_activity.__raw = "nil";
-          idle_enter.__raw = "nil";
-          idle_leave.__raw = "nil";
-          workspace_change.__raw = "nil";
+          ready = null;
+          shutdown = null;
+          pre_activity = null;
+          post_activity = null;
+          idle_enter = null;
+          idle_leave = null;
+          workspace_change = null;
         };
-        plugins.__raw = "nil";
+        plugins = null;
         advanced = {
           plugin = {
             autocmds = true;
@@ -81,8 +81,8 @@
           };
           server = {
             update = "fetch";
-            pipe_path.__raw = "nil";
-            executable_path.__raw = "nil";
+            pipe_path = null;
+            executable_path = null;
             timeout = 300000;
           };
           discord = {
diff --git a/tests/test-sources/plugins/by-name/cornelis/default.nix b/tests/test-sources/plugins/by-name/cornelis/default.nix
index 13e12764..a4150a83 100644
--- a/tests/test-sources/plugins/by-name/cornelis/default.nix
+++ b/tests/test-sources/plugins/by-name/cornelis/default.nix
@@ -11,7 +11,7 @@
         use_global_binary = 0;
         agda_prefix = "<localleader>";
         no_agda_input = 0;
-        bind_input_hook.__raw = "nil";
+        bind_input_hook = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/coverage/default.nix b/tests/test-sources/plugins/by-name/coverage/default.nix
index 38643835..0253a7f9 100644
--- a/tests/test-sources/plugins/by-name/coverage/default.nix
+++ b/tests/test-sources/plugins/by-name/coverage/default.nix
@@ -87,7 +87,7 @@
             coverage_file = "coverage/coverage.json";
           };
         };
-        lcov_file.__raw = "nil";
+        lcov_file = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/cutlass/default.nix b/tests/test-sources/plugins/by-name/cutlass/default.nix
index d8faccef..7a659901 100644
--- a/tests/test-sources/plugins/by-name/cutlass/default.nix
+++ b/tests/test-sources/plugins/by-name/cutlass/default.nix
@@ -7,8 +7,8 @@
     plugins.cutlass-nvim = {
       enable = true;
       settings = {
-        cut_key.__raw = "nil";
-        override_del.__raw = "nil";
+        cut_key = "nil";
+        override_del = "nil";
         exclude.__empty = { };
         registers = {
           select = "_";
diff --git a/tests/test-sources/plugins/by-name/dap-go/default.nix b/tests/test-sources/plugins/by-name/dap-go/default.nix
index 25c62312..bffacfe7 100644
--- a/tests/test-sources/plugins/by-name/dap-go/default.nix
+++ b/tests/test-sources/plugins/by-name/dap-go/default.nix
@@ -21,7 +21,7 @@
           path = "dlv";
           initialize_timeout_sec = 20;
           port = "$\{port}";
-          args.__empty = { };
+          args = [ ];
           build_flags = "-tags=unit";
         };
       };
diff --git a/tests/test-sources/plugins/by-name/dap-ui/default.nix b/tests/test-sources/plugins/by-name/dap-ui/default.nix
index 727708bd..78390065 100644
--- a/tests/test-sources/plugins/by-name/dap-ui/default.nix
+++ b/tests/test-sources/plugins/by-name/dap-ui/default.nix
@@ -23,7 +23,7 @@
             terminate = "";
           };
         };
-        element_mappings.__empty = { };
+        element_mappings = { };
         expand_lines = true;
         floating = {
           border = "single";
diff --git a/tests/test-sources/plugins/by-name/dap-view/default.nix b/tests/test-sources/plugins/by-name/dap-view/default.nix
index 2cb03e97..43212196 100644
--- a/tests/test-sources/plugins/by-name/dap-view/default.nix
+++ b/tests/test-sources/plugins/by-name/dap-view/default.nix
@@ -101,7 +101,7 @@
               '';
             };
           };
-          custom_sections.__empty = { };
+          custom_sections = [ ];
           controls = {
             enabled = false;
             position = "right";
@@ -115,7 +115,7 @@
               "terminate"
               "disconnect"
             ];
-            custom_buttons.__empty = { };
+            custom_buttons = [ ];
           };
         };
         windows = {
@@ -124,7 +124,7 @@
           terminal = {
             width = 0.5;
             position = "left";
-            hide.__empty = { };
+            hide = { };
             start_hidden = false;
           };
         };
@@ -144,7 +144,7 @@
           terminate = "";
         };
         help = {
-          border.__raw = "nil";
+          border = null;
         };
         switchbuf = "usetab";
         auto_toggle = false;
diff --git a/tests/test-sources/plugins/by-name/dashboard/default.nix b/tests/test-sources/plugins/by-name/dashboard/default.nix
index 187a860f..0e85acd7 100644
--- a/tests/test-sources/plugins/by-name/dashboard/default.nix
+++ b/tests/test-sources/plugins/by-name/dashboard/default.nix
@@ -22,7 +22,7 @@
           week_header = {
             enable = false;
             concat = "";
-            append.__empty = { };
+            append = [ ];
           };
           header = [
             ""
@@ -43,7 +43,7 @@
 
         preview = {
           command = "";
-          file_path.__raw = "nil";
+          file_path = null;
           file_height = 0;
           file_width = 0;
         };
@@ -85,7 +85,7 @@
             cwd_only = false;
           };
 
-          footer.__empty = { };
+          footer = [ ];
         };
       };
     };
@@ -111,7 +111,7 @@
               action = "";
             }
           ];
-          footer.__empty = { };
+          footer = [ ];
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/dbee/default.nix b/tests/test-sources/plugins/by-name/dbee/default.nix
index 304c5a67..d1090454 100644
--- a/tests/test-sources/plugins/by-name/dbee/default.nix
+++ b/tests/test-sources/plugins/by-name/dbee/default.nix
@@ -8,16 +8,16 @@
     plugins.dbee = {
       enable = true;
       settings = {
-        default_connection.__raw = "nil";
+        default_connection = null;
         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.__empty = { };
-        float_options.__empty = { };
+        extra_helpers = { };
+        float_options = { };
         drawer = {
-          window_options.__empty = { };
-          buffer_options.__empty = { };
+          window_options = { };
+          buffer_options = { };
           disable_help = false;
           mappings = [
             {
@@ -176,8 +176,8 @@
           };
         };
         result = {
-          window_options.__empty = { };
-          buffer_options.__empty = { };
+          window_options = { };
+          buffer_options = { };
           page_size = 100;
           focus_result = true;
           progress = {
@@ -254,8 +254,8 @@
           ];
         };
         editor = {
-          window_options.__empty = { };
-          buffer_options.__empty = { };
+          window_options = { };
+          buffer_options = { };
           mappings = [
             {
               key = "BB";
@@ -270,8 +270,8 @@
           ];
         };
         call_log = {
-          window_options.__empty = { };
-          buffer_options.__empty = { };
+          window_options = { };
+          buffer_options = { };
           mappings = [
             {
               key = "<CR>";
diff --git a/tests/test-sources/plugins/by-name/devdocs/default.nix b/tests/test-sources/plugins/by-name/devdocs/default.nix
index 72c0de97..bedd381d 100644
--- a/tests/test-sources/plugins/by-name/devdocs/default.nix
+++ b/tests/test-sources/plugins/by-name/devdocs/default.nix
@@ -14,7 +14,7 @@
       enable = true;
 
       settings = {
-        ensure_installed.__empty = { };
+        ensure_installed = [ ];
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/diagram/default.nix b/tests/test-sources/plugins/by-name/diagram/default.nix
index 61ad7258..133f571a 100644
--- a/tests/test-sources/plugins/by-name/diagram/default.nix
+++ b/tests/test-sources/plugins/by-name/diagram/default.nix
@@ -16,26 +16,26 @@
       settings = {
         renderer_options = {
           mermaid = {
-            background.__raw = "nil";
-            theme.__raw = "nil";
+            background = null;
+            theme = null;
             scale = 1;
-            width.__raw = "nil";
-            height.__raw = "nil";
+            width = null;
+            height = null;
           };
           plantuml = {
-            charset.__raw = "nil";
+            charset = null;
           };
           d2 = {
-            theme_id.__raw = "nil";
-            dark_theme_id.__raw = "nil";
-            scale.__raw = "nil";
-            layout.__raw = "nil";
-            sketch.__raw = "nil";
+            theme_id = null;
+            dark_theme_id = null;
+            scale = null;
+            layout = null;
+            sketch = null;
           };
           gnuplot = {
-            size.__raw = "nil";
-            font.__raw = "nil";
-            theme.__raw = "nil";
+            size = null;
+            font = null;
+            theme = null;
           };
         };
       };
diff --git a/tests/test-sources/plugins/by-name/diffview/default.nix b/tests/test-sources/plugins/by-name/diffview/default.nix
index d0083865..ab7b7f7d 100644
--- a/tests/test-sources/plugins/by-name/diffview/default.nix
+++ b/tests/test-sources/plugins/by-name/diffview/default.nix
@@ -50,7 +50,7 @@
           win_config = {
             position = "right";
             width = 20;
-            win_opts.__empty = { };
+            win_opts = { };
           };
         };
         file_history_panel = {
@@ -63,14 +63,14 @@
               multi_file.diff_merges = "first-parent";
             };
             hg = {
-              single_file.__empty = { };
-              multi_file.__empty = { };
+              single_file = { };
+              multi_file = { };
             };
           };
           win_config = {
             position = "top";
             height = 10;
-            win_opts.__empty = { };
+            win_opts = { };
           };
         };
 
diff --git a/tests/test-sources/plugins/by-name/distant/default.nix b/tests/test-sources/plugins/by-name/distant/default.nix
index c4fbc7cb..5541ff05 100644
--- a/tests/test-sources/plugins/by-name/distant/default.nix
+++ b/tests/test-sources/plugins/by-name/distant/default.nix
@@ -21,8 +21,8 @@
               return os_name == 'windows' and 'distant.exe' or 'distant'
             end)()
           '';
-          log_file.__raw = "nil";
-          log_level.__raw = "nil";
+          log_file = null;
+          log_level = null;
         };
         keymap = {
           dir = {
@@ -63,8 +63,8 @@
         manager = {
           daemon = false;
           lazy = true;
-          log_file.__raw = "nil";
-          log_level.__raw = "nil";
+          log_file = null;
+          log_level = null;
           user = false;
         };
         network = {
@@ -73,15 +73,15 @@
             max = 15000;
             interval = 256;
           };
-          windows_pipe.__raw = "nil";
-          unix_socket.__raw = "nil";
+          windows_pipe = null;
+          unix_socket = null;
         };
         servers = {
           "*" = {
             connect.default = { };
-            cwd.__raw = "nil";
+            cwd = null;
             launch.default = { };
-            lsp.__empty = { };
+            lsp = { };
           };
         };
       };
diff --git a/tests/test-sources/plugins/by-name/dressing/default.nix b/tests/test-sources/plugins/by-name/dressing/default.nix
index 7f7edd5e..b6a71050 100644
--- a/tests/test-sources/plugins/by-name/dressing/default.nix
+++ b/tests/test-sources/plugins/by-name/dressing/default.nix
@@ -18,7 +18,7 @@
           border = "rounded";
           relative = "cursor";
           prefer_width = 40;
-          width.__raw = "nil";
+          width = null;
           max_width = [
             140
             0.9
@@ -46,7 +46,7 @@
             };
           };
           override = "function(conf) return conf end";
-          get_config.__raw = "nil";
+          get_config = null;
         };
         select = {
           enabled = true;
@@ -58,15 +58,15 @@
             "nui"
           ];
           trim_prompt = true;
-          telescope.__raw = "nil";
+          telescope = null;
           fzf.window = {
             width = 0.5;
             height = 0.4;
           };
-          fzf_lua.__empty = { };
+          fzf_lua = { };
           nui = {
             position = "50%";
-            size.__raw = "nil";
+            size = null;
             relative = "editor";
             border = {
               style = "rounded";
@@ -88,13 +88,13 @@
             border = "rounded";
             relative = "editor";
 
-            buf_options.__empty = { };
+            buf_options = { };
             win_options = {
               cursorline = true;
               cursorlineopt = "both";
             };
 
-            width.__raw = "nil";
+            width = null;
             max_width = [
               140
               0.8
@@ -103,7 +103,7 @@
               40
               0.2
             ];
-            height.__raw = "nil";
+            height = null;
             max_height = 0.9;
             min_height = [
               10
@@ -118,8 +118,8 @@
 
             override = "function(conf) return conf end";
           };
-          format_item_override.__empty = { };
-          get_config.__raw = "nil";
+          format_item_override = { };
+          get_config = null;
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/easy-dotnet/default.nix b/tests/test-sources/plugins/by-name/easy-dotnet/default.nix
index 591c20c0..96f66fd9 100644
--- a/tests/test-sources/plugins/by-name/easy-dotnet/default.nix
+++ b/tests/test-sources/plugins/by-name/easy-dotnet/default.nix
@@ -133,7 +133,7 @@
                 desc = "refresh testrunner";
               };
             };
-            additional_args.__empty = { };
+            additional_args = [ ];
           };
           csproj_mappings = true;
           fsproj_mappings = true;
diff --git a/tests/test-sources/plugins/by-name/edgy/default.nix b/tests/test-sources/plugins/by-name/edgy/default.nix
index 9bb74b90..69961321 100644
--- a/tests/test-sources/plugins/by-name/edgy/default.nix
+++ b/tests/test-sources/plugins/by-name/edgy/default.nix
@@ -8,26 +8,26 @@
       enable = true;
 
       settings = {
-        left.__empty = { };
-        bottom.__empty = { };
-        right.__empty = { };
-        top.__empty = { };
+        left = [ ];
+        bottom = [ ];
+        right = [ ];
+        top = [ ];
         options = {
           left = {
             size = 30;
-            wo.__raw = "nil";
+            wo = null;
           };
           bottom = {
             size = 10;
-            wo.__raw = "nil";
+            wo = null;
           };
           right = {
             size = 30;
-            wo.__raw = "nil";
+            wo = null;
           };
           top = {
             size = 10;
-            wo.__raw = "nil";
+            wo = null;
           };
         };
         animate = {
diff --git a/tests/test-sources/plugins/by-name/emmet/default.nix b/tests/test-sources/plugins/by-name/emmet/default.nix
index f0fe43f0..64b2246f 100644
--- a/tests/test-sources/plugins/by-name/emmet/default.nix
+++ b/tests/test-sources/plugins/by-name/emmet/default.nix
@@ -17,11 +17,11 @@
           html = {
             default_attributes = {
               option = {
-                value.__raw = "nil";
+                value = null;
               };
               textarea = {
-                id.__raw = "nil";
-                name.__raw = "nil";
+                id = null;
+                name = null;
                 cols = 10;
                 rows = 10;
               };
diff --git a/tests/test-sources/plugins/by-name/ethersync/default.nix b/tests/test-sources/plugins/by-name/ethersync/default.nix
new file mode 100644
index 00000000..c508b8bd
--- /dev/null
+++ b/tests/test-sources/plugins/by-name/ethersync/default.nix
@@ -0,0 +1,5 @@
+{
+  empty = {
+    plugins.ethersync.enable = true;
+  };
+}
diff --git a/tests/test-sources/plugins/by-name/eyeliner/default.nix b/tests/test-sources/plugins/by-name/eyeliner/default.nix
index dd1a9f21..5e15502a 100644
--- a/tests/test-sources/plugins/by-name/eyeliner/default.nix
+++ b/tests/test-sources/plugins/by-name/eyeliner/default.nix
@@ -10,8 +10,8 @@
         highlight_on_key = false;
         dim = false;
         max_length = 9999;
-        disabled_filetypes.__empty = { };
-        disabled_buftypes.__empty = { };
+        disabled_filetypes = [ ];
+        disabled_buftypes = [ ];
         default_keymaps = true;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/faster/default.nix b/tests/test-sources/plugins/by-name/faster/default.nix
index b1ab697a..d4596730 100644
--- a/tests/test-sources/plugins/by-name/faster/default.nix
+++ b/tests/test-sources/plugins/by-name/faster/default.nix
@@ -22,7 +22,7 @@
             ];
             filesize = 2;
             pattern = "*";
-            extra_patterns.__empty = { };
+            extra_patterns = [ ];
           };
           fastmacro = {
             on = true;
diff --git a/tests/test-sources/plugins/by-name/fidget/default.nix b/tests/test-sources/plugins/by-name/fidget/default.nix
index 6cf6c121..b20f0ac2 100644
--- a/tests/test-sources/plugins/by-name/fidget/default.nix
+++ b/tests/test-sources/plugins/by-name/fidget/default.nix
@@ -20,7 +20,7 @@
               return client and client.name or nil
             end
           '';
-          ignore.__empty = { };
+          ignore = [ ];
           display = {
             render_limit = 16;
             done_ttl = 3;
diff --git a/tests/test-sources/plugins/by-name/flash/default.nix b/tests/test-sources/plugins/by-name/flash/default.nix
index f3cd80bf..ecf6668c 100644
--- a/tests/test-sources/plugins/by-name/flash/default.nix
+++ b/tests/test-sources/plugins/by-name/flash/default.nix
@@ -38,8 +38,8 @@
           register = false;
           nohlsearch = false;
           autojump = false;
-          inclusive.__raw = "nil";
-          offset.__raw = "nil";
+          inclusive = null;
+          offset = null;
         };
         label = {
           uppercase = true;
@@ -72,10 +72,10 @@
             label = "FlashLabel";
           };
         };
-        action.__raw = "nil";
+        action = null;
         pattern = "";
         continue = false;
-        config.__raw = "nil";
+        config = null;
         prompt = {
           enabled = true;
           prefix = [
diff --git a/tests/test-sources/plugins/by-name/flit/default.nix b/tests/test-sources/plugins/by-name/flit/default.nix
index f8599e8b..40a14fb2 100644
--- a/tests/test-sources/plugins/by-name/flit/default.nix
+++ b/tests/test-sources/plugins/by-name/flit/default.nix
@@ -16,7 +16,7 @@
         labeled_modes = "v";
         clever_repeat = true;
         multiline = true;
-        opts.__empty = { };
+        opts = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/floaterm/default.nix b/tests/test-sources/plugins/by-name/floaterm/default.nix
index 90fbb668..08aa5527 100644
--- a/tests/test-sources/plugins/by-name/floaterm/default.nix
+++ b/tests/test-sources/plugins/by-name/floaterm/default.nix
@@ -8,7 +8,7 @@
       enable = true;
 
       settings = {
-        shell.__raw = "nil";
+        shell = null;
         title = "floaterm: $1/$2";
         wintype = "float";
         width = 0.6;
diff --git a/tests/test-sources/plugins/by-name/flutter-tools/default.nix b/tests/test-sources/plugins/by-name/flutter-tools/default.nix
index 615a4644..888c3ce5 100644
--- a/tests/test-sources/plugins/by-name/flutter-tools/default.nix
+++ b/tests/test-sources/plugins/by-name/flutter-tools/default.nix
@@ -20,11 +20,11 @@
         };
         debugger = {
           enabled = false;
-          exception_breakpoints.__raw = "nil";
+          exception_breakpoints = null;
           evaluate_to_string_in_debug_views = true;
-          register_configurations.__raw = "nil";
+          register_configurations = null;
         };
-        flutter_path.__raw = "nil";
+        flutter_path = null;
         flutter_lookup_cmd.__raw = ''
           (function()
             local exepath = vim.fn.exepath("flutter")
@@ -48,7 +48,7 @@
         };
         dev_log = {
           enabled = true;
-          filter.__raw = "nil";
+          filter = null;
           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.__raw = "nil";
+            background_color = null;
             foreground = false;
             virtual_text = true;
             virtual_text_str = "■";
           };
-          on_attach.__raw = "nil";
-          capabilities.__raw = "nil";
-          settings.__raw = "nil";
+          on_attach = null;
+          capabilities = null;
+          settings = null;
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/fugit2/default.nix b/tests/test-sources/plugins/by-name/fugit2/default.nix
index d3871772..9390d21c 100644
--- a/tests/test-sources/plugins/by-name/fugit2/default.nix
+++ b/tests/test-sources/plugins/by-name/fugit2/default.nix
@@ -14,13 +14,13 @@
         content_width = 60;
         height = "60%";
         show_patch = false;
-        libgit2_path.__raw = "nil";
+        libgit2_path = null;
         gpgme_path = "gpgme";
         external_diffview = false;
         blame_priority = 1;
         blame_info_width = 60;
         blame_info_height = 10;
-        colorscheme.__raw = "nil";
+        colorscheme = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/git-conflict/default.nix b/tests/test-sources/plugins/by-name/git-conflict/default.nix
index ce5a1cba..d1b8a32f 100644
--- a/tests/test-sources/plugins/by-name/git-conflict/default.nix
+++ b/tests/test-sources/plugins/by-name/git-conflict/default.nix
@@ -15,7 +15,7 @@
         highlights = {
           incoming = "DiffAdd";
           current = "DiffText";
-          ancestor.__raw = "nil";
+          ancestor = null;
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/gitblame/default.nix b/tests/test-sources/plugins/by-name/gitblame/default.nix
index 762e6750..b4736509 100644
--- a/tests/test-sources/plugins/by-name/gitblame/default.nix
+++ b/tests/test-sources/plugins/by-name/gitblame/default.nix
@@ -13,11 +13,11 @@
         date_format = "%c";
         message_when_not_committed = "  Not Committed Yet";
         highlight_group = "Comment";
-        set_extmark_options.__empty = { };
+        set_extmark_options = { };
         display_virtual_text = true;
-        ignored_filetypes.__empty = { };
+        ignored_filetypes = [ ];
         delay = 250;
-        virtual_text_column.__raw = "nil";
+        virtual_text_column = null;
         use_blame_commit_file_urls = false;
         schedule_event = "CursorMoved";
         clear_event = "CursorMovedI";
diff --git a/tests/test-sources/plugins/by-name/gitlab/default.nix b/tests/test-sources/plugins/by-name/gitlab/default.nix
index 3c4cbb4d..80b5f356 100644
--- a/tests/test-sources/plugins/by-name/gitlab/default.nix
+++ b/tests/test-sources/plugins/by-name/gitlab/default.nix
@@ -56,7 +56,7 @@
             };
             telemetry = {
               enabled = true;
-              trackingUrl.__raw = "nil";
+              trackingUrl = null;
             };
           };
         };
diff --git a/tests/test-sources/plugins/by-name/gitlinker/default.nix b/tests/test-sources/plugins/by-name/gitlinker/default.nix
index a2d582cf..0524c5ce 100644
--- a/tests/test-sources/plugins/by-name/gitlinker/default.nix
+++ b/tests/test-sources/plugins/by-name/gitlinker/default.nix
@@ -30,7 +30,7 @@
 
       settings = {
         opts = {
-          remote.__raw = "nil";
+          remote = null;
           add_current_line_on_normal_mode = true;
           action_callback = lib.nixvim.mkRaw "require('gitlinker.actions').copy_to_clipboard";
           print_url = true;
diff --git a/tests/test-sources/plugins/by-name/gitmessenger/default.nix b/tests/test-sources/plugins/by-name/gitmessenger/default.nix
index 170a495a..30400f37 100644
--- a/tests/test-sources/plugins/by-name/gitmessenger/default.nix
+++ b/tests/test-sources/plugins/by-name/gitmessenger/default.nix
@@ -16,11 +16,11 @@
         always_into_popup = false;
         extra_blame_args = "";
         preview_mods = "";
-        max_popup_height.__raw = "nil";
-        max_popup_width.__raw = "nil";
+        max_popup_height = null;
+        max_popup_width = null;
         date_format = "%c";
         conceal_word_diff_marker = true;
-        floating_win_opts.__empty = { };
+        floating_win_opts = { };
         popup_content_margins = true;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/gitsigns/default.nix b/tests/test-sources/plugins/by-name/gitsigns/default.nix
index 5e637edc..c0dcb893 100644
--- a/tests/test-sources/plugins/by-name/gitsigns/default.nix
+++ b/tests/test-sources/plugins/by-name/gitsigns/default.nix
@@ -45,13 +45,13 @@
           internal = false;
           indent_heuristic = false;
           vertical = true;
-          linematch.__raw = "nil";
+          linematch = null;
           ignore_blank_lines = true;
           ignore_whitespace_change = true;
           ignore_whitespace = true;
           ignore_whitespace_change_at_eol = true;
         };
-        base.__raw = "nil";
+        base = null;
         count_chars = {
           "__unkeyed_1" = "1";
           "__unkeyed_2" = "2";
diff --git a/tests/test-sources/plugins/by-name/glance/default.nix b/tests/test-sources/plugins/by-name/glance/default.nix
index f8a9aa1d..bc06ac48 100644
--- a/tests/test-sources/plugins/by-name/glance/default.nix
+++ b/tests/test-sources/plugins/by-name/glance/default.nix
@@ -65,7 +65,7 @@
             "<leader>l".__raw = ''require('glance').actions.enter_win("list")'';
           };
         };
-        hooks.__empty = { };
+        hooks = { };
         folds = {
           fold_closed = "";
           fold_open = "";
diff --git a/tests/test-sources/plugins/by-name/goto-preview/default.nix b/tests/test-sources/plugins/by-name/goto-preview/default.nix
index ad9d135b..ac4d8a70 100644
--- a/tests/test-sources/plugins/by-name/goto-preview/default.nix
+++ b/tests/test-sources/plugins/by-name/goto-preview/default.nix
@@ -22,13 +22,13 @@
         ];
         default_mappings = false;
         debug = false;
-        opacity.__raw = "nil";
+        opacity = null;
         resizing_mappings = false;
-        post_open_hook.__raw = "nil";
-        post_close_hook.__raw = "nil";
+        post_open_hook = null;
+        post_close_hook = null;
         references = {
           provider = "telescope";
-          telescope.__raw = "nil";
+          telescope = null;
         };
         focus_on_open = true;
         dismiss_on_move = false;
diff --git a/tests/test-sources/plugins/by-name/gx/default.nix b/tests/test-sources/plugins/by-name/gx/default.nix
index 585350c7..c1ca0b39 100644
--- a/tests/test-sources/plugins/by-name/gx/default.nix
+++ b/tests/test-sources/plugins/by-name/gx/default.nix
@@ -10,9 +10,9 @@
       disableNetrwGx = true;
 
       settings = {
-        open_browser_app.__raw = "nil";
-        open_browser_args.__empty = { };
-        handlers.__empty = { };
+        open_browser_app = null;
+        open_browser_args = [ ];
+        handlers = { };
         handler_options = {
           search_engine = "google";
           select_for_search = false;
diff --git a/tests/test-sources/plugins/by-name/helpview/default.nix b/tests/test-sources/plugins/by-name/helpview/default.nix
index 0198b244..d8ced103 100644
--- a/tests/test-sources/plugins/by-name/helpview/default.nix
+++ b/tests/test-sources/plugins/by-name/helpview/default.nix
@@ -8,16 +8,16 @@
       enable = true;
 
       settings = {
-        buf_ignore.__raw = "nil";
+        buf_ignore = null;
         mode = [
           "n"
           "c"
         ];
-        hybrid_modes.__raw = "nil";
+        hybrid_modes = null;
         callback = {
-          on_enable.__raw = "nil";
-          on_disable.__raw = "nil";
-          on_mode_change.__raw = "nil";
+          on_enable = null;
+          on_disable = null;
+          on_mode_change = null;
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/highlight-colors/default.nix b/tests/test-sources/plugins/by-name/highlight-colors/default.nix
index 3c2f31bd..fc54a5a4 100644
--- a/tests/test-sources/plugins/by-name/highlight-colors/default.nix
+++ b/tests/test-sources/plugins/by-name/highlight-colors/default.nix
@@ -18,13 +18,13 @@
         enable_short_hex = true;
         enable_tailwind = false;
         enable_ansi = false;
-        custom_colors.__raw = "nil";
+        custom_colors = null;
         virtual_symbol = "■";
         virtual_symbol_prefix = "";
         virtual_symbol_suffix = " ";
         virtual_symbol_position = "inline";
-        exclude_filetypes.__empty = { };
-        exclude_buftypes.__empty = { };
+        exclude_filetypes = { };
+        exclude_buftypes = { };
         exclude_buffer.__raw = "function(bufnr) end";
       };
     };
diff --git a/tests/test-sources/plugins/by-name/hlchunk/default.nix b/tests/test-sources/plugins/by-name/hlchunk/default.nix
index e4bb6560..f427f567 100644
--- a/tests/test-sources/plugins/by-name/hlchunk/default.nix
+++ b/tests/test-sources/plugins/by-name/hlchunk/default.nix
@@ -12,7 +12,7 @@
         let
           modDefaultConfig = {
             enable = false;
-            style.__empty = { };
+            style = { };
             notify = false;
             priority = 0;
             exclude_filetypes = {
diff --git a/tests/test-sources/plugins/by-name/hop/default.nix b/tests/test-sources/plugins/by-name/hop/default.nix
index 83ac488f..500f0289 100644
--- a/tests/test-sources/plugins/by-name/hop/default.nix
+++ b/tests/test-sources/plugins/by-name/hop/default.nix
@@ -98,17 +98,17 @@
         case_insensitive = true;
         create_hl_autocmd = true;
         dim_unmatched = true;
-        direction.__raw = "nil";
+        direction = null;
         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.__raw = "nil";
+        extensions = null;
         multi_windows = false;
-        excluded_filetypes.__empty = { };
-        match_mappings.__empty = { };
+        excluded_filetypes = [ ];
+        match_mappings = [ ];
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/hydra/default.nix b/tests/test-sources/plugins/by-name/hydra/default.nix
index 9fb9203d..60fdd809 100644
--- a/tests/test-sources/plugins/by-name/hydra/default.nix
+++ b/tests/test-sources/plugins/by-name/hydra/default.nix
@@ -10,14 +10,14 @@
       settings = {
         debug = false;
         exit = false;
-        foreign_keys.__raw = "nil";
+        foreign_keys = null;
         color = "red";
-        buffer.__raw = "nil";
+        buffer = null;
         invoke_on_body = false;
-        desc.__raw = "nil";
-        on_enter.__raw = "nil";
-        on_exit.__raw = "nil";
-        on_key.__raw = "nil";
+        desc = null;
+        on_enter = null;
+        on_exit = null;
+        on_key = null;
         timeout = false;
         hint = {
           show_name = true;
@@ -42,7 +42,7 @@
           color = "red";
           buffer = true;
           invoke_on_body = false;
-          desc.__raw = "nil";
+          desc = null;
           on_enter = ''
             function()
               print('hello')
diff --git a/tests/test-sources/plugins/by-name/illuminate/default.nix b/tests/test-sources/plugins/by-name/illuminate/default.nix
index b127030f..4dc99def 100644
--- a/tests/test-sources/plugins/by-name/illuminate/default.nix
+++ b/tests/test-sources/plugins/by-name/illuminate/default.nix
@@ -14,20 +14,20 @@
           "regex"
         ];
         delay = 100;
-        filetype_overrides.__empty = { };
+        filetype_overrides = { };
         filetypes_denylist = [
           "dirbuf"
           "dirvish"
           "fugitive"
         ];
-        filetypes_allowlist.__empty = { };
-        modes_denylist.__empty = { };
-        modes_allowlist.__empty = { };
-        providers_regex_syntax_denylist.__empty = { };
-        providers_regex_syntax_allowlist.__empty = { };
+        filetypes_allowlist = [ ];
+        modes_denylist = [ ];
+        modes_allowlist = [ ];
+        providers_regex_syntax_denylist = [ ];
+        providers_regex_syntax_allowlist = [ ];
         under_cursor = true;
         large_file_cutoff = 10000;
-        large_file_overrides.__raw = "nil";
+        large_file_overrides = null;
         min_count_to_highlight = 1;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/image/default.nix b/tests/test-sources/plugins/by-name/image/default.nix
index b622f0e1..34d5c2d5 100644
--- a/tests/test-sources/plugins/by-name/image/default.nix
+++ b/tests/test-sources/plugins/by-name/image/default.nix
@@ -26,8 +26,8 @@
           html.enabled = false;
           css.enabled = false;
         };
-        max_width.__raw = "nil";
-        max_height.__raw = "nil";
+        max_width = null;
+        max_height = null;
         max_width_window_percentage = 100;
         max_height_window_percentage = 50;
         scale_factor = 1.0;
diff --git a/tests/test-sources/plugins/by-name/inc-rename/default.nix b/tests/test-sources/plugins/by-name/inc-rename/default.nix
index 65d7e9d8..26ad2086 100644
--- a/tests/test-sources/plugins/by-name/inc-rename/default.nix
+++ b/tests/test-sources/plugins/by-name/inc-rename/default.nix
@@ -13,8 +13,8 @@
         preview_empty_name = false;
         show_message = true;
         save_in_cmdline_history = true;
-        input_buffer_type.__raw = "nil";
-        post_hook.__raw = "nil";
+        input_buffer_type = null;
+        post_hook = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/indent-blankline/default.nix b/tests/test-sources/plugins/by-name/indent-blankline/default.nix
index 58d25bb6..3eb35ca7 100644
--- a/tests/test-sources/plugins/by-name/indent-blankline/default.nix
+++ b/tests/test-sources/plugins/by-name/indent-blankline/default.nix
@@ -48,29 +48,29 @@
         };
         indent = {
           char = "▎";
-          tab_char.__raw = "nil";
-          highlight.__raw = "nil";
+          tab_char = null;
+          highlight = null;
           smart_indent_cap = true;
           priority = 1;
         };
         whitespace = {
-          highlight.__raw = "nil";
+          highlight = null;
           remove_blankline_trail = true;
         };
         scope = {
           enabled = true;
-          char.__raw = "nil";
+          char = null;
           show_start = true;
           show_end = true;
           show_exact_scope = false;
           injected_languages = true;
-          highlight.__raw = "nil";
+          highlight = null;
           priority = 1024;
           include = {
-            node_type.__empty = { };
+            node_type = { };
           };
           exclude = {
-            language.__empty = { };
+            language = [ ];
             node_type = {
               "*" = [
                 "source_file"
diff --git a/tests/test-sources/plugins/by-name/iron/default.nix b/tests/test-sources/plugins/by-name/iron/default.nix
index c74b4f40..ae017471 100644
--- a/tests/test-sources/plugins/by-name/iron/default.nix
+++ b/tests/test-sources/plugins/by-name/iron/default.nix
@@ -9,28 +9,28 @@
 
       settings = {
         scratch_repl = false;
-        repl_definition.__empty = { };
+        repl_definition = { };
         repl_open_cmd.__raw = ''
           require("iron.view").split.botright(40)
         '';
-        highlight.__empty = { };
+        highlight = { };
         highlight_last = "IronLastSent";
         ignore_blank_lines = true;
         should_map_plug = false;
         bufListed = false;
         keymaps = {
-          send_motion.__raw = "nil";
-          visual_send.__raw = "nil";
-          send_file.__raw = "nil";
-          send_paragraph.__raw = "nil";
-          send_until_cursor.__raw = "nil";
-          send_mark.__raw = "nil";
-          mark_motion.__raw = "nil";
-          remove_mark.__raw = "nil";
-          cr.__raw = "nil";
-          interrupt.__raw = "nil";
-          exit.__raw = "nil";
-          clear.__raw = "nil";
+          send_motion = null;
+          visual_send = null;
+          send_file = null;
+          send_paragraph = null;
+          send_until_cursor = null;
+          send_mark = null;
+          mark_motion = null;
+          remove_mark = null;
+          cr = null;
+          interrupt = null;
+          exit = null;
+          clear = null;
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/jdtls/default.nix b/tests/test-sources/plugins/by-name/jdtls/default.nix
index 672a4e31..b102f91d 100644
--- a/tests/test-sources/plugins/by-name/jdtls/default.nix
+++ b/tests/test-sources/plugins/by-name/jdtls/default.nix
@@ -17,11 +17,11 @@
         root_dir.__raw = "require('jdtls.setup').find_root({'.git', 'mvnw', 'gradlew'})";
 
         settings = {
-          java.__empty = { };
+          java = { };
         };
 
         init_options = {
-          bundles.__empty = { };
+          bundles = { };
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/jupytext/default.nix b/tests/test-sources/plugins/by-name/jupytext/default.nix
index eec9f834..697236f5 100644
--- a/tests/test-sources/plugins/by-name/jupytext/default.nix
+++ b/tests/test-sources/plugins/by-name/jupytext/default.nix
@@ -10,8 +10,8 @@
       settings = {
         style = "hydrogen";
         output_extension = "auto";
-        force_ft.__raw = "nil";
-        custom_language_formatting.__empty = { };
+        force_ft = null;
+        custom_language_formatting = { };
       };
     };
   };
@@ -23,7 +23,7 @@
       settings = {
         style = "light";
         output_extension = "auto";
-        force_ft.__raw = "nil";
+        force_ft = null;
         custom_language_formatting.python = {
           extension = "md";
           style = "markdown";
diff --git a/tests/test-sources/plugins/by-name/kulala/default.nix b/tests/test-sources/plugins/by-name/kulala/default.nix
index 2897c54f..72dc0034 100644
--- a/tests/test-sources/plugins/by-name/kulala/default.nix
+++ b/tests/test-sources/plugins/by-name/kulala/default.nix
@@ -53,7 +53,7 @@
               "--html"
               "-"
             ];
-            pathresolver.__empty = { };
+            pathresolver = [ ];
           };
         };
         show_icons = "on_request";
@@ -65,7 +65,7 @@
           };
           lualine = "🐼";
         };
-        additional_curl_options.__empty = { };
+        additional_curl_options = { };
         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.__empty = { };
+        certificates = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/lazygit/default.nix b/tests/test-sources/plugins/by-name/lazygit/default.nix
index ac778911..1eec8dbf 100644
--- a/tests/test-sources/plugins/by-name/lazygit/default.nix
+++ b/tests/test-sources/plugins/by-name/lazygit/default.nix
@@ -23,7 +23,7 @@
         floating_window_use_plenary = 0;
         use_neovim_remote = 1;
         use_custom_config_file_path = 0;
-        config_file_path.__empty = { };
+        config_file_path = [ ];
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/lean/default.nix b/tests/test-sources/plugins/by-name/lean/default.nix
index eca9b1ea..c04ca015 100644
--- a/tests/test-sources/plugins/by-name/lean/default.nix
+++ b/tests/test-sources/plugins/by-name/lean/default.nix
@@ -35,14 +35,14 @@
       lean = {
         enable = true;
         settings = {
-          lsp.__empty = { };
+          lsp = { };
           ft = {
             default = "lean";
-            nomodifiable.__raw = "nil";
+            nomodifiable = null;
           };
           abbreviations = {
             enable = true;
-            extra.__empty = { };
+            extra = { };
             leader = "\\";
           };
           mappings = false;
diff --git a/tests/test-sources/plugins/by-name/leap/default.nix b/tests/test-sources/plugins/by-name/leap/default.nix
index ec6af93f..31589162 100644
--- a/tests/test-sources/plugins/by-name/leap/default.nix
+++ b/tests/test-sources/plugins/by-name/leap/default.nix
@@ -18,6 +18,7 @@
   example = {
     plugins.leap = {
       enable = true;
+      addDefaultMappings = true;
       settings = {
         max_phase_one_targets = 10;
         highlight_unlabeled_phase_one_targets = false;
diff --git a/tests/test-sources/plugins/by-name/ledger/default.nix b/tests/test-sources/plugins/by-name/ledger/default.nix
index 8b5d6efa..720c1f77 100644
--- a/tests/test-sources/plugins/by-name/ledger/default.nix
+++ b/tests/test-sources/plugins/by-name/ledger/default.nix
@@ -8,11 +8,11 @@
       enable = true;
 
       settings = {
-        bin.__raw = "nil";
-        is_hledger.__raw = "nil";
+        bin = null;
+        is_hledger = null;
         extra_options = "";
-        accounts_cmd.__raw = "nil";
-        descriptions_cmd.__raw = "nil";
+        accounts_cmd = null;
+        descriptions_cmd = null;
         maxwidth = 0;
         fillstring = " ";
         detailed_first = 1;
@@ -28,8 +28,8 @@
         date_format = "%Y/%m/%d";
         main = "%";
         winpos = "B";
-        qf_register_format.__raw = "nil";
-        qf_reconcile_format.__raw = "nil";
+        qf_register_format = null;
+        qf_reconcile_format = null;
         use_location_list = 0;
         qf_vertical = 0;
         qf_size = 10;
diff --git a/tests/test-sources/plugins/by-name/leetcode/default.nix b/tests/test-sources/plugins/by-name/leetcode/default.nix
index c09bedbd..febf80bf 100644
--- a/tests/test-sources/plugins/by-name/leetcode/default.nix
+++ b/tests/test-sources/plugins/by-name/leetcode/default.nix
@@ -38,7 +38,7 @@
           non_standalone = false;
         };
         logging = true;
-        injector.__empty = { };
+        injector = { };
         cache = {
           update_interval = 60 * 60 * 24 * 7;
         };
@@ -67,7 +67,7 @@
           show_stats = true;
         };
         picker = {
-          provider.__raw = "nil";
+          provider = null;
         };
         hooks = {
           "enter" = { };
@@ -82,7 +82,7 @@
           focus_testcases = "H";
           focus_result = "L";
         };
-        theme.__empty = { };
+        theme = { };
         image_support = false;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/lensline/default.nix b/tests/test-sources/plugins/by-name/lensline/default.nix
index b2380e6b..0e594ffa 100644
--- a/tests/test-sources/plugins/by-name/lensline/default.nix
+++ b/tests/test-sources/plugins/by-name/lensline/default.nix
@@ -43,7 +43,8 @@
           }
         ];
         limits = {
-          exclude.__empty = { };
+          exclude = {
+          };
           exclude_gitignored = true;
           max_lines = 1000;
           max_lenses = 70;
diff --git a/tests/test-sources/plugins/by-name/lightline/default.nix b/tests/test-sources/plugins/by-name/lightline/default.nix
index 382f513e..6127fd44 100644
--- a/tests/test-sources/plugins/by-name/lightline/default.nix
+++ b/tests/test-sources/plugins/by-name/lightline/default.nix
@@ -9,7 +9,7 @@
 
       settings = {
         colorscheme = "default";
-        component_function.__raw = "nil";
+        component_function = { };
         component = {
           mode = ''%{lightline#mode()}'';
           absolutepath = "%F";
@@ -134,7 +134,7 @@
             ]
           ];
         };
-        inactive.__raw = "nil";
+        inactive = null;
         mode_map = {
           "n" = "N";
           "i" = "I";
diff --git a/tests/test-sources/plugins/by-name/lilypond-suite/default.nix b/tests/test-sources/plugins/by-name/lilypond-suite/default.nix
index 4863dcc8..aa8387af 100644
--- a/tests/test-sources/plugins/by-name/lilypond-suite/default.nix
+++ b/tests/test-sources/plugins/by-name/lilypond-suite/default.nix
@@ -27,11 +27,11 @@
             pitches_language = "default";
             hyphenation_language = "en_DEFAULT";
             output = "pdf";
-            backend.__raw = "nil";
+            backend = null;
             main_file = "main.ly";
             main_folder = "%:p:h";
-            include_dir.__raw = "nil";
-            pdf_viewer.__raw = "nil";
+            include_dir = null;
+            pdf_viewer = null;
             errors = {
               diagnostics = true;
               quickfix = "external";
@@ -49,13 +49,13 @@
             lilypond_syntax = "<F3>";
           };
           options = {
-            lilypond_book_flags.__raw = "nil";
+            lilypond_book_flags = null;
             clean_logs = false;
             main_file = "main.tex";
             main_folder = "%:p:h";
-            include_dir.__raw = "nil";
+            include_dir = null;
             lilypond_syntax_au = "BufEnter";
-            pdf_viewer.__raw = "nil";
+            pdf_viewer = null;
             errors = {
               diagnostics = true;
               quickfix = "external";
@@ -82,7 +82,7 @@
             main_file = "main.texi";
             main_folder = "%:p:h";
             lilypond_syntax_au = "BufEnter";
-            pdf_viewer.__raw = "nil";
+            pdf_viewer = null;
             errors = {
               diagnostics = true;
               quickfix = "external";
@@ -119,8 +119,8 @@
             border_style = "single";
             winhighlight = "Normal:Normal,FloatBorder:Normal,FloatTitle:Normal";
             midi_synth = "fluidsynth";
-            fluidsynth_flags.__raw = "nil";
-            timidity_flags.__raw = "nil";
+            fluidsynth_flags = null;
+            timidity_flags = null;
             audio_format = "mp3";
             mpv_flags = [
               "--msg-level=cplayer=no,ffmpeg=no,alsa=no"
diff --git a/tests/test-sources/plugins/by-name/lir/default.nix b/tests/test-sources/plugins/by-name/lir/default.nix
index 024794a4..13d2ddd1 100644
--- a/tests/test-sources/plugins/by-name/lir/default.nix
+++ b/tests/test-sources/plugins/by-name/lir/default.nix
@@ -9,14 +9,14 @@
 
       settings = {
         show_hidden_files = false;
-        ignore.__empty = { };
+        ignore = [ ];
         devicons = {
           enable = false;
           highlight_dirname = false;
         };
         hide_cursor = false;
         on_init.__raw = "function() end";
-        mappings.__empty = { };
+        mappings = { };
         float = {
           winblend = 0;
           curdir_window = {
@@ -24,7 +24,7 @@
             highlight_dirname = false;
           };
         };
-        get_filters.__raw = "nil";
+        get_filters = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/llm/default.nix b/tests/test-sources/plugins/by-name/llm/default.nix
index c00cf09e..b879c10a 100644
--- a/tests/test-sources/plugins/by-name/llm/default.nix
+++ b/tests/test-sources/plugins/by-name/llm/default.nix
@@ -19,10 +19,10 @@
       enable = true;
 
       settings = {
-        api_token.__raw = "nil";
+        api_token = null;
         model = "bigcode/starcoder2-15b";
         backend = "huggingface";
-        url.__raw = "nil";
+        url = null;
         tokens_to_clear = [ "<|endoftext|>" ];
         request_body = {
           parameters = {
@@ -42,11 +42,11 @@
         dismiss_keymap = "<S-Tab>";
         tls_skip_verify_insecure = false;
         lsp = {
-          host.__raw = "nil";
-          port.__raw = "nil";
-          cmd_env.__raw = "nil";
+          host = null;
+          port = null;
+          cmd_env = null;
         };
-        tokenizer.__raw = "nil";
+        tokenizer = null;
         context_window = 1024;
         enable_suggestions_on_startup = true;
         enable_suggestions_on_files = "*";
diff --git a/tests/test-sources/plugins/by-name/lsp-signature/default.nix b/tests/test-sources/plugins/by-name/lsp-signature/default.nix
index 194d00b6..ed2256a1 100644
--- a/tests/test-sources/plugins/by-name/lsp-signature/default.nix
+++ b/tests/test-sources/plugins/by-name/lsp-signature/default.nix
@@ -63,19 +63,19 @@
         hi_parameter = "LspSignatureActiveParameter";
         handler_opts.border = "rounded";
         always_trigger = false;
-        auto_close_after.__raw = "nil";
-        extra_trigger_chars.__empty = { };
+        auto_close_after = "nil";
+        extra_trigger_chars = [ ];
         zindex = 200;
         padding = "";
-        transparency.__raw = "nil";
+        transparency = "nil";
         shadow_blend = 36;
         shadow_guibg = "Green";
         time_interval = 200;
-        toggle_key.__raw = "nil";
+        toggle_key = null;
         toggle_flip_floatwin_setting = false;
-        select_signature_key.__raw = "nil";
-        move_cursor_key.__raw = "nil";
-        keymaps.__empty = { };
+        select_signature_key = null;
+        move_cursor_key = null;
+        keymaps = [ ];
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/lsp-status/default.nix b/tests/test-sources/plugins/by-name/lsp-status/default.nix
index 6cb40061..44af92e8 100644
--- a/tests/test-sources/plugins/by-name/lsp-status/default.nix
+++ b/tests/test-sources/plugins/by-name/lsp-status/default.nix
@@ -13,7 +13,7 @@
         enable = true;
 
         settings = {
-          kind_labels.__empty = { };
+          kind_labels = { };
           select_symbol = "";
           current_function = true;
           show_filename = true;
diff --git a/tests/test-sources/plugins/by-name/lspkind/default.nix b/tests/test-sources/plugins/by-name/lspkind/default.nix
index 2190b3ec..8f6c28a1 100644
--- a/tests/test-sources/plugins/by-name/lspkind/default.nix
+++ b/tests/test-sources/plugins/by-name/lspkind/default.nix
@@ -1,6 +1,9 @@
 {
   empty = {
-    plugins.lspkind.enable = true;
+    plugins.lspkind = {
+      enable = true;
+      cmp.enable = false;
+    };
   };
 
   example = {
@@ -20,7 +23,11 @@
       settings = {
         mode = "symbol_text";
         preset = "codicons";
-        symbol_map.__raw = "nil";
+        symbol_map = null;
+      };
+      cmp = {
+        enable = false;
+        after = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/lspsaga/default.nix b/tests/test-sources/plugins/by-name/lspsaga/default.nix
index 8f669a4f..c02d4d77 100644
--- a/tests/test-sources/plugins/by-name/lspsaga/default.nix
+++ b/tests/test-sources/plugins/by-name/lspsaga/default.nix
@@ -24,7 +24,7 @@
             "━"
             "┏"
           ];
-          kind.__empty = { };
+          kind = { };
           imp_sign = "󰳛 ";
         };
         hover = {
@@ -87,7 +87,7 @@
           default = "ref+imp";
           layout = "float";
           silent = false;
-          filter.__empty = { };
+          filter = { };
           keys = {
             shuttle = "[w";
             toggle_or_open = "o";
diff --git a/tests/test-sources/plugins/by-name/markdown-preview/default.nix b/tests/test-sources/plugins/by-name/markdown-preview/default.nix
index dbac2c6f..96c019b4 100644
--- a/tests/test-sources/plugins/by-name/markdown-preview/default.nix
+++ b/tests/test-sources/plugins/by-name/markdown-preview/default.nix
@@ -18,18 +18,18 @@
         echo_preview_url = 1;
         browser_func = "";
         preview_options = {
-          mkit.__empty = { };
-          katex.__empty = { };
-          uml.__empty = { };
-          maid.__empty = { };
+          mkit = [ ];
+          katex = [ ];
+          uml = [ ];
+          maid = [ ];
           disable_sync_scroll = 0;
           sync_scroll_type = "middle";
           hide_yaml_meta = 1;
-          sequence_diagrams.__empty = { };
-          flowchart_diagrams.__empty = { };
+          sequence_diagrams = [ ];
+          flowchart_diagrams = [ ];
           content_editable = 0;
           disable_filename = 0;
-          toc.__empty = { };
+          toc = [ ];
         };
         markdown_css = "/Users/username/markdown.css";
         highlight_css.__raw = "vim.fn.expand('~/highlight.css')";
diff --git a/tests/test-sources/plugins/by-name/markview/default.nix b/tests/test-sources/plugins/by-name/markview/default.nix
index ff074dd3..91a31d66 100644
--- a/tests/test-sources/plugins/by-name/markview/default.nix
+++ b/tests/test-sources/plugins/by-name/markview/default.nix
@@ -10,18 +10,18 @@
       settings = {
         preview = {
           enable = true;
-          buf_ignore.__empty = { };
+          buf_ignore = [ ];
           icon_provider = "internal";
-          filetypes.__empty = { };
-          hybrid_modes.__empty = { };
-          ignore_previews.__empty = { };
+          filetypes = [ ];
+          hybrid_modes = [ ];
+          ignore_previews = [ ];
           max_buf_lines = 1000;
-          modes.__empty = { };
+          modes = [ ];
           render_distance = [
             200
             200
           ];
-          splitview_winopts.__empty = { };
+          splitview_winopts = { };
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/minuet/default.nix b/tests/test-sources/plugins/by-name/minuet/default.nix
index 6d468af5..7d42ef51 100644
--- a/tests/test-sources/plugins/by-name/minuet/default.nix
+++ b/tests/test-sources/plugins/by-name/minuet/default.nix
@@ -15,22 +15,22 @@
           enable_auto_complete = true;
         };
         lsp = {
-          enabled_ft.__empty = { };
-          disabled_ft.__empty = { };
-          enabled_auto_trigger_ft.__empty = { };
-          disabled_auto_trigger_ft.__empty = { };
+          enabled_ft = [ ];
+          disabled_ft = [ ];
+          enabled_auto_trigger_ft = [ ];
+          disabled_auto_trigger_ft = [ ];
           warn_on_blink_or_cmp = true;
         };
         virtualtext = {
-          auto_trigger_ft.__empty = { };
-          auto_trigger_ignore_ft.__empty = { };
+          auto_trigger_ft = [ ];
+          auto_trigger_ignore_ft = [ ];
           keymap = {
-            accept.__raw = "nil";
-            accept_line.__raw = "nil";
-            accept_n_lines.__raw = "nil";
-            next.__raw = "nil";
-            prev.__raw = "nil";
-            dismiss.__raw = "nil";
+            accept = null;
+            accept_line = null;
+            accept_n_lines = null;
+            next = null;
+            prev = null;
+            dismiss = null;
           };
           show_on_completion_menu = false;
         };
@@ -44,8 +44,8 @@
         add_single_line_entry = true;
         n_completions = 3;
         after_cursor_filter_length = 15;
-        proxy.__raw = "nil";
-        provider_options.__empty = { };
+        proxy = null;
+        provider_options = { };
         default_system = {
           template = "...";
           prompt = "...";
@@ -66,7 +66,7 @@
         default_chat_input = [ "..." ];
         default_few_shots_prefix_first = [ "..." ];
         default_chat_input_prefix_first = [ "..." ];
-        presets.__empty = { };
+        presets = [ ];
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/mkdnflow/default.nix b/tests/test-sources/plugins/by-name/mkdnflow/default.nix
index d2b76039..ec51a6bf 100644
--- a/tests/test-sources/plugins/by-name/mkdnflow/default.nix
+++ b/tests/test-sources/plugins/by-name/mkdnflow/default.nix
@@ -36,7 +36,7 @@
         };
         wrap = false;
         bib = {
-          default_path.__raw = "nil";
+          default_path = null;
           find_in_root = true;
         };
         silent = false;
@@ -44,7 +44,7 @@
           style = "markdown";
           conceal = false;
           context = 0;
-          implicit_extension.__raw = "nil";
+          implicit_extension = null;
           transform_explicit = false;
           transform_implicit = ''
             function(text)
diff --git a/tests/test-sources/plugins/by-name/modicator/default.nix b/tests/test-sources/plugins/by-name/modicator/default.nix
index 71b3a11f..d6db8377 100644
--- a/tests/test-sources/plugins/by-name/modicator/default.nix
+++ b/tests/test-sources/plugins/by-name/modicator/default.nix
@@ -19,7 +19,7 @@
         integration = {
           lualine = {
             enabled = true;
-            mode_section.__raw = "nil";
+            mode_section = null;
             highlight = "bg";
           };
         };
diff --git a/tests/test-sources/plugins/by-name/molten/default.nix b/tests/test-sources/plugins/by-name/molten/default.nix
index d446801b..bf460230 100644
--- a/tests/test-sources/plugins/by-name/molten/default.nix
+++ b/tests/test-sources/plugins/by-name/molten/default.nix
@@ -13,11 +13,11 @@
         auto_open_html_in_browser = false;
         auto_open_output = true;
         cover_empty_lines = false;
-        cover_lines_starting_with.__empty = { };
+        cover_lines_starting_with = [ ];
         copy_output = false;
         enter_output_behavior = "open_then_enter";
         image_provider = "none";
-        open_cmd.__raw = "nil";
+        open_cmd = null;
         output_crop_border = true;
         output_show_more = false;
         output_virt_lines = false;
diff --git a/tests/test-sources/plugins/by-name/multicursors/default.nix b/tests/test-sources/plugins/by-name/multicursors/default.nix
index 764446c3..5131ecc9 100644
--- a/tests/test-sources/plugins/by-name/multicursors/default.nix
+++ b/tests/test-sources/plugins/by-name/multicursors/default.nix
@@ -33,7 +33,7 @@
           insert = true;
           extend = true;
           config = {
-            column_count.__raw = "nil";
+            column_count = null;
             max_hint_length = 25;
           };
         };
@@ -82,15 +82,15 @@
             };
           };
         };
-        insert_keys.__raw = "nil";
-        extend_keys.__raw = "nil";
+        insert_keys = null;
+        extend_keys = null;
         hint_config = {
           type = "window";
           position = "bottom";
           offset = 0;
           border = "none";
           show_name = true;
-          funcs.__raw = "nil";
+          funcs = null;
         };
         generate_hints = {
           normal = false;
diff --git a/tests/test-sources/plugins/by-name/neo-tree/default.nix b/tests/test-sources/plugins/by-name/neo-tree/default.nix
index 170e891c..dcf8cba6 100644
--- a/tests/test-sources/plugins/by-name/neo-tree/default.nix
+++ b/tests/test-sources/plugins/by-name/neo-tree/default.nix
@@ -65,7 +65,7 @@
         popup_border_style = "NC";
         resize_timer_interval = 500;
         sort_case_insensitive = false;
-        sort_function.__raw = "nil";
+        sort_function = "nil";
         use_popups_for_input = true;
         use_default_mappings = true;
         source_selector = {
@@ -93,14 +93,14 @@
           content_layout = "start";
           tabs_layout = "equal";
           truncation_character = "…";
-          tabs_min_width.__raw = "nil";
-          tabs_max_width.__raw = "nil";
+          tabs_min_width = null;
+          tabs_max_width = null;
           padding = 0;
           separator = {
             left = "▏";
             right = "▕";
           };
-          separator_active.__raw = "nil";
+          separator_active = null;
           show_separator_on_edge = false;
           highlight_tab = "NeoTreeTabInactive";
           highlight_tab_active = "NeoTreeTabActive";
@@ -154,7 +154,7 @@
             indent_marker = "│";
             last_indent_marker = "└";
             highlight = "NeoTreeIndentMarker";
-            with_expanders.__raw = "nil";
+            with_expanders = null;
             expander_collapsed = "";
             expander_expanded = "";
             expander_highlight = "NeoTreeExpander";
@@ -276,7 +276,7 @@
             "bufnr"
           ];
         };
-        nesting_rules.__empty = { };
+        nesting_rules = { };
         window = {
           position = "left";
           width = 40;
@@ -380,10 +380,10 @@
               ".DS_Store"
               "thumbs.db"
             ];
-            hide_by_pattern.__empty = { };
-            always_show.__empty = { };
-            never_show.__empty = { };
-            never_show_by_pattern.__empty = { };
+            hide_by_pattern = [ ];
+            always_show = [ ];
+            never_show = [ ];
+            never_show_by_pattern = [ ];
           };
           find_by_full_path_words = false;
           find_command = "fd";
diff --git a/tests/test-sources/plugins/by-name/neoclip/default.nix b/tests/test-sources/plugins/by-name/neoclip/default.nix
index 89bd7286..feb28e40 100644
--- a/tests/test-sources/plugins/by-name/neoclip/default.nix
+++ b/tests/test-sources/plugins/by-name/neoclip/default.nix
@@ -19,7 +19,7 @@
       enable = true;
 
       settings = {
-        filter.__raw = "nil";
+        filter = null;
         preview = true;
         default_register = "\"";
         content_spec_column = false;
@@ -30,20 +30,20 @@
               select = "<cr>";
               paste = "<c-l>";
               paste_behind = "<c-h>";
-              custom.__empty = { };
+              custom = { };
             };
             n = {
               select = "<cr>";
               paste = "p";
               paste_behind = "P";
-              custom.__empty = { };
+              custom = { };
             };
           };
           fzf = {
             select = "default";
             paste = "ctrl-l";
             paste_behind = "ctrl-h";
-            custom.__empty = { };
+            custom = { };
           };
         };
       };
@@ -60,9 +60,9 @@
         length_limit = 1048576;
         continuous_sync = false;
         db_path.__raw = "vim.fn.stdpath('data') .. '/databases/neoclip.sqlite3'";
-        filter.__raw = "nil";
+        filter = null;
         preview = true;
-        prompt.__raw = "nil";
+        prompt = null;
         default_register = "\"";
         default_register_macros = "q";
         enable_macro_history = true;
@@ -93,7 +93,7 @@
                 replay = "<c-q>";
                 delete = "<c-d>";
                 edit = "<c-e>";
-                custom.__empty = { };
+                custom = { };
               };
               n = {
                 select = "<cr>";
@@ -102,14 +102,14 @@
                 replay = "q";
                 delete = "d";
                 edit = "e";
-                custom.__empty = { };
+                custom = { };
               };
             };
             fzf = {
               select = "default";
               paste = "ctrl-p";
               paste_behind = "ctrl-k";
-              custom.__empty = { };
+              custom = { };
             };
           };
         };
diff --git a/tests/test-sources/plugins/by-name/neocord/default.nix b/tests/test-sources/plugins/by-name/neocord/default.nix
index 62474303..00c9c2e0 100644
--- a/tests/test-sources/plugins/by-name/neocord/default.nix
+++ b/tests/test-sources/plugins/by-name/neocord/default.nix
@@ -14,13 +14,13 @@
       settings = {
         # General options.
         logo = "auto";
-        logo_tooltip.__raw = "nil";
+        logo_tooltip = null;
         main_image = "language";
         client_id = "1157438221865717891";
-        log_level.__raw = "nil";
+        log_level = null;
         debounce_timeout = 10;
-        blacklist.__empty = { };
-        file_assets.__raw = "nil";
+        blacklist = [ ];
+        file_assets = null;
         show_time = true;
         global_timer = false;
 
@@ -50,11 +50,11 @@
         logo_tooltip = "Nixvim";
         main_image = "language";
         client_id = "1157438221865717891";
-        log_level.__raw = "nil";
+        log_level = null;
         debounce_timeout = 10;
         enable_line_number = false;
-        blacklist.__empty = { };
-        file_assets.__raw = "nil";
+        blacklist = [ ];
+        file_assets = null;
         show_time = true;
         global_timer = false;
 
diff --git a/tests/test-sources/plugins/by-name/neogit/default.nix b/tests/test-sources/plugins/by-name/neogit/default.nix
index 4aadf40f..8a6b8624 100644
--- a/tests/test-sources/plugins/by-name/neogit/default.nix
+++ b/tests/test-sources/plugins/by-name/neogit/default.nix
@@ -19,8 +19,8 @@
         disable_signs = false;
         prompt_force_push = true;
         graph_style = "ascii";
-        commit_date_format.__raw = "nil";
-        log_date_format.__raw = "nil";
+        commit_date_format = null;
+        log_date_format = null;
         process_spinner = false;
         filewatcher.enabled = true;
         telescope_sorter.__raw = ''
@@ -50,7 +50,7 @@
             tree = "";
           };
         };
-        highlight.__empty = { };
+        highlight = { };
         disable_insert_on_commit = "auto";
         use_per_project_settings = true;
         remember_settings = true;
@@ -132,11 +132,11 @@
           ];
         };
         integrations = {
-          telescope.__raw = "nil";
-          diffview.__raw = "nil";
-          fzf_lua.__raw = "nil";
-          mini_pick.__raw = "nil";
-          snacks.__raw = "nil";
+          telescope = null;
+          diffview = null;
+          fzf_lua = null;
+          mini_pick = null;
+          snacks = null;
         };
         sections = {
           sequencer = {
@@ -188,7 +188,7 @@
             hidden = false;
           };
         };
-        ignored_settings.__empty = { };
+        ignored_settings = [ ];
         mappings = {
           commit_editor = {
             q = "Close";
diff --git a/tests/test-sources/plugins/by-name/neorg/default.nix b/tests/test-sources/plugins/by-name/neorg/default.nix
index 30995577..5238f0bb 100644
--- a/tests/test-sources/plugins/by-name/neorg/default.nix
+++ b/tests/test-sources/plugins/by-name/neorg/default.nix
@@ -15,9 +15,9 @@
         enable = true;
 
         settings = {
-          hook.__raw = "nil";
+          hook = null;
           lazy_loading = false;
-          load.__empty = { };
+          load = { };
           logger = {
             plugin = "neorg";
             use_console = true;
diff --git a/tests/test-sources/plugins/by-name/neoscroll/default.nix b/tests/test-sources/plugins/by-name/neoscroll/default.nix
index 6acd46f2..f5ac3e4b 100644
--- a/tests/test-sources/plugins/by-name/neoscroll/default.nix
+++ b/tests/test-sources/plugins/by-name/neoscroll/default.nix
@@ -60,9 +60,9 @@
         step_eof = true;
         respect_scrolloff = false;
         cursor_scrolls_alone = true;
-        easing_function.__raw = "nil";
-        pre_hook.__raw = "nil";
-        post_hook.__raw = "nil";
+        easing_function = null;
+        pre_hook = null;
+        post_hook = null;
         performance_mode = false;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/neotest/dart.nix b/tests/test-sources/plugins/by-name/neotest/dart.nix
index 9f2eede2..707d8c91 100644
--- a/tests/test-sources/plugins/by-name/neotest/dart.nix
+++ b/tests/test-sources/plugins/by-name/neotest/dart.nix
@@ -11,7 +11,7 @@
           settings = {
             command = "flutter";
             use_lsp = true;
-            custom_test_method_names.__empty = { };
+            custom_test_method_names = [ ];
           };
         };
       };
diff --git a/tests/test-sources/plugins/by-name/neotest/default.nix b/tests/test-sources/plugins/by-name/neotest/default.nix
index 38144958..2ec9ade9 100644
--- a/tests/test-sources/plugins/by-name/neotest/default.nix
+++ b/tests/test-sources/plugins/by-name/neotest/default.nix
@@ -53,14 +53,14 @@
         discovery = {
           enabled = true;
           concurrent = 0;
-          filter_dir.__raw = "nil";
+          filter_dir = null;
         };
         running = {
           concurrent = true;
         };
         default_strategy = "integrated";
         log_level = "warn";
-        consumers.__empty = { };
+        consumers = { };
         icons = {
           child_indent = "│";
           child_prefix = "├";
@@ -110,7 +110,7 @@
           border = "rounded";
           max_height = 0.6;
           max_width = 0.6;
-          options.__empty = { };
+          options = { };
         };
         strategies = {
           integrated = {
@@ -170,8 +170,8 @@
         };
         watch = {
           enabled = true;
-          symbol_queries.__raw = "nil";
-          filter_path.__raw = "nil";
+          symbol_queries = null;
+          filter_path = null;
         };
         diagnostic = {
           enabled = true;
diff --git a/tests/test-sources/plugins/by-name/neotest/foundry.nix b/tests/test-sources/plugins/by-name/neotest/foundry.nix
index a15216d3..f8993117 100644
--- a/tests/test-sources/plugins/by-name/neotest/foundry.nix
+++ b/tests/test-sources/plugins/by-name/neotest/foundry.nix
@@ -10,8 +10,8 @@
 
           settings = {
             foundryCommand = "forge test";
-            foundryConfig.__raw = "nil";
-            env.__empty = { };
+            foundryConfig = null;
+            env = { };
             cwd.__raw = ''
               function ()
                 return lib.files.match_root_pattern("foundry.toml")
diff --git a/tests/test-sources/plugins/by-name/neotest/gtest.nix b/tests/test-sources/plugins/by-name/neotest/gtest.nix
index 2cdf9ea5..f6bcd602 100644
--- a/tests/test-sources/plugins/by-name/neotest/gtest.nix
+++ b/tests/test-sources/plugins/by-name/neotest/gtest.nix
@@ -33,7 +33,7 @@
             history_size = 3;
             parsing_throttle_ms = 10;
             mappings = {
-              configure.__raw = "nil";
+              configure = null;
             };
             summary_view = {
               header_length = 80;
@@ -45,7 +45,7 @@
                 bold = "\27[1m";
               };
             };
-            extra_args.__empty = { };
+            extra_args = [ ];
             filter_dir.__raw = ''
               function(name, rel_path, root)
               end
diff --git a/tests/test-sources/plugins/by-name/neotest/phpunit.nix b/tests/test-sources/plugins/by-name/neotest/phpunit.nix
index 6c99f256..a7ef6db8 100644
--- a/tests/test-sources/plugins/by-name/neotest/phpunit.nix
+++ b/tests/test-sources/plugins/by-name/neotest/phpunit.nix
@@ -26,7 +26,7 @@
             env = {
               XDEBUG_CONFIG = "idekey=neotest";
             };
-            dap.__raw = "nil";
+            dap = null;
           };
         };
       };
diff --git a/tests/test-sources/plugins/by-name/no-neck-pain/default.nix b/tests/test-sources/plugins/by-name/no-neck-pain/default.nix
index 5303d36e..66a973f8 100644
--- a/tests/test-sources/plugins/by-name/no-neck-pain/default.nix
+++ b/tests/test-sources/plugins/by-name/no-neck-pain/default.nix
@@ -28,7 +28,7 @@
         buffers = {
           setNames = false;
           colors = {
-            background.__raw = "nil";
+            background = null;
             blend = 0;
           };
           left = {
diff --git a/tests/test-sources/plugins/by-name/noice/default.nix b/tests/test-sources/plugins/by-name/noice/default.nix
index b1d2e1d7..4da55c68 100644
--- a/tests/test-sources/plugins/by-name/noice/default.nix
+++ b/tests/test-sources/plugins/by-name/noice/default.nix
@@ -11,7 +11,7 @@
         cmdline = {
           enabled = true;
           view = "cmdline_popup";
-          opts.__empty = { };
+          opts = { };
           format = {
             cmdline = {
               pattern = "^:";
@@ -44,7 +44,7 @@
               pattern = "^:%s*he?l?p?%s+";
               icon = "";
             };
-            input.__empty = { };
+            input = { };
           };
         };
         messages = {
@@ -58,7 +58,7 @@
         popupmenu = {
           enabled = true;
           backend = "nui";
-          kind_icons.__empty = { };
+          kind_icons = { };
         };
         redirect = {
           view = "popup";
@@ -147,8 +147,8 @@
           };
           hover = {
             enabled = true;
-            view.__raw = "nil";
-            opts.__empty = { };
+            view = null;
+            opts = { };
           };
           signature = {
             enabled = true;
@@ -158,13 +158,13 @@
               luasnip = true;
               throttle = 50;
             };
-            view.__raw = "nil";
-            opts.__empty = { };
+            view = null;
+            opts = { };
           };
           message = {
             enabled = true;
             view = "notify";
-            opts.__empty = { };
+            opts = { };
           };
           documentation = {
             view = "hover";
@@ -213,10 +213,10 @@
           lsp_doc_border = false;
         };
         throttle = 1000 / 30;
-        views.__empty = { };
-        routes.__empty = { };
-        status.__empty = { };
-        format.__empty = { };
+        views = { };
+        routes = [ ];
+        status = { };
+        format = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/none-ls/default.nix b/tests/test-sources/plugins/by-name/none-ls/default.nix
index d9dfd36c..c71f5549 100644
--- a/tests/test-sources/plugins/by-name/none-ls/default.nix
+++ b/tests/test-sources/plugins/by-name/none-ls/default.nix
@@ -21,27 +21,24 @@
       enable = true;
 
       settings = {
-        border.__raw = "nil";
+        border = null;
         cmd = [ "nvim" ];
         debounce = 250;
         debug = false;
         default_timeout = 5000;
-        diagnostic_config.__empty = { };
+        diagnostic_config = { };
         diagnostics_format = "#{m}";
         fallback_severity.__raw = "vim.diagnostic.severity.ERROR";
         log_level = "warn";
         notify_format = "[null-ls] %s";
-        on_attach.__raw = "nil";
-        on_init.__raw = "nil";
-        on_exit.__raw = "nil";
+        on_attach = null;
+        on_init = null;
+        on_exit = null;
         root_dir = "require('null-ls.utils').root_pattern('.null-ls-root', 'Makefile', '.git')";
-        root_dir_async.__raw = "nil";
-        should_attach.__raw = "nil";
-
-        # FIXME: This option can't take raw lua
+        root_dir_async = null;
+        should_attach = null;
         sources = null;
-
-        temp_dir.__raw = "nil";
+        temp_dir = null;
         update_in_insert = false;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/notebook-navigator/default.nix b/tests/test-sources/plugins/by-name/notebook-navigator/default.nix
index 77f5b624..2d6adefc 100644
--- a/tests/test-sources/plugins/by-name/notebook-navigator/default.nix
+++ b/tests/test-sources/plugins/by-name/notebook-navigator/default.nix
@@ -13,8 +13,8 @@
         enable = true;
 
         settings = {
-          cell_markers.__empty = { };
-          activate_hydra_keys.__raw = "nil";
+          cell_markers = { };
+          activate_hydra_keys = null;
           show_hydra_hint = true;
           hydra_keys = {
             comment = "c";
diff --git a/tests/test-sources/plugins/by-name/notify/default.nix b/tests/test-sources/plugins/by-name/notify/default.nix
index 73178f5b..cf4bf3f2 100644
--- a/tests/test-sources/plugins/by-name/notify/default.nix
+++ b/tests/test-sources/plugins/by-name/notify/default.nix
@@ -10,8 +10,8 @@
       settings = {
         level = "info";
         timeout = 5000;
-        max_width.__raw = "nil";
-        max_height.__raw = "nil";
+        max_width = null;
+        max_height = null;
         stages = "fade_in_slide_out";
         background_colour = "NotifyBackground";
         icons = {
@@ -21,8 +21,8 @@
           debug = "";
           trace = "✎";
         };
-        on_open.__raw = "nil";
-        on_close.__raw = "nil";
+        on_open = null;
+        on_close = null;
         render = "default";
         minimum_width = 50;
         fps = 30;
diff --git a/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix b/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix
index f9e35310..429cbdc0 100644
--- a/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix
+++ b/tests/test-sources/plugins/by-name/nvim-lightbulb/default.nix
@@ -12,7 +12,7 @@
         hide_in_unfocused_buffer = true;
         link_highlights = true;
         validate_config = "auto";
-        action_kinds.__raw = "nil";
+        action_kinds = null;
         sign = {
           enabled = true;
           text = "💡";
@@ -29,7 +29,7 @@
           enabled = false;
           text = "💡";
           hl = "LightBulbFloatWin";
-          win_opts.__empty = { };
+          win_opts = { };
         };
         status_text = {
           enabled = false;
@@ -54,8 +54,8 @@
           ];
         };
         ignore = {
-          clients.__empty = { };
-          ft.__empty = { };
+          clients = [ ];
+          ft = [ ];
           actions_without_kind = false;
         };
       };
diff --git a/tests/test-sources/plugins/by-name/nvim-snippets/default.nix b/tests/test-sources/plugins/by-name/nvim-snippets/default.nix
index b6bb58ca..a468d9bd 100644
--- a/tests/test-sources/plugins/by-name/nvim-snippets/default.nix
+++ b/tests/test-sources/plugins/by-name/nvim-snippets/default.nix
@@ -16,8 +16,8 @@
           create_autocmd = false;
           create_cmp_source = true;
           friendly_snippets = false;
-          ignored_filetypes.__raw = "nil";
-          extended_filetypes.__empty = { };
+          ignored_filetypes = null;
+          extended_filetypes = { };
           global_snippets = [ "all" ];
           search_paths = [ { __raw = "vim.fn.stdpath('config') .. '/snippets'"; } ];
         };
diff --git a/tests/test-sources/plugins/by-name/nvim-tree/default.nix b/tests/test-sources/plugins/by-name/nvim-tree/default.nix
index cc0b7936..3f55233e 100644
--- a/tests/test-sources/plugins/by-name/nvim-tree/default.nix
+++ b/tests/test-sources/plugins/by-name/nvim-tree/default.nix
@@ -19,7 +19,7 @@
         sort_by = "name";
         hijack_unnamed_buffer_when_opening = false;
         hijack_cursor = false;
-        root_dirs.__empty = { };
+        root_dirs = [ ];
         prefer_startup_root = false;
         sync_root_with_cwd = false;
         reload_on_bufenter = false;
@@ -31,11 +31,11 @@
         update_focused_file = {
           enable = false;
           update_root = false;
-          ignore_list.__empty = { };
+          ignore_list = [ ];
         };
         system_open = {
           cmd = "";
-          args.__empty = { };
+          args = [ ];
         };
         diagnostics = {
           enable = false;
@@ -68,7 +68,7 @@
         filesystem_watchers = {
           enable = true;
           debounce_delay = 50;
-          ignore_dirs.__empty = { };
+          ignore_dirs = [ ];
         };
         on_attach = "default";
         select_prompts = false;
@@ -168,8 +168,8 @@
           dotfiles = false;
           git_clean = false;
           no_buffer = false;
-          custom.__empty = { };
-          exclude.__empty = { };
+          custom = [ ];
+          exclude = [ ];
         };
         actions = {
           change_dir = {
@@ -179,7 +179,7 @@
           };
           expand_all = {
             max_folder_discovery = 300;
-            exclude.__empty = { };
+            exclude = [ ];
           };
           file_popup = {
             open_win_config = {
@@ -227,7 +227,7 @@
           sync = {
             open = false;
             close = false;
-            ignore.__empty = { };
+            ignore = [ ];
           };
         };
         notify = {
diff --git a/tests/test-sources/plugins/by-name/nvim-ufo/default.nix b/tests/test-sources/plugins/by-name/nvim-ufo/default.nix
index 45e0c878..87db4214 100644
--- a/tests/test-sources/plugins/by-name/nvim-ufo/default.nix
+++ b/tests/test-sources/plugins/by-name/nvim-ufo/default.nix
@@ -60,11 +60,11 @@
       enable = true;
       settings = {
         open_fold_hl_timeout = 400;
-        provider_selector.__raw = "nil";
+        provider_selector = null;
         close_fold_kinds_for_ft = {
-          default.__empty = { };
+          default = { };
         };
-        fold_virt_text_handler.__raw = "nil";
+        fold_virt_text_handler = null;
         enable_get_fold_virt_text = false;
         preview = {
           win_config = {
diff --git a/tests/test-sources/plugins/by-name/obsidian/default.nix b/tests/test-sources/plugins/by-name/obsidian/default.nix
index 00e88460..7eb341c2 100644
--- a/tests/test-sources/plugins/by-name/obsidian/default.nix
+++ b/tests/test-sources/plugins/by-name/obsidian/default.nix
@@ -29,7 +29,7 @@
           # TODO 2025-07-25 explicitly disable legacy commands to suppress deprecation warning
           legacy_commands = false;
 
-          dir.__raw = "nil";
+          dir = null;
           workspaces = [
             {
               name = "work";
@@ -77,7 +77,7 @@
         enable = false;
 
         settings = {
-          dir.__raw = "nil";
+          dir = null;
           workspaces = [
             {
               name = "work";
@@ -94,7 +94,7 @@
             # subdir = "templates";
             date_format = "%Y-%m-%d";
             time_format = "%H:%M";
-            substitutions.__empty = { };
+            substitutions = { };
           };
           new_notes_location = "current_dir";
           note_id_func = ''
diff --git a/tests/test-sources/plugins/by-name/octo/default.nix b/tests/test-sources/plugins/by-name/octo/default.nix
index 52ee7af2..dec99d5d 100644
--- a/tests/test-sources/plugins/by-name/octo/default.nix
+++ b/tests/test-sources/plugins/by-name/octo/default.nix
@@ -78,8 +78,8 @@
           "origin"
         ];
 
-        gh_env.__empty = { };
-        ssh_aliases.__empty = { };
+        gh_env = { };
+        ssh_aliases = { };
 
         picker_config = {
           use_emojis = false;
diff --git a/tests/test-sources/plugins/by-name/oil/default.nix b/tests/test-sources/plugins/by-name/oil/default.nix
index 181f372c..fceb8412 100644
--- a/tests/test-sources/plugins/by-name/oil/default.nix
+++ b/tests/test-sources/plugins/by-name/oil/default.nix
@@ -42,7 +42,7 @@
           {
             __unkeyed = "type";
             highlight = "Foo";
-            icons.__empty = { };
+            icons = { };
           }
 
           {
@@ -167,13 +167,13 @@
             40
             0.4
           ];
-          width.__raw = "nil";
+          width = null;
           max_height = 0.9;
           min_height = [
             5
             0.1
           ];
-          height.__raw = "nil";
+          height = null;
           border = "rounded";
           win_options = {
             winblend = 0;
@@ -186,13 +186,13 @@
             40
             0.4
           ];
-          width.__raw = "nil";
+          width = null;
           max_height = 0.9;
           min_height = [
             5
             0.1
           ];
-          height.__raw = "nil";
+          height = null;
           border = "rounded";
           minimized_border = "none";
           win_options = {
diff --git a/tests/test-sources/plugins/by-name/opencode/default.nix b/tests/test-sources/plugins/by-name/opencode/default.nix
index 1a2c5d34..24df0800 100644
--- a/tests/test-sources/plugins/by-name/opencode/default.nix
+++ b/tests/test-sources/plugins/by-name/opencode/default.nix
@@ -7,7 +7,7 @@
     plugins.opencode = {
       enable = true;
       settings = {
-        port.__raw = "nil";
+        port = null;
         auto_reload = true;
         auto_register_cmp_sources = [
           "opencode"
diff --git a/tests/test-sources/plugins/by-name/overseer/default.nix b/tests/test-sources/plugins/by-name/overseer/default.nix
index 5defa106..ef9679d8 100644
--- a/tests/test-sources/plugins/by-name/overseer/default.nix
+++ b/tests/test-sources/plugins/by-name/overseer/default.nix
@@ -20,13 +20,13 @@
             40
             0.1
           ];
-          width.__raw = "nil";
+          width = null;
           max_height = [
             20
             0.1
           ];
           min_height = 8;
-          height.__raw = "nil";
+          height = null;
           separator = "────────────────────────────────────────";
           direction = "bottom";
           bindings = {
@@ -53,16 +53,16 @@
             "q" = "Close";
           };
         };
-        actions.__empty = { };
+        actions = { };
         form = {
           border = "rounded";
           zindex = 40;
           min_width = 80;
           max_width = 0.9;
-          width.__raw = "nil";
+          width = null;
           min_height = 10;
           max_height = 0.9;
-          height.__raw = "nil";
+          height = null;
           win_opts = {
             winblend = 0;
           };
@@ -105,10 +105,10 @@
           zindex = 40;
           min_width = 20;
           max_width = 0.5;
-          width.__raw = "nil";
+          width = null;
           min_height = 6;
           max_height = 0.9;
-          height.__raw = "nil";
+          height = null;
           win_opts = {
             winblend = 0;
           };
@@ -122,7 +122,7 @@
         };
         help_win = {
           border = "rounded";
-          win_opts.__empty = { };
+          win_opts = { };
         };
         component_aliases = {
           default = [
@@ -152,7 +152,7 @@
           };
           autostart_on_load = true;
         };
-        preload_components.__empty = { };
+        preload_components = [ ];
         default_template_prompt = "allow";
         template_timeout = 3000;
         template_cache_threshold = 100;
diff --git a/tests/test-sources/plugins/by-name/papis/default.nix b/tests/test-sources/plugins/by-name/papis/default.nix
index 19abecf6..78bf305b 100644
--- a/tests/test-sources/plugins/by-name/papis/default.nix
+++ b/tests/test-sources/plugins/by-name/papis/default.nix
@@ -315,7 +315,7 @@
           key_name_conversions = {
             time_added = "time-added";
           };
-          tag_format.__raw = "nil";
+          tag_format = null;
           required_keys = [
             "papis_id"
             "ref"
diff --git a/tests/test-sources/plugins/by-name/parrot/default.nix b/tests/test-sources/plugins/by-name/parrot/default.nix
index 7a541651..0790172e 100644
--- a/tests/test-sources/plugins/by-name/parrot/default.nix
+++ b/tests/test-sources/plugins/by-name/parrot/default.nix
@@ -41,7 +41,7 @@
           };
         };
         cmd_prefix = "Prt";
-        curl_params.__empty = { };
+        curl_params = [ ];
         state_dir.__raw = "vim.fn.stdpath('data'):gsub('/$', '') .. '/parrot/persisted'";
         chat_dir.__raw = "vim.fn.stdpath('data'):gsub('/$', '') .. '/parrot/chats'";
         chat_user_prefix = "🗨:";
diff --git a/tests/test-sources/plugins/by-name/pckr/default.nix b/tests/test-sources/plugins/by-name/pckr/default.nix
index 53ac1248..ba21351e 100644
--- a/tests/test-sources/plugins/by-name/pckr/default.nix
+++ b/tests/test-sources/plugins/by-name/pckr/default.nix
@@ -9,7 +9,7 @@
 
       settings = {
         pack_dir.__raw = "vim.fs.joinpath(vim.fn.stdpath('data'), 'site')";
-        max_jobs.__raw = "nil";
+        max_jobs = null;
         autoremove = false;
         autoinstall = true;
         git = {
diff --git a/tests/test-sources/plugins/by-name/persisted/default.nix b/tests/test-sources/plugins/by-name/persisted/default.nix
index 43d4ab15..7c97674a 100644
--- a/tests/test-sources/plugins/by-name/persisted/default.nix
+++ b/tests/test-sources/plugins/by-name/persisted/default.nix
@@ -19,8 +19,8 @@
         use_git_branch = false;
         autoload = false;
         on_autoload_no_session.__raw = "function() end";
-        allowed_dirs.__empty = { };
-        ignored_dirs.__empty = { };
+        allowed_dirs = [ ];
+        ignored_dirs = [ ];
         telescope = {
           mappings = {
             copy_session = "<C-c>";
diff --git a/tests/test-sources/plugins/by-name/presence/default.nix b/tests/test-sources/plugins/by-name/presence/default.nix
index a00dafbf..114b3ac4 100644
--- a/tests/test-sources/plugins/by-name/presence/default.nix
+++ b/tests/test-sources/plugins/by-name/presence/default.nix
@@ -11,13 +11,13 @@
         neovim_image_text = "The One True Text Editor";
         main_image = "neovim";
         client_id = "793271441293967371";
-        log_level.__raw = "nil";
+        log_level = null;
         debounce_timeout = 10;
         enable_line_number = false;
-        blacklist.__empty = { };
-        file_assets.__raw = "nil";
+        blacklist = [ ];
+        file_assets = null;
         show_time = true;
-        buttons.__empty = { };
+        buttons = [ ];
         editing_text = "Editing %s";
         file_explorer_text = "Browsing %s";
         git_commit_text = "Committing changes";
diff --git a/tests/test-sources/plugins/by-name/project-nvim/default.nix b/tests/test-sources/plugins/by-name/project-nvim/default.nix
index 4d1d75bf..e6a4870f 100644
--- a/tests/test-sources/plugins/by-name/project-nvim/default.nix
+++ b/tests/test-sources/plugins/by-name/project-nvim/default.nix
@@ -44,8 +44,8 @@
           "Makefile"
           "package.json"
         ];
-        ignore_lsp.__empty = { };
-        exclude_dirs.__empty = { };
+        ignore_lsp = [ ];
+        exclude_dirs = [ ];
         show_hidden = false;
         silent_chdir = true;
         scope_chdir = "global";
diff --git a/tests/test-sources/plugins/by-name/projections/default.nix b/tests/test-sources/plugins/by-name/projections/default.nix
index 98c87619..07638d8f 100644
--- a/tests/test-sources/plugins/by-name/projections/default.nix
+++ b/tests/test-sources/plugins/by-name/projections/default.nix
@@ -9,14 +9,14 @@
 
       settings = {
         store_hooks = {
-          pre.__raw = "nil";
-          post.__raw = "nil";
+          pre = null;
+          post = null;
         };
         restore_hooks = {
-          pre.__raw = "nil";
-          post.__raw = "nil";
+          pre = null;
+          post = null;
         };
-        workspaces.__empty = { };
+        workspaces = [ ];
         patterns = [
           ".git"
           ".svn"
diff --git a/tests/test-sources/plugins/by-name/qmk/default.nix b/tests/test-sources/plugins/by-name/qmk/default.nix
index b32ed54a..4c64f52c 100644
--- a/tests/test-sources/plugins/by-name/qmk/default.nix
+++ b/tests/test-sources/plugins/by-name/qmk/default.nix
@@ -27,7 +27,7 @@
         auto_format_pattern = "*keymap.c";
         comment_preview = {
           position = "top";
-          keymap_overrides.__empty = { };
+          keymap_overrides = { };
           symbols = {
             space = " ";
             horz = "─";
diff --git a/tests/test-sources/plugins/by-name/quarto/default.nix b/tests/test-sources/plugins/by-name/quarto/default.nix
index aeafc105..d28c1837 100644
--- a/tests/test-sources/plugins/by-name/quarto/default.nix
+++ b/tests/test-sources/plugins/by-name/quarto/default.nix
@@ -37,8 +37,8 @@
         };
         codeRunner = {
           enabled = false;
-          default_method.__raw = "nil";
-          ft_runners.__empty = { };
+          default_method = null;
+          ft_runners = { };
           never_run = [ "yaml" ];
         };
       };
diff --git a/tests/test-sources/plugins/by-name/refactoring/default.nix b/tests/test-sources/plugins/by-name/refactoring/default.nix
index 985fb04b..6fe52917 100644
--- a/tests/test-sources/plugins/by-name/refactoring/default.nix
+++ b/tests/test-sources/plugins/by-name/refactoring/default.nix
@@ -62,9 +62,9 @@
           hpp = false;
           cxx = false;
         };
-        printf_statements.__empty = { };
-        print_var_statements.__empty = { };
-        extract_var_statements.__empty = { };
+        printf_statements = { };
+        print_var_statements = { };
+        extract_var_statements = { };
         show_success_message = false;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/remote-nvim/default.nix b/tests/test-sources/plugins/by-name/remote-nvim/default.nix
index 31e96e09..3425304c 100644
--- a/tests/test-sources/plugins/by-name/remote-nvim/default.nix
+++ b/tests/test-sources/plugins/by-name/remote-nvim/default.nix
@@ -13,8 +13,8 @@
           docker_binary = "docker";
           search_style = "current_dir_only";
           dotfiles = {
-            path.__raw = "nil";
-            install_script.__raw = "nil";
+            path = null;
+            install_script = null;
           };
           gpg_agent_forwarding = false;
           container_list = "running_only";
@@ -57,26 +57,26 @@
               dirs = "*";
               compression = {
                 enabled = false;
-                additional_opts.__empty = { };
+                additional_opts = { };
               };
             };
             data = {
               base.__raw = ''vim.fn.stdpath("data")'';
-              dirs.__empty = { };
+              dirs = { };
               compression = {
                 enabled = true;
               };
             };
             cache = {
               base.__raw = ''vim.fn.stdpath("cache")'';
-              dirs.__empty = { };
+              dirs = { };
               compression = {
                 enabled = true;
               };
             };
             state = {
               base.__raw = ''vim.fn.stdpath("state")'';
-              dirs.__empty = { };
+              dirs = { };
               compression = {
                 enabled = true;
               };
diff --git a/tests/test-sources/plugins/by-name/render-markdown/default.nix b/tests/test-sources/plugins/by-name/render-markdown/default.nix
index c84fa92f..2f0bd214 100644
--- a/tests/test-sources/plugins/by-name/render-markdown/default.nix
+++ b/tests/test-sources/plugins/by-name/render-markdown/default.nix
@@ -44,7 +44,7 @@
               sign.enabled = false;
             };
           };
-          filetype.__empty = { };
+          filetype = { };
         };
         log_level = "error";
         padding.highlight = "Normal";
diff --git a/tests/test-sources/plugins/by-name/rest/default.nix b/tests/test-sources/plugins/by-name/rest/default.nix
index 77050905..32e7ca69 100644
--- a/tests/test-sources/plugins/by-name/rest/default.nix
+++ b/tests/test-sources/plugins/by-name/rest/default.nix
@@ -13,7 +13,7 @@
         enable = true;
 
         settings = {
-          custom_dynamic_variables.__empty = { };
+          custom_dynamic_variables = { };
           request = {
             skip_ssl_verification = false;
             hooks = {
diff --git a/tests/test-sources/plugins/by-name/roslyn/default.nix b/tests/test-sources/plugins/by-name/roslyn/default.nix
index 8925f288..36fb3b4f 100644
--- a/tests/test-sources/plugins/by-name/roslyn/default.nix
+++ b/tests/test-sources/plugins/by-name/roslyn/default.nix
@@ -16,8 +16,8 @@
       enable = true;
       settings = {
         filewatching = "auto";
-        choose_target.__raw = "nil";
-        ignore_target.__raw = "nil";
+        choose_target = null;
+        ignore_target = null;
         broad_search = false;
         lock_target = false;
         silent = false;
diff --git a/tests/test-sources/plugins/by-name/rustaceanvim/default.nix b/tests/test-sources/plugins/by-name/rustaceanvim/default.nix
index 0e59c125..7d5b0fd2 100644
--- a/tests/test-sources/plugins/by-name/rustaceanvim/default.nix
+++ b/tests/test-sources/plugins/by-name/rustaceanvim/default.nix
@@ -13,10 +13,10 @@
           executor = "termopen";
           test_executor = "background";
           crate_test_executor = "background";
-          cargo_override.__raw = "nil";
+          cargo_override = null;
           enable_nextest = true;
           enable_clippy = true;
-          on_initialized.__raw = "nil";
+          on_initialized = null;
           reload_workspace_from_cargo_toml = true;
           hover_actions = {
             replace_builtin_hover = true;
@@ -31,7 +31,7 @@
           };
           crate_graph = {
             backend = "x11";
-            output.__raw = "nil";
+            output = null;
             full = true;
             enabled_graphviz_backends = [
               "bmp"
@@ -89,7 +89,7 @@
               "xlib"
               "x11"
             ];
-            pipe.__raw = "nil";
+            pipe = null;
           };
           open_url = "require('rustaceanvim.os').open_url";
         };
@@ -109,7 +109,7 @@
               return vim.fn.executable(rs_bin) == 1
             end
           '';
-          on_attach.__raw = "nil";
+          on_attach = null;
           cmd = ''
             function()
               return { 'rust-analyzer', '--log-file', RustaceanConfig.server.logfile }
@@ -126,7 +126,7 @@
         };
         dap = {
           autoload_configurations = true;
-          adapter.__raw = "nil";
+          adapter = null;
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/scrollview/default.nix b/tests/test-sources/plugins/by-name/scrollview/default.nix
index ae17d127..200f60f3 100644
--- a/tests/test-sources/plugins/by-name/scrollview/default.nix
+++ b/tests/test-sources/plugins/by-name/scrollview/default.nix
@@ -15,7 +15,7 @@
         column = 1;
         consider_border = false;
         current_only = false;
-        excluded_filetypes.__empty = { };
+        excluded_filetypes = [ ];
         floating_windows = false;
         hide_bar_for_insert = false;
         hide_on_intersect = false;
@@ -29,7 +29,7 @@
         winblend = 50;
         winblend_gui = 0;
         zindex = 40;
-        signs_hidden_for_insert.__empty = { };
+        signs_hidden_for_insert = [ ];
         signs_max_per_row = -1;
         signs_on_startup = [
           "diagnostics"
@@ -39,11 +39,11 @@
         signs_overflow = "left";
         signs_show_in_folds = false;
         changelist_previous_priority = 15;
-        changelist_previous_symbol.__raw = "nil";
+        changelist_previous_symbol = null;
         changelist_current_priority = 10;
         changelist_current_symbol = "@";
         changelist_next_priority = 5;
-        changelist_next_symbol.__raw = "nil";
+        changelist_next_symbol = null;
         conflicts_bottom_priority = 80;
         conflicts_bottom_symbol = ">";
         conflicts_middle_priority = 75;
@@ -51,26 +51,26 @@
         conflicts_top_priority = 70;
         conflicts_top_symbol = "<";
         cursor_priority = 0;
-        cursor_symbol.__raw = "nil";
+        cursor_symbol = null;
         diagnostics_error_priority = 60;
         diagnostics_error_symbol = "E";
         diagnostics_hint_priority = 30;
         diagnostics_hint_symbol = "H";
         diagnostics_info_priority = 40;
         diagnostics_info_symbol.__raw = "'I'"; # test rawLua support
-        diagnostics_severities.__raw = "nil";
+        diagnostics_severities = null;
         diagnostics_warn_priority = 50;
         diagnostics_warn_symbol = "W";
         folds_priority = 30;
-        folds_symbol.__raw = "nil";
+        folds_symbol = null;
         latestchange_priority = 10;
-        latestchange_symbol.__raw = "nil";
+        latestchange_symbol = null;
         loclist_priority = 45;
-        loclist_symbol.__raw = "nil";
-        marks_characters.__raw = "nil";
+        loclist_symbol = null;
+        marks_characters = null;
         marks_priority = 50;
         quickfix_priority = 45;
-        quickfix_symbol.__raw = "nil";
+        quickfix_symbol = null;
         search_priority = 70;
         search_symbol = [
           "="
@@ -80,9 +80,9 @@
         spell_priority = 20;
         spell_symbol = "~";
         textwidth_priority = 20;
-        textwidth_symbol.__raw = "nil";
+        textwidth_symbol = null;
         trail_priority = 50;
-        trail_symbol.__raw = "nil";
+        trail_symbol = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/sg/default.nix b/tests/test-sources/plugins/by-name/sg/default.nix
index e00ce227..4de35970 100644
--- a/tests/test-sources/plugins/by-name/sg/default.nix
+++ b/tests/test-sources/plugins/by-name/sg/default.nix
@@ -17,7 +17,7 @@
         enable_cody = false;
         accept_tos = false;
         chat = {
-          default_model.__raw = "nil";
+          default_model = null;
         };
         download_binaries = true;
         node_executable = "node";
@@ -30,7 +30,7 @@
             vim.keymap.set("n", "K", vim.lsp.buf.hover, { buffer = bufnr })
           end
         '';
-        src_headers.__raw = "nil";
+        src_headers = null;
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/sidekick/default.nix b/tests/test-sources/plugins/by-name/sidekick/default.nix
index 2e4786c0..286951dc 100644
--- a/tests/test-sources/plugins/by-name/sidekick/default.nix
+++ b/tests/test-sources/plugins/by-name/sidekick/default.nix
@@ -46,8 +46,8 @@
           watch = true;
           win = {
             config = lib.nixvim.mkRaw "function(terminal) end";
-            wo.__empty = { };
-            bo.__empty = { };
+            wo = { };
+            bo = { };
             layout = "right";
             float = {
               width = 0.9;
@@ -166,7 +166,7 @@
               row = false;
               col = false;
             };
-            position.__empty = { };
+            position = { };
           };
         };
         debug = false;
diff --git a/tests/test-sources/plugins/by-name/smartcolumn/default.nix b/tests/test-sources/plugins/by-name/smartcolumn/default.nix
index 3395b4e1..0495fd0d 100644
--- a/tests/test-sources/plugins/by-name/smartcolumn/default.nix
+++ b/tests/test-sources/plugins/by-name/smartcolumn/default.nix
@@ -13,7 +13,7 @@
           "markdown"
         ];
         scope = "file";
-        custom_colorcolumn.__empty = { };
+        custom_colorcolumn = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/smear-cursor/default.nix b/tests/test-sources/plugins/by-name/smear-cursor/default.nix
index bcc2be0d..61049ed8 100644
--- a/tests/test-sources/plugins/by-name/smear-cursor/default.nix
+++ b/tests/test-sources/plugins/by-name/smear-cursor/default.nix
@@ -17,7 +17,7 @@
         hide_target_hack = true;
         max_kept_windows = 50;
         windows_zindex = 300;
-        filetypes_disabled.__empty = { };
+        filetypes_disabled = [ ];
         time_interval = 17;
         delay_animation_start = 5;
         stiffness = 0.6;
@@ -36,8 +36,8 @@
         minimum_volume_factor = 0.7;
         max_length = 25;
         logging_level.__raw = "vim.log.levels.INFO";
-        cursor_color.__raw = "nil";
-        normal_bg.__raw = "nil";
+        cursor_color = null;
+        normal_bg = null;
         transparent_bg_fallback_color = "303030";
         cterm_cursor_colors = [
           240
diff --git a/tests/test-sources/plugins/by-name/sniprun/default.nix b/tests/test-sources/plugins/by-name/sniprun/default.nix
index 17054626..591e68a1 100644
--- a/tests/test-sources/plugins/by-name/sniprun/default.nix
+++ b/tests/test-sources/plugins/by-name/sniprun/default.nix
@@ -8,10 +8,10 @@
       enable = true;
 
       settings = {
-        selected_interpreters.__empty = { };
-        repl_enable.__empty = { };
-        repl_disable.__empty = { };
-        interpreter_options.__empty = { };
+        selected_interpreters = [ ];
+        repl_enable = [ ];
+        repl_disable = [ ];
+        interpreter_options = { };
         display = [
           "Classic"
           "VirtualTextOk"
diff --git a/tests/test-sources/plugins/by-name/specs/default.nix b/tests/test-sources/plugins/by-name/specs/default.nix
index 9b4db7e3..6a84fb4c 100644
--- a/tests/test-sources/plugins/by-name/specs/default.nix
+++ b/tests/test-sources/plugins/by-name/specs/default.nix
@@ -30,7 +30,7 @@
             end
           '';
         };
-        ignore_filetypes.__empty = { };
+        ignore_filetypes = { };
         ignore_buftypes = {
           nofile = true;
         };
@@ -54,7 +54,7 @@
           fader = "require('specs').linear_fader";
           resizer = "require('specs').shrink_resizer";
         };
-        ignore_filetypes.__empty = { };
+        ignore_filetypes = { };
         ignore_buftypes = {
           nofile = true;
         };
diff --git a/tests/test-sources/plugins/by-name/spectre/default.nix b/tests/test-sources/plugins/by-name/spectre/default.nix
index 7fec64c2..6b8409a2 100644
--- a/tests/test-sources/plugins/by-name/spectre/default.nix
+++ b/tests/test-sources/plugins/by-name/spectre/default.nix
@@ -249,7 +249,7 @@
           };
           oxi = {
             cmd = "oxi";
-            args.__empty = { };
+            args = [ ];
             options = {
               ignore-case = {
                 value = "i";
@@ -260,7 +260,7 @@
           };
           sd = {
             cmd = "sd";
-            options.__empty = { };
+            options = { };
           };
         };
         default = {
@@ -276,7 +276,7 @@
         is_open_target_win = true;
         is_insert_mode = false;
         is_block_ui_break = false;
-        open_template.__empty = { };
+        open_template = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/startify/default.nix b/tests/test-sources/plugins/by-name/startify/default.nix
index 2e066ad7..aac7dd55 100644
--- a/tests/test-sources/plugins/by-name/startify/default.nix
+++ b/tests/test-sources/plugins/by-name/startify/default.nix
@@ -98,7 +98,7 @@
             "three lines"
           ]
         ];
-        custom_footer.__raw = "nil";
+        custom_footer = null;
         disable_at_vimenter = false;
         relative_path = false;
         use_env = false;
diff --git a/tests/test-sources/plugins/by-name/startup/default.nix b/tests/test-sources/plugins/by-name/startup/default.nix
index 81fe1269..e4b4e564 100644
--- a/tests/test-sources/plugins/by-name/startup/default.nix
+++ b/tests/test-sources/plugins/by-name/startup/default.nix
@@ -13,7 +13,7 @@
         options = {
           mapping_keys = true;
           cursor_column = 0.5;
-          after.__raw = "nil";
+          after = null;
           empty_lines_between_mappings = true;
           disable_statuslines = true;
           paddings.__empty = { };
diff --git a/tests/test-sources/plugins/by-name/statuscol/default.nix b/tests/test-sources/plugins/by-name/statuscol/default.nix
index 4dd45598..fcdd0998 100644
--- a/tests/test-sources/plugins/by-name/statuscol/default.nix
+++ b/tests/test-sources/plugins/by-name/statuscol/default.nix
@@ -11,8 +11,8 @@
         setopt = true;
         thousands = false;
         relculright = false;
-        ft_ignore.__raw = "nil";
-        bt_ignore.__raw = "nil";
+        ft_ignore = null;
+        bt_ignore = null;
         segments = [
           {
             text = [ "%C" ];
diff --git a/tests/test-sources/plugins/by-name/supermaven/default.nix b/tests/test-sources/plugins/by-name/supermaven/default.nix
index 8353acb5..d3b567b1 100644
--- a/tests/test-sources/plugins/by-name/supermaven/default.nix
+++ b/tests/test-sources/plugins/by-name/supermaven/default.nix
@@ -16,10 +16,10 @@
           clear_suggestions = "<C-]>";
           accept_word = "<C-j>";
         };
-        ignore_filetypes.__empty = { };
+        ignore_filetypes = [ ];
         color = {
-          suggestion_color.__raw = "nil";
-          cterm.__raw = "nil";
+          suggestion_color = null;
+          cterm = null;
         };
         log_level = "info";
         disable_inline_completion = false;
diff --git a/tests/test-sources/plugins/by-name/tailwind-tools/default.nix b/tests/test-sources/plugins/by-name/tailwind-tools/default.nix
index 0e1f02ab..e8853158 100644
--- a/tests/test-sources/plugins/by-name/tailwind-tools/default.nix
+++ b/tests/test-sources/plugins/by-name/tailwind-tools/default.nix
@@ -16,7 +16,7 @@
       settings = {
         server = {
           override = true;
-          settings.__empty = { };
+          settings = { };
           on_attach.__raw = "function(client, bufnr) end";
         };
         document_color = {
@@ -27,7 +27,7 @@
         };
         conceal = {
           enabled = false;
-          min_length.__raw = "nil";
+          min_length = null;
           symbol = "󱏿";
           highlight = {
             fg = "#38BDF8";
@@ -42,8 +42,8 @@
           };
         };
         extension = {
-          queries.__empty = { };
-          patterns.__empty = { };
+          queries = [ ];
+          patterns = { };
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/teamtype/default.nix b/tests/test-sources/plugins/by-name/teamtype/default.nix
deleted file mode 100644
index 1e570edf..00000000
--- a/tests/test-sources/plugins/by-name/teamtype/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  empty = {
-    plugins.teamtype.enable = true;
-  };
-}
diff --git a/tests/test-sources/plugins/by-name/telescope/advanced-git-search.nix b/tests/test-sources/plugins/by-name/telescope/advanced-git-search.nix
index f7797cbf..bb1a743c 100644
--- a/tests/test-sources/plugins/by-name/telescope/advanced-git-search.nix
+++ b/tests/test-sources/plugins/by-name/telescope/advanced-git-search.nix
@@ -21,9 +21,9 @@
           settings = {
             browse_command = "GBrowse {commit_hash}";
             diff_plugin = "fugitive";
-            git_flags.__empty = { };
-            git_diff_flags.__empty = { };
-            git_log_flags.__empty = { };
+            git_flags = [ ];
+            git_diff_flags = [ ];
+            git_log_flags = [ ];
             show_builtin_git_pickers = false;
 
             entry_default_author_or_date = "author";
diff --git a/tests/test-sources/plugins/by-name/telescope/file-browser.nix b/tests/test-sources/plugins/by-name/telescope/file-browser.nix
index f4a767db..ce9e16d9 100644
--- a/tests/test-sources/plugins/by-name/telescope/file-browser.nix
+++ b/tests/test-sources/plugins/by-name/telescope/file-browser.nix
@@ -15,7 +15,7 @@
         enable = true;
 
         settings = {
-          theme.__raw = "nil";
+          theme = null;
           path.__raw = "vim.loop.cwd()";
           cwd.__raw = "vim.loop.cwd()";
           cwd_to_path = false;
diff --git a/tests/test-sources/plugins/by-name/telescope/frecency.nix b/tests/test-sources/plugins/by-name/telescope/frecency.nix
index e3ca9cea..5c501462 100644
--- a/tests/test-sources/plugins/by-name/telescope/frecency.nix
+++ b/tests/test-sources/plugins/by-name/telescope/frecency.nix
@@ -25,7 +25,7 @@
           db_root.__raw = "vim.fn.stdpath 'data'";
           db_safe_mode = true;
           db_validate_threshold = 10;
-          default_workspace.__raw = "nil";
+          default_workspace = null;
           disable_devicons = false;
           hide_current_buffer = false;
           filter_delimiter = ":";
@@ -38,8 +38,8 @@
           show_filter_column = true;
           show_scores = false;
           show_unindexed = true;
-          workspace_scan_cmd.__raw = "nil";
-          workspaces.__empty = { };
+          workspace_scan_cmd = null;
+          workspaces = { };
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/telescope/live-grep-args.nix b/tests/test-sources/plugins/by-name/telescope/live-grep-args.nix
index 4a6ed157..c09b9717 100644
--- a/tests/test-sources/plugins/by-name/telescope/live-grep-args.nix
+++ b/tests/test-sources/plugins/by-name/telescope/live-grep-args.nix
@@ -17,7 +17,7 @@
 
         settings = {
           auto_quoting = true;
-          mappings.__empty = { };
+          mappings = { };
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/telescope/manix.nix b/tests/test-sources/plugins/by-name/telescope/manix.nix
index bb68c5fc..b6a35b1d 100644
--- a/tests/test-sources/plugins/by-name/telescope/manix.nix
+++ b/tests/test-sources/plugins/by-name/telescope/manix.nix
@@ -15,7 +15,7 @@
         enable = true;
 
         settings = {
-          manix_args.__empty = { };
+          manix_args = [ ];
           cword = false;
         };
       };
diff --git a/tests/test-sources/plugins/by-name/telescope/project.nix b/tests/test-sources/plugins/by-name/telescope/project.nix
index def1b274..00cd26a1 100644
--- a/tests/test-sources/plugins/by-name/telescope/project.nix
+++ b/tests/test-sources/plugins/by-name/telescope/project.nix
@@ -19,7 +19,7 @@
         enable = true;
 
         settings = {
-          base_dirs.__raw = "nil";
+          base_dirs = null;
           cd_scope = [
             "tab"
             "window"
diff --git a/tests/test-sources/plugins/by-name/timerly/default.nix b/tests/test-sources/plugins/by-name/timerly/default.nix
index 451730ea..16f5be77 100644
--- a/tests/test-sources/plugins/by-name/timerly/default.nix
+++ b/tests/test-sources/plugins/by-name/timerly/default.nix
@@ -9,7 +9,7 @@
         enable = true;
 
         settings = {
-          on_start.__raw = "nil";
+          on_start = null;
           on_finish.__raw = ''
             function()
               vim.notify "Time is up!"
@@ -19,7 +19,7 @@
             30
             10
           ];
-          mapping.__raw = "nil";
+          mapping = null;
           position = "top-left";
         };
       };
diff --git a/tests/test-sources/plugins/by-name/tiny-devicons-auto-colors/default.nix b/tests/test-sources/plugins/by-name/tiny-devicons-auto-colors/default.nix
index 5b4eb007..c45ef32d 100644
--- a/tests/test-sources/plugins/by-name/tiny-devicons-auto-colors/default.nix
+++ b/tests/test-sources/plugins/by-name/tiny-devicons-auto-colors/default.nix
@@ -13,7 +13,7 @@
         enable = true;
 
         settings = {
-          colors.__raw = "nil";
+          colors = null;
           factors = {
             lightness = 1.75;
             chroma = 1;
@@ -29,7 +29,7 @@
             precision = 20;
             threshold = 23;
           };
-          ignore.__empty = { };
+          ignore = [ ];
           autoreload = false;
         };
       };
diff --git a/tests/test-sources/plugins/by-name/tiny-inline-diagnostic/default.nix b/tests/test-sources/plugins/by-name/tiny-inline-diagnostic/default.nix
index cd1b5057..6c699261 100644
--- a/tests/test-sources/plugins/by-name/tiny-inline-diagnostic/default.nix
+++ b/tests/test-sources/plugins/by-name/tiny-inline-diagnostic/default.nix
@@ -66,7 +66,7 @@
             enabled = false;
             after = 30;
           };
-          format.__raw = "nil";
+          format = null;
           virt_texts = {
             priority = 2048;
           };
@@ -76,9 +76,9 @@
             (lib.nixvim.mkRaw "vim.diagnostic.severity.INFO")
             (lib.nixvim.mkRaw "vim.diagnostic.severity.HINT")
           ];
-          overwrite_events.__raw = "nil";
+          overwrite_events = null;
         };
-        disabled_ft.__empty = { };
+        disabled_ft = [ ];
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/tinygit/default.nix b/tests/test-sources/plugins/by-name/tinygit/default.nix
index 7ef4c09a..7c2b109f 100644
--- a/tests/test-sources/plugins/by-name/tinygit/default.nix
+++ b/tests/test-sources/plugins/by-name/tinygit/default.nix
@@ -104,8 +104,8 @@
         };
         statusline = {
           blame = {
-            ignoreAuthors.__empty = { };
-            hideAuthorNames.__empty = { };
+            ignoreAuthors = [ ];
+            hideAuthorNames = [ ];
             maxMsgLen = 40;
             icon = "ﰖ";
           };
diff --git a/tests/test-sources/plugins/by-name/todo-comments/default.nix b/tests/test-sources/plugins/by-name/todo-comments/default.nix
index 4df6de09..3be84c5d 100644
--- a/tests/test-sources/plugins/by-name/todo-comments/default.nix
+++ b/tests/test-sources/plugins/by-name/todo-comments/default.nix
@@ -81,7 +81,7 @@
           pattern = ''.*<(KEYWORDS)\s*:'';
           comments_only = true;
           max_line_len = 400;
-          exclude.__empty = { };
+          exclude = [ ];
         };
 
         colors = {
diff --git a/tests/test-sources/plugins/by-name/toggleterm/default.nix b/tests/test-sources/plugins/by-name/toggleterm/default.nix
index a79a1d2a..4ff8bcb4 100644
--- a/tests/test-sources/plugins/by-name/toggleterm/default.nix
+++ b/tests/test-sources/plugins/by-name/toggleterm/default.nix
@@ -87,15 +87,15 @@
 
       settings = {
         size = 12;
-        open_mapping.__raw = "nil";
-        on_create.__raw = "nil";
-        on_open.__raw = "nil";
-        on_close.__raw = "nil";
-        on_stdout.__raw = "nil";
-        on_stderr.__raw = "nil";
-        on_exit.__raw = "nil";
+        open_mapping = null;
+        on_create = null;
+        on_open = null;
+        on_close = null;
+        on_stdout = null;
+        on_stderr = null;
+        on_exit = null;
         hide_numbers = true;
-        shade_filetypes.__empty = { };
+        shade_filetypes = [ ];
         autochdir = false;
         highlights = {
           NormalFloat.link = "Normal";
@@ -118,13 +118,13 @@
         shell.__raw = "vim.o.shell";
         auto_scroll = true;
         float_opts = {
-          border.__raw = "nil";
-          width.__raw = "nil";
-          height.__raw = "nil";
-          row.__raw = "nil";
-          col.__raw = "nil";
+          border = null;
+          width = null;
+          height = null;
+          row = null;
+          col = null;
           winblend = 0;
-          zindex.__raw = "nil";
+          zindex = null;
           title_pos = "left";
         };
         winbar = {
diff --git a/tests/test-sources/plugins/by-name/transparent/default.nix b/tests/test-sources/plugins/by-name/transparent/default.nix
index 59ad47a4..387b0f7c 100644
--- a/tests/test-sources/plugins/by-name/transparent/default.nix
+++ b/tests/test-sources/plugins/by-name/transparent/default.nix
@@ -35,8 +35,8 @@
           "StatusLineNC"
           "EndOfBuffer"
         ];
-        extra_groups.__empty = { };
-        exclude_groups.__empty = { };
+        extra_groups = [ ];
+        exclude_groups = [ ];
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/treesitter-context/default.nix b/tests/test-sources/plugins/by-name/treesitter-context/default.nix
index e697acc3..9b61bed5 100644
--- a/tests/test-sources/plugins/by-name/treesitter-context/default.nix
+++ b/tests/test-sources/plugins/by-name/treesitter-context/default.nix
@@ -20,9 +20,9 @@
           multiline_threshold = 20;
           trim_scope = "outer";
           mode = "cursor";
-          separator.__raw = "nil";
+          separator = null;
           zindex = 20;
-          on_attach = "nil";
+          on_attach = null;
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix b/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix
index ea5058bf..542b4193 100644
--- a/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix
+++ b/tests/test-sources/plugins/by-name/treesitter-textobjects/default.nix
@@ -15,7 +15,7 @@
         settings = {
           select = {
             enable = true;
-            disable.__empty = { };
+            disable = [ ];
             lookahead = true;
             keymaps = {
               af = "@function.outer";
@@ -35,7 +35,7 @@
           };
           swap = {
             enable = true;
-            disable.__empty = { };
+            disable = [ ];
             swap_next = {
               "<leader>a" = "@parameter.inner";
             };
@@ -45,7 +45,7 @@
           };
           move = {
             enable = true;
-            disable.__empty = { };
+            disable = [ ];
             set_jumps = true;
             goto_next_start = {
               "]m" = "@function.outer";
@@ -77,7 +77,7 @@
               "<leader>df" = "@function.outer";
               "<leader>dF" = "@class.outer";
             };
-            floating_preview_opts.__empty = { };
+            floating_preview_opts = { };
           };
         };
       };
diff --git a/tests/test-sources/plugins/by-name/treesitter/default.nix b/tests/test-sources/plugins/by-name/treesitter/default.nix
index 4a52c29f..2e079f34 100644
--- a/tests/test-sources/plugins/by-name/treesitter/default.nix
+++ b/tests/test-sources/plugins/by-name/treesitter/default.nix
@@ -6,8 +6,8 @@
 
       settings = {
         auto_install = false;
-        ensure_installed.__empty = { };
-        ignore_install.__empty = { };
+        ensure_installed = [ ];
+        ignore_install = [ ];
         # NOTE: This is our default, not the plugin's
         parser_install_dir.__raw = "vim.fs.joinpath(vim.fn.stdpath('data'), 'site')";
 
@@ -16,8 +16,8 @@
         highlight = {
           additional_vim_regex_highlighting = false;
           enable = false;
-          custom_captures.__empty = { };
-          disable.__raw = "nil";
+          custom_captures = { };
+          disable = null;
         };
 
         incremental_selection = {
diff --git a/tests/test-sources/plugins/by-name/treesj/default.nix b/tests/test-sources/plugins/by-name/treesj/default.nix
index c48bdba5..e26ee471 100644
--- a/tests/test-sources/plugins/by-name/treesj/default.nix
+++ b/tests/test-sources/plugins/by-name/treesj/default.nix
@@ -15,7 +15,7 @@
         notify = true;
         dot_repeat = true;
         on_error.__raw = "nil";
-        langs.__empty = { };
+        langs = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/by-name/trim/default.nix b/tests/test-sources/plugins/by-name/trim/default.nix
index 07c4e7b6..3910bfc3 100644
--- a/tests/test-sources/plugins/by-name/trim/default.nix
+++ b/tests/test-sources/plugins/by-name/trim/default.nix
@@ -8,8 +8,8 @@
       enable = true;
 
       settings = {
-        ft_blocklist.__empty = { };
-        patterns.__empty = { };
+        ft_blocklist = [ ];
+        patterns = [ ];
         trim_on_write = true;
         trim_trailing = true;
         trim_last_line = true;
diff --git a/tests/test-sources/plugins/by-name/trouble/default.nix b/tests/test-sources/plugins/by-name/trouble/default.nix
index 57b1b07a..9ca09838 100644
--- a/tests/test-sources/plugins/by-name/trouble/default.nix
+++ b/tests/test-sources/plugins/by-name/trouble/default.nix
@@ -35,7 +35,7 @@
         pinned = false;
         warn_no_results = true;
         open_no_results = false;
-        win.__empty = { };
+        win = { };
         preview = {
           type = "main";
           scratch = true;
diff --git a/tests/test-sources/plugins/by-name/ts-autotag/default.nix b/tests/test-sources/plugins/by-name/ts-autotag/default.nix
index b92678c6..d214a640 100644
--- a/tests/test-sources/plugins/by-name/ts-autotag/default.nix
+++ b/tests/test-sources/plugins/by-name/ts-autotag/default.nix
@@ -37,7 +37,7 @@
             "hbs" = "glimmer";
             "rust" = "rust";
           };
-          per_filetype.__empty = { };
+          per_filetype = { };
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/twilight/default.nix b/tests/test-sources/plugins/by-name/twilight/default.nix
index b909f5f4..c218cbe5 100644
--- a/tests/test-sources/plugins/by-name/twilight/default.nix
+++ b/tests/test-sources/plugins/by-name/twilight/default.nix
@@ -27,7 +27,7 @@
             "table"
             "if_statement"
           ];
-          exclude.__empty = { };
+          exclude = [ ];
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/typescript-tools/default.nix b/tests/test-sources/plugins/by-name/typescript-tools/default.nix
index 51f388c8..dcfcaa90 100644
--- a/tests/test-sources/plugins/by-name/typescript-tools/default.nix
+++ b/tests/test-sources/plugins/by-name/typescript-tools/default.nix
@@ -9,12 +9,12 @@
       settings = {
         separate_diagnostic_server = true;
         publish_diagnostic_on = "insert_leave";
-        expose_as_code_action.__raw = "nil";
-        tsserver_path.__raw = "nil";
-        tsserver_plugins.__raw = "nil";
+        expose_as_code_action = null;
+        tsserver_path = null;
+        tsserver_plugins = null;
         tsserver_max_memory = "auto";
-        tsserver_format_options.__raw = "nil";
-        tsserver_file_preferences.__raw = "nil";
+        tsserver_format_options = null;
+        tsserver_file_preferences = null;
         tsserver_locale = "en";
         complete_function_calls = false;
         include_completions_with_insert_text = true;
diff --git a/tests/test-sources/plugins/by-name/typst-preview/default.nix b/tests/test-sources/plugins/by-name/typst-preview/default.nix
index 841087a9..e5c28aa4 100644
--- a/tests/test-sources/plugins/by-name/typst-preview/default.nix
+++ b/tests/test-sources/plugins/by-name/typst-preview/default.nix
@@ -9,11 +9,11 @@
 
       settings = {
         debug = false;
-        open_cmd.__raw = "nil";
+        open_cmd = null;
         port = 0;
         invert_colors = "never";
         follow_cursor = true;
-        extra_args.__raw = "nil";
+        extra_args = null;
         get_root.__raw = ''
           function(path_of_main_file)
             local root = os.getenv 'TYPST_ROOT'
diff --git a/tests/test-sources/plugins/by-name/venv-selector/default.nix b/tests/test-sources/plugins/by-name/venv-selector/default.nix
index 3f11f776..30ce949d 100644
--- a/tests/test-sources/plugins/by-name/venv-selector/default.nix
+++ b/tests/test-sources/plugins/by-name/venv-selector/default.nix
@@ -29,7 +29,7 @@
           (lib.nixvim.mkRaw "require('venv-selector.hooks').dynamic_python_lsp_hook")
         ];
         options = {
-          on_venv_activate_callback.__raw = "nil";
+          on_venv_activate_callback = null;
           enable_default_searches = true;
           enable_cached_venvs = true;
           cached_venv_automatic_activation = true;
@@ -40,11 +40,11 @@
           debug = false;
           fd_binary_name = lib.nixvim.mkRaw "require('venv-selector.config').find_fd_command_name()";
           require_lsp_activation = true;
-          on_telescope_result_callback.__raw = "nil";
+          on_telescope_result_callback = null;
           picker_filter_type = "substring";
           selected_venv_marker_color = "#00FF00";
           selected_venv_marker_icon = "✔";
-          picker_icons.__empty = { };
+          picker_icons = [ ];
           picker_columns = [
             "marker"
             "search_icon"
@@ -53,8 +53,8 @@
           ];
           picker = "auto";
           statusline_func = {
-            nvchad.__raw = "nil";
-            lualine.__raw = "nil";
+            nvchad = null;
+            lualine = null;
           };
           picker_options = {
             snacks = {
diff --git a/tests/test-sources/plugins/by-name/vim-slime/default.nix b/tests/test-sources/plugins/by-name/vim-slime/default.nix
index a2b6ea20..bca3f3fb 100644
--- a/tests/test-sources/plugins/by-name/vim-slime/default.nix
+++ b/tests/test-sources/plugins/by-name/vim-slime/default.nix
@@ -9,7 +9,7 @@
 
       settings = {
         target = "screen";
-        vimterminal_cmd.__raw = "nil";
+        vimterminal_cmd = null;
         no_mappings = 0;
         paste_file = "$HOME/.slime_paste";
         preserve_curpos = 1;
diff --git a/tests/test-sources/plugins/by-name/vimade/default.nix b/tests/test-sources/plugins/by-name/vimade/default.nix
index f85e8b15..4664a43f 100644
--- a/tests/test-sources/plugins/by-name/vimade/default.nix
+++ b/tests/test-sources/plugins/by-name/vimade/default.nix
@@ -47,7 +47,8 @@
         ncmode = "buffers";
         fadelevel = 0.4;
         basebg = "";
-        tint.__empty = { };
+        tint = {
+        };
         blocklist = {
           default = {
             highlights = {
@@ -81,7 +82,7 @@
             end
           '';
         };
-        link.__empty = { };
+        link = [ ];
         groupdiff = true;
         groupscrollbind = false;
         enablefocusfading = false;
diff --git a/tests/test-sources/plugins/by-name/vimux/default.nix b/tests/test-sources/plugins/by-name/vimux/default.nix
index bb77dc5f..47a7f74e 100644
--- a/tests/test-sources/plugins/by-name/vimux/default.nix
+++ b/tests/test-sources/plugins/by-name/vimux/default.nix
@@ -20,7 +20,7 @@
         ExpandCommand = 0;
         CloseOnExit = 0;
         CommandShell = 1;
-        RunnerQuery.__empty = { };
+        RunnerQuery = { };
         Debug = false;
       };
     };
diff --git a/tests/test-sources/plugins/by-name/vimwiki/default.nix b/tests/test-sources/plugins/by-name/vimwiki/default.nix
index 343dd32b..c4b045f9 100644
--- a/tests/test-sources/plugins/by-name/vimwiki/default.nix
+++ b/tests/test-sources/plugins/by-name/vimwiki/default.nix
@@ -41,7 +41,7 @@
           ".mw" = "media";
         };
         folding = "";
-        filetypes.__empty = { };
+        filetypes = [ ];
         global_ext = 1;
         hl_cb_checked = 0;
         hl_headers = 0;
diff --git a/tests/test-sources/plugins/by-name/visual-multi/default.nix b/tests/test-sources/plugins/by-name/visual-multi/default.nix
index 325300c5..006611a2 100644
--- a/tests/test-sources/plugins/by-name/visual-multi/default.nix
+++ b/tests/test-sources/plugins/by-name/visual-multi/default.nix
@@ -22,22 +22,19 @@
         case_setting = "";
         disable_syntax_in_imode = 0;
         recursive_operations_at_cursors = 1;
-        custom_remaps.__empty = { };
-        custom_noremaps.__empty = { };
-        custom_motions.__empty = { };
-        user_operators.__empty = { };
+        custom_remaps = { };
+        custom_noremaps = { };
+        custom_motions = { };
+        user_operators = [ ];
         use_first_cursor_in_line = 0;
         insert_special_keys = [ "c-v" ];
         single_mode_maps = 1;
         single_mode_auto_reset = 1;
         filesize_limit = 0;
         persistent_registers = 0;
-        reindent_filetypes.__empty = { };
-        plugins_compatibilty.__empty = { };
-
-        # FIXME: This is not empty by default. it can't be or it throws
-        # maps.__empty = { };
-
+        reindent_filetypes = [ ];
+        plugins_compatibilty = { };
+        maps = { };
         default_mappings = 1;
         mouse_mappings = 0;
         leader = "\\\\";
diff --git a/tests/test-sources/plugins/by-name/visual-whitespace/default.nix b/tests/test-sources/plugins/by-name/visual-whitespace/default.nix
index bf4517c2..956a2c84 100644
--- a/tests/test-sources/plugins/by-name/visual-whitespace/default.nix
+++ b/tests/test-sources/plugins/by-name/visual-whitespace/default.nix
@@ -32,8 +32,8 @@
           dos = "↙";
         };
         ignore = {
-          filetypes.__empty = { };
-          buftypes.__empty = { };
+          filetypes = { };
+          buftypes = { };
         };
       };
     };
diff --git a/tests/test-sources/plugins/by-name/which-key/default.nix b/tests/test-sources/plugins/by-name/which-key/default.nix
index 64d45fe5..f1adefb6 100644
--- a/tests/test-sources/plugins/by-name/which-key/default.nix
+++ b/tests/test-sources/plugins/by-name/which-key/default.nix
@@ -22,7 +22,7 @@
             end
         '';
 
-        spec.__empty = { };
+        spec = [ ];
 
         notify = true;
 
@@ -70,8 +70,8 @@
           title = true;
           title_pos = "center";
           zindex = 1000;
-          bo.__empty = { };
-          wo.__empty = { };
+          bo = { };
+          wo = { };
         };
 
         layout = {
@@ -149,7 +149,7 @@
           group = "+";
           ellipsis = "…";
           mappings = true;
-          rules.__empty = { };
+          rules = [ ];
           colors = true;
           keys = {
             Up = " ";
@@ -187,8 +187,8 @@
         show_keys = true;
 
         disable = {
-          bt.__empty = { };
-          ft.__empty = { };
+          bt = [ ];
+          ft = [ ];
         };
 
         debug = false;
diff --git a/tests/test-sources/plugins/by-name/whichpy/default.nix b/tests/test-sources/plugins/by-name/whichpy/default.nix
index dca3b852..09449a50 100644
--- a/tests/test-sources/plugins/by-name/whichpy/default.nix
+++ b/tests/test-sources/plugins/by-name/whichpy/default.nix
@@ -10,7 +10,7 @@
       settings = {
         cache_dir.__raw = "vim.fn.stdpath('cache') .. '/whichpy.nvim'";
         update_path_env = false;
-        after_handle_select.__raw = "nil";
+        after_handle_select = null;
         picker = {
           name = "builtin";
         };
diff --git a/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix b/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix
index cb2515e4..847f0805 100644
--- a/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix
+++ b/tests/test-sources/plugins/by-name/windsurf-nvim/default.nix
@@ -28,7 +28,7 @@
         enable = true;
 
         settings = {
-          manager_path.__raw = "nil";
+          manager_path = null;
           bin_path.__raw = "vim.fn.stdpath('cache') .. '/codeium/bin'";
           config_path.__raw = "vim.fn.stdpath('cache') .. '/codeium/config.json'";
           language_server_download_url = "https://github.com";
@@ -38,10 +38,10 @@
             path = "/";
             portal_url = "codeium.com";
           };
-          enterprise_mode.__raw = "nil";
-          detect_proxy.__raw = "nil";
-          tools.__empty = { };
-          wrapper.__raw = "nil";
+          enterprise_mode = null;
+          detect_proxy = null;
+          tools = { };
+          wrapper = null;
           enable_chat = true;
           enable_local_search = true;
           enable_index_service = true;
@@ -50,13 +50,13 @@
           enable_cmp_source = true;
           virtual_text = {
             enabled = false;
-            filetypes.__empty = { };
+            filetypes = [ ];
             default_filetype_enabled = true;
             manual = false;
             idle_delay = 75;
             virtual_text_priority = 65535;
             map_keys = true;
-            accept_fallback.__raw = "nil";
+            accept_fallback = null;
             key_bindings = {
               accept = "<Tab>";
               accept_word = false;
@@ -68,7 +68,7 @@
           };
           workspace_root = {
             use_lsp = true;
-            find_root.__raw = "nil";
+            find_root = null;
             paths = [
               ".bzr"
               ".git"
diff --git a/tests/test-sources/plugins/by-name/wtf/default.nix b/tests/test-sources/plugins/by-name/wtf/default.nix
index 26218383..182557f7 100644
--- a/tests/test-sources/plugins/by-name/wtf/default.nix
+++ b/tests/test-sources/plugins/by-name/wtf/default.nix
@@ -26,7 +26,7 @@
       enable = true;
 
       settings = {
-        additional_instructions.__raw = "nil";
+        additional_instructions = null;
         chat_dir = lib.nixvim.mkRaw "vim.fn.stdpath('data'):gsub('/$', \"\") .. '/wtf/chats'";
         language = "english";
         picker = "telescope";
@@ -36,8 +36,8 @@
         # Extracting the default value would be annoying
         # providers = create_provider_defaults()
         hooks = {
-          request_started.__raw = "nil";
-          request_finished.__raw = "nil";
+          request_started = null;
+          request_finished = null;
         };
         winhighlight = "Normal:Normal,FloatBorder:FloatBorder";
       };
diff --git a/tests/test-sources/plugins/by-name/yanky/default.nix b/tests/test-sources/plugins/by-name/yanky/default.nix
index 69c9f554..736f98d9 100644
--- a/tests/test-sources/plugins/by-name/yanky/default.nix
+++ b/tests/test-sources/plugins/by-name/yanky/default.nix
@@ -32,18 +32,16 @@
         };
         picker = {
           select = {
-            # FIXME: this can't be empty due to raw coercion
             action = null;
           };
           telescope = {
             use_default_mappings = true;
-            # FIXME: this can't be empty due to raw coercion
             mappings = null;
           };
         };
         system_clipboard = {
           sync_with_ring = true;
-          clipboard_register.__raw = "nil";
+          clipboard_register = null;
         };
         highlight = {
           on_put = true;
@@ -101,7 +99,7 @@
           };
           system_clipboard = {
             sync_with_ring = true;
-            clipboard_register.__raw = "nil";
+            clipboard_register = null;
           };
           highlight = {
             on_put = true;
diff --git a/tests/test-sources/plugins/by-name/yazi/default.nix b/tests/test-sources/plugins/by-name/yazi/default.nix
index 2bf9c572..a21ce9ff 100644
--- a/tests/test-sources/plugins/by-name/yazi/default.nix
+++ b/tests/test-sources/plugins/by-name/yazi/default.nix
@@ -34,7 +34,7 @@
           send_to_quickfix_list = "<c-q>";
         };
 
-        set_keymappings_function.__raw = "nil";
+        set_keymappings_function = null;
 
         hooks = {
           yazi_opened.__raw = ''
@@ -55,7 +55,7 @@
         };
 
         highlight_groups = {
-          hovered_buffer.__raw = "nil";
+          hovered_buffer = null;
         };
 
         floating_window_scaling_factor = 0.9;
diff --git a/tests/test-sources/plugins/by-name/zen-mode/default.nix b/tests/test-sources/plugins/by-name/zen-mode/default.nix
index 3cc74ed9..4f6d332f 100644
--- a/tests/test-sources/plugins/by-name/zen-mode/default.nix
+++ b/tests/test-sources/plugins/by-name/zen-mode/default.nix
@@ -12,7 +12,7 @@
           backdrop = 0.95;
           width = 120;
           height = 1;
-          options.__empty = { };
+          options = { };
         };
         plugins = {
           options = {
diff --git a/tests/test-sources/plugins/cmp/default.nix b/tests/test-sources/plugins/cmp/default.nix
index e4b9a5e0..efc74242 100644
--- a/tests/test-sources/plugins/cmp/default.nix
+++ b/tests/test-sources/plugins/cmp/default.nix
@@ -104,7 +104,7 @@
             "order"
           ];
         };
-        sources.__empty = { };
+        sources = [ ];
         experimental = {
           ghost_text = false;
         };
diff --git a/tests/test-sources/plugins/colorschemes/ayu.nix b/tests/test-sources/plugins/colorschemes/ayu.nix
index 2499f21b..8ca1e74c 100644
--- a/tests/test-sources/plugins/colorschemes/ayu.nix
+++ b/tests/test-sources/plugins/colorschemes/ayu.nix
@@ -9,8 +9,6 @@
 
       settings = {
         mirage = false;
-
-        # FIXME: this can't be empty due to raw coercion
         overrides = { };
       };
     };
diff --git a/tests/test-sources/plugins/colorschemes/catppuccin.nix b/tests/test-sources/plugins/colorschemes/catppuccin.nix
index c4db85e8..df28bd07 100644
--- a/tests/test-sources/plugins/colorschemes/catppuccin.nix
+++ b/tests/test-sources/plugins/colorschemes/catppuccin.nix
@@ -28,22 +28,19 @@
         styles = {
           comments = [ "italic" ];
           conditionals = [ "italic" ];
-          loops.__empty = { };
-          functions.__empty = { };
-          keywords.__empty = { };
-          strings.__empty = { };
-          variables.__empty = { };
-          numbers.__empty = { };
-          booleans.__empty = { };
-          properties.__empty = { };
-          types.__empty = { };
-          operators.__empty = { };
+          loops = [ ];
+          functions = [ ];
+          keywords = [ ];
+          strings = [ ];
+          variables = [ ];
+          numbers = [ ];
+          booleans = [ ];
+          properties = [ ];
+          types = [ ];
+          operators = [ ];
         };
-        color_overrides.__empty = { };
-
-        # FIXME: this can't be __empty due to raw coercion
+        color_overrides = { };
         custom_highlights = { };
-
         default_integrations = true;
         integrations = {
           alpha = true;
@@ -126,9 +123,9 @@
             mantle = "#242424";
             crust = "#474747";
           };
-          frappe.__empty = { };
-          macchiato.__empty = { };
-          mocha.__empty = { };
+          frappe = { };
+          macchiato = { };
+          mocha = { };
         };
         styles = {
           booleans = [
diff --git a/tests/test-sources/plugins/colorschemes/cyberdream.nix b/tests/test-sources/plugins/colorschemes/cyberdream.nix
index 130bcf55..628b5785 100644
--- a/tests/test-sources/plugins/colorschemes/cyberdream.nix
+++ b/tests/test-sources/plugins/colorschemes/cyberdream.nix
@@ -16,8 +16,8 @@
         terminal_colors = true;
 
         theme = {
-          highlights.__empty = { };
-          colors.__empty = { };
+          highlights = { };
+          colors = { };
         };
       };
     };
diff --git a/tests/test-sources/plugins/colorschemes/everforest.nix b/tests/test-sources/plugins/colorschemes/everforest.nix
index bf239761..79b5b79c 100644
--- a/tests/test-sources/plugins/colorschemes/everforest.nix
+++ b/tests/test-sources/plugins/colorschemes/everforest.nix
@@ -26,7 +26,7 @@
         inlay_hints_background = "none";
         disable_terminal_colors = 0;
         lightline_disable_bold = 0;
-        colors_override.__raw = "nil";
+        colors_override = { };
 
         # This option is broken when set to 1, because the plugin tries to write its cache in /nix/store
         better_performance = 0;
diff --git a/tests/test-sources/plugins/colorschemes/github-theme.nix b/tests/test-sources/plugins/colorschemes/github-theme.nix
index df6a11f8..a2b6958e 100644
--- a/tests/test-sources/plugins/colorschemes/github-theme.nix
+++ b/tests/test-sources/plugins/colorschemes/github-theme.nix
@@ -40,14 +40,14 @@
             floats = true;
             sidebars = {
               enable = true;
-              list.__empty = { };
+              list = [ ];
             };
           };
-          modules.__empty = { };
+          modules = [ ];
         };
-        palettes.__empty = { };
-        specs.__empty = { };
-        groups.__empty = { };
+        palettes = [ ];
+        specs = [ ];
+        groups = [ ];
       };
     };
   };
diff --git a/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix b/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix
index 667829cd..2b3c3dbd 100644
--- a/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix
+++ b/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix
@@ -15,8 +15,8 @@ _: {
         string_style = "nocombine";
         function_style = "bold";
         variable_style = "NONE";
-        highlights.__empty = { };
-        color_overrides.__empty = { };
+        highlights = { };
+        color_overrides = { };
         use_original_palette = 0;
       };
     };
diff --git a/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix b/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix
index 1bc6a5e3..ef158cf7 100644
--- a/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix
+++ b/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix
@@ -19,13 +19,13 @@
         };
         float = {
           force_background = false;
-          background_color.__raw = "nil";
+          background_color = null;
         };
         signs = {
           force_background = false;
-          background_color.__raw = "nil";
+          background_color = null;
         };
-        customize.__raw = "nil";
+        customize = null;
       };
     };
   };
@@ -48,7 +48,7 @@
         };
         signs = {
           force_background = false;
-          background_color.__raw = "nil";
+          background_color = null;
         };
         customize = lib.nixvim.mkRaw ''
           function(g, o)
diff --git a/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix b/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix
index 5516c507..5889e234 100644
--- a/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix
+++ b/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix
@@ -15,10 +15,10 @@
       settings = {
         cache = false;
         colors = {
-          palette.__empty = { };
+          palette = { };
           theme = {
-            ink.__empty = { };
-            canvas.__empty = { };
+            ink = { };
+            canvas = { };
           };
         };
         undercurl = true;
diff --git a/tests/test-sources/plugins/colorschemes/kanagawa.nix b/tests/test-sources/plugins/colorschemes/kanagawa.nix
index a471fb8a..bde8fe41 100644
--- a/tests/test-sources/plugins/colorschemes/kanagawa.nix
+++ b/tests/test-sources/plugins/colorschemes/kanagawa.nix
@@ -13,14 +13,14 @@
         commentStyle = {
           italic = true;
         };
-        functionStyle.__empty = { };
+        functionStyle = { };
         keywordStyle = {
           italic = true;
         };
         statementStyle = {
           bold = true;
         };
-        typeStyle.__empty = { };
+        typeStyle = { };
         transparent = false;
         dimInactive = false;
         terminalColors = true;
diff --git a/tests/test-sources/plugins/colorschemes/modus.nix b/tests/test-sources/plugins/colorschemes/modus.nix
index b7476305..7118da07 100644
--- a/tests/test-sources/plugins/colorschemes/modus.nix
+++ b/tests/test-sources/plugins/colorschemes/modus.nix
@@ -16,8 +16,8 @@
         styles = {
           comments.italic = true;
           keywords.italic = true;
-          functions.__empty = { };
-          variables.__empty = { };
+          functions = { };
+          variables = { };
         };
         on_colors = "function(colors) end";
         on_highlights = "function(highlights, colors) end";
diff --git a/tests/test-sources/plugins/colorschemes/nightfox.nix b/tests/test-sources/plugins/colorschemes/nightfox.nix
index b8a98cfc..9ad3a922 100644
--- a/tests/test-sources/plugins/colorschemes/nightfox.nix
+++ b/tests/test-sources/plugins/colorschemes/nightfox.nix
@@ -62,9 +62,9 @@
             };
           };
         };
-        palettes.__empty = { };
-        specs.__empty = { };
-        groups.__empty = { };
+        palettes = { };
+        specs = { };
+        groups = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/colorschemes/onedark.nix b/tests/test-sources/plugins/colorschemes/onedark.nix
index b570fa9a..8ce34c57 100644
--- a/tests/test-sources/plugins/colorschemes/onedark.nix
+++ b/tests/test-sources/plugins/colorschemes/onedark.nix
@@ -40,7 +40,7 @@
         term_colors = true;
         ending_tildes = false;
         cmp_itemkind_reverse = false;
-        toggle_style_key.__raw = "nil";
+        toggle_style_key = null;
         toggle_style_list = [
           "dark"
           "darker"
@@ -60,8 +60,8 @@
         lualine = {
           transparent = false;
         };
-        colors.__empty = { };
-        highlights.__empty = { };
+        colors = { };
+        highlights = { };
         diagnostics = {
           darker = true;
           undercurl = true;
diff --git a/tests/test-sources/plugins/colorschemes/palette.nix b/tests/test-sources/plugins/colorschemes/palette.nix
index abcaf629..359c3caa 100644
--- a/tests/test-sources/plugins/colorschemes/palette.nix
+++ b/tests/test-sources/plugins/colorschemes/palette.nix
@@ -14,9 +14,9 @@
           state = "pastel";
         };
         custom_palettes = {
-          main.__empty = { };
-          accent.__empty = { };
-          state.__empty = { };
+          main = { };
+          accent = { };
+          state = { };
         };
         italics = true;
         transparent_background = false;
diff --git a/tests/test-sources/plugins/colorschemes/poimandres.nix b/tests/test-sources/plugins/colorschemes/poimandres.nix
index 04cbbfb9..51e8ab63 100644
--- a/tests/test-sources/plugins/colorschemes/poimandres.nix
+++ b/tests/test-sources/plugins/colorschemes/poimandres.nix
@@ -46,7 +46,7 @@
             h6 = "blue2";
           };
         };
-        highlight_groups.__empty = { };
+        highlight_groups = { };
       };
     };
   };
diff --git a/tests/test-sources/plugins/colorschemes/solazized-osaka.nix b/tests/test-sources/plugins/colorschemes/solazized-osaka.nix
index 75a2bef8..ad02dce1 100644
--- a/tests/test-sources/plugins/colorschemes/solazized-osaka.nix
+++ b/tests/test-sources/plugins/colorschemes/solazized-osaka.nix
@@ -14,8 +14,8 @@
         styles = {
           comments.italic = true;
           keywords.italic = true;
-          functions.__empty = { };
-          variables.__empty = { };
+          functions = { };
+          variables = { };
           sidebars = "dark";
           floats = "dark";
         };
diff --git a/tests/test-sources/plugins/colorschemes/tokyonight.nix b/tests/test-sources/plugins/colorschemes/tokyonight.nix
index 4460215b..37772643 100644
--- a/tests/test-sources/plugins/colorschemes/tokyonight.nix
+++ b/tests/test-sources/plugins/colorschemes/tokyonight.nix
@@ -15,8 +15,8 @@
         styles = {
           comments.italic = true;
           keywords.italic = true;
-          functions.__empty = { };
-          variables.__empty = { };
+          functions = { };
+          variables = { };
           sidebars = "dark";
           floats = "dark";
         };
diff --git a/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix b/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix
index 7f8a243e..0a925681 100644
--- a/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix
+++ b/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix
@@ -23,10 +23,10 @@
             workspaceWord = true;
           };
           diagnostics = {
-            disable.__empty = { };
+            disable = [ ];
             disableScheme = [ "git" ];
             enable = true;
-            globals.__empty = { };
+            globals = [ ];
             groupFileStatus = {
               ambiguity = "Fallback";
               await = "Fallback";
@@ -169,18 +169,18 @@
               unused-local = "Hint";
               unused-vararg = "Hint";
             };
-            unusedLocalExclude.__empty = { };
+            unusedLocalExclude = [ ];
             workspaceDelay = 3000;
             workspaceEvent = "OnSave";
             workspaceRate = 100;
           };
           doc = {
-            packageName.__empty = { };
-            privateName.__empty = { };
-            protectedName.__empty = { };
+            packageName = [ ];
+            privateName = [ ];
+            protectedName = [ ];
           };
           format = {
-            defaultConfig.__empty = { };
+            defaultConfig = { };
             enable = true;
           };
           hint = {
@@ -202,7 +202,7 @@
             viewStringMax = 1000;
           };
           misc = {
-            parameters.__empty = { };
+            parameters = [ ];
             executablePath = "";
           };
           runtime = {
@@ -227,15 +227,15 @@
             };
             fileEncoding = "utf8";
             meta = "$\{version} $\{language} $\{encoding}";
-            nonstandardSymbol.__empty = { };
+            nonstandardSymbol = [ ];
             path = [
               "?.lua"
               "?/init.lua"
             ];
             pathStrict = false;
             plugin = "";
-            pluginArgs.__empty = { };
-            special.__empty = { };
+            pluginArgs = [ ];
+            special = { };
             unicodeName = false;
             version = "Lua 5.4";
           };
@@ -249,10 +249,10 @@
             enable = true;
           };
           spell = {
-            dict.__empty = { };
+            dict = [ ];
           };
           telemetry = {
-            enable.__raw = "nil";
+            enable = null;
           };
           type = {
             castNumberToInteger = false;
@@ -267,7 +267,7 @@
             checkThirdParty = true;
             ignoreDir = [ ".vscode" ];
             ignoreSubmodules = true;
-            library.__empty = { };
+            library = [ ];
             maxPreload = 5000;
             preloadFileSize = 500;
             supportScheme = [
@@ -276,7 +276,7 @@
               "git"
             ];
             useGitIgnore = true;
-            userThirdParty.__empty = { };
+            userThirdParty = [ ];
           };
         };
       };
diff --git a/tests/test-sources/plugins/lsp/language-servers/pylsp.nix b/tests/test-sources/plugins/lsp/language-servers/pylsp.nix
index 187a13b3..8be609b8 100644
--- a/tests/test-sources/plugins/lsp/language-servers/pylsp.nix
+++ b/tests/test-sources/plugins/lsp/language-servers/pylsp.nix
@@ -1,5 +1,3 @@
-# FIXME: This test uses a lot of "null" values that get ignored
-# this should use raw values instead but cannot be implemented due to raw coercions
 {
   example = {
     plugins.lsp = {
diff --git a/tests/test-sources/plugins/lsp/language-servers/tinymist.nix b/tests/test-sources/plugins/lsp/language-servers/tinymist.nix
index 27086c0d..54fef0ce 100644
--- a/tests/test-sources/plugins/lsp/language-servers/tinymist.nix
+++ b/tests/test-sources/plugins/lsp/language-servers/tinymist.nix
@@ -9,16 +9,16 @@
         settings = {
           outputPath = "$dir/$name";
           exportPdf = "auto";
-          rootPath.__raw = "nil";
+          rootPath = null;
           semanticTokens = "enable";
           systemFonts = true;
-          fontPaths.__empty = { };
+          fontPaths = [ ];
           compileStatus = "disable";
-          typstExtraArgs.__empty = { };
+          typstExtraArgs = [ ];
           formatterMode = "disable";
           formatterPrintWidth = 120;
           completion = {
-            triggerOnSnippetPlaceholders.__raw = "nil";
+            triggerOnSnippetPlaceholders = null;
             postfix = true;
             postfixUfcs = true;
             postfixUfcsLeft = true;
diff --git a/typos.toml b/typos.toml
index 863ad310..79d1d669 100644
--- a/typos.toml
+++ b/typos.toml
@@ -16,6 +16,7 @@ tro = "tro"                   # ./plugins/utils/spectre.nix
 protols = "protols"           # ./plugins/lsp/lsp-packages.nix
 compatibilty = "compatibilty" # ./plugins/by-name/visual-multi/default.nix
 Maco = "Maco"                 # ./plugins/by-name/femaco
+Typ = "Typ"                   # ./flake/dev/list-plugins/list-plugins.py
 
 [type.patch]
 extend-glob = ["*.patch"]
diff --git a/version-info.toml b/version-info.toml
index 0fa0758f..5c9c0a27 100644
--- a/version-info.toml
+++ b/version-info.toml
@@ -1,6 +1,6 @@
 # DO NOT MODIFY!
 # This file was generated by ci/version-info/default.nix
-nixpkgs_rev = "ffcdcf99d65c61956d882df249a9be53e5902ea5"
+nixpkgs_rev = "7241bcbb4f099a66aafca120d37c65e8dda32717"
 release = "25.11"
 unstable = true