Merge branch 'main' into notashelf/push-qozvyzsvqtmk

modules/extra/deprecations.nix

@@ -342,5 +342,10 @@ in {
         Incremental selection configuration has been removed from nvim-treesitter.
       '')
     ]
+
+    # 2026-03-19
+    [
+      (mkRenamedOptionModule ["vim" "treesitter" "foldByDefault"] ["vim" "options" "foldenable"])
+    ]
   ];
 }

modules/neovim/init/basic.nix

@@ -78,6 +78,11 @@ in {
     };
   };
 
+  # Alias vim.options as vim.opts.
+  # This is a convenience for people using frameworks like flake-parts or Den that use lib.types.deferredModule
+  # and users would set `vim.options` but error when Nix confuses it with Nix Module's options-definitions.
+  imports = [(lib.mkAliasOptionModule ["vim" "opts"] ["vim" "options"])];
+
   config.vim = {
     # Set options that were previously interpolated in 'luaConfigRC.basic' as vim.options (vim.o)
     # and 'vim.globals' (vim.g). Future options, if possible, should be added here instead of the

modules/plugins/assistant/codecompanion/codecompanion-nvim.nix

@@ -1,6 +1,6 @@
 {lib, ...}: let
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) int str enum nullOr attrs;
+  inherit (lib.options) mkOption mkEnableOption literalExpression;
+  inherit (lib.types) int str enum nullOr attrs either submodule;
   inherit (lib.nvim.types) mkPluginSetupOption luaInline;
 in {
   options.vim.assistant = {
@@ -202,9 +202,23 @@ in {
         strategies = {
           chat = {
             adapter = mkOption {
-              type = nullOr str;
               default = null;
               description = "Adapter used for the chat strategy.";
+              type = nullOr (either str (submodule {
+                options = {
+                  name = mkOption {
+                    type = nullOr str;
+                    default = null;
+                    description = "Name of the Adapter";
+                  };
+
+                  model = mkOption {
+                    type = nullOr str;
+                    default = null;
+                    description = "Model used for Adapter.";
+                  };
+                };
+              }));
             };
 
             keymaps = mkOption {
@@ -253,9 +267,23 @@ in {
 
           inline = {
             adapter = mkOption {
-              type = nullOr str;
               default = null;
               description = "Adapter used for the inline strategy.";
+              type = nullOr (either str (submodule {
+                options = {
+                  name = mkOption {
+                    type = nullOr str;
+                    default = null;
+                    description = "Name of the Adapter";
+                  };
+
+                  model = mkOption {
+                    type = nullOr str;
+                    default = null;
+                    description = "Model used for Adapter.";
+                  };
+                };
+              }));
             };
 
             variables = mkOption {

modules/plugins/formatter/conform-nvim/conform-nvim.nix

@@ -1,7 +1,7 @@
 {lib, ...}: let
   inherit (lib.generators) mkLuaInline;
   inherit (lib.options) mkOption mkEnableOption literalMD;
-  inherit (lib.types) attrs either nullOr listOf submodule str;
+  inherit (lib.types) attrs attrsOf either nullOr listOf submodule str;
   inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.types) luaInline mkPluginSetupOption;
 
@@ -49,7 +49,7 @@ in {
     enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]";
     setupOpts = mkPluginSetupOption "conform.nvim" {
       formatters = mkOption {
-        type = formattersType;
+        type = attrsOf formattersType;
         default = {};
         description = "Custom formatters and overrides for built-in formatters.";
       };

modules/plugins/languages/default.nix

@@ -25,12 +25,14 @@ in {
     ./html.nix
     ./tera.nix
     ./twig.nix
+    ./liquid.nix
     ./haskell.nix
     ./java.nix
     ./jinja.nix
     ./json.nix
     ./lua.nix
     ./markdown.nix
+    ./tex.nix
     ./nim.nix
     ./vala.nix
     ./nix.nix
@@ -59,7 +61,10 @@ in {
     ./just.nix
     ./make.nix
     ./xml.nix
+    ./gettext.nix
     ./fluent.nix
+    ./openscad.nix
+    ./jq.nix
 
     # This is now a hard deprecation.
     (mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"])

modules/plugins/languages/gettext.nix

@@ -0,0 +1,35 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.options) mkEnableOption literalExpression;
+
+  cfg = config.vim.languages.gettext;
+  # TODO: package `msgfmt --check` into nvim-lint
+  # TODO: package `msgcat` into conform.nvim
+in {
+  options.vim.languages.gettext = {
+    enable = mkEnableOption "gettext portable object language support";
+
+    treesitter = {
+      enable =
+        mkEnableOption "gettext portable object language treesitter"
+        // {
+          default = config.vim.languages.enableTreesitter;
+          defaultText = literalExpression "config.vim.languages.enableTreesitter";
+        };
+      package = mkGrammarOption pkgs "po";
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+  ]);
+}

modules/plugins/languages/hcl.nix

@@ -8,20 +8,27 @@
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) bool enum listOf;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.hcl;
 
-  defaultServers = ["terraform-ls"];
+  defaultServers = ["tofuls-hcl"];
   servers = {
-    terraform-ls = {
+    terraformls-hcl = {
       enable = true;
       cmd = [(getExe pkgs.terraform-ls) "serve"];
-      filetypes = ["terraform" "terraform-vars"];
+      filetypes = ["hcl"];
+      root_markers = [".git"];
+    };
+    tofuls-hcl = {
+      enable = true;
+      cmd = [(getExe pkgs.tofu-ls) "serve"];
+      filetypes = ["hcl"];
       root_markers = [".terraform" ".git"];
     };
+    # TODO: package nomad-lsp and offer as an option here too
   };
 
   defaultFormat = ["hclfmt"];
@@ -29,6 +36,11 @@
     hclfmt = {
       command = getExe pkgs.hclfmt;
     };
+    nomad-fmt = {
+      command = getExe pkgs.nomad;
+      args = ["fmt" "$FILENAME"];
+      stdin = false;
+    };
   };
 in {
   options.vim.languages.hcl = {
@@ -66,7 +78,7 @@ in {
           defaultText = literalExpression "config.vim.languages.enableFormat";
         };
       type = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats));
+        type = listOf (enum (attrNames formats));
         default = defaultFormat;
         description = "HCL formatter to use";
       };
@@ -97,18 +109,21 @@ in {
         }
       '';
     }
+
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim = {
+        lsp.servers =
+          mapListToAttrs (n: {
+            name = n;
+            value = servers.${n};
+          })
+          cfg.lsp.servers;
+      };
     })
 
     (mkIf cfg.format.enable {

modules/plugins/languages/jq.nix

@@ -0,0 +1,114 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) literalExpression mkEnableOption mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.meta) getExe;
+  inherit (lib.types) enum listOf;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+  inherit (lib.nvim.types) mkGrammarOption;
+
+  cfg = config.vim.languages.jq;
+
+  defaultServers = ["jq-lsp"];
+  servers = {
+    jq-lsp = {
+      enable = true;
+      cmd = [(getExe pkgs.jq-lsp)];
+      filetypes = ["jq"];
+      root_markers = [".git"];
+    };
+  };
+
+  defaultFormat = ["jqfmt"];
+  formats = {
+    jqfmt = {
+      command = getExe pkgs.jqfmt;
+      args = [
+        "-ob"
+        "-ar"
+        "-op=pipe"
+      ];
+    };
+  };
+in {
+  options.vim.languages.jq = {
+    enable = mkEnableOption "JQ support";
+
+    treesitter = {
+      enable =
+        mkEnableOption "JQ treesitter"
+        // {
+          default = config.vim.languages.enableTreesitter;
+          defaultText = literalExpression "config.vim.languages.enableTreesitter";
+        };
+      package = mkGrammarOption pkgs "jq";
+    };
+
+    lsp = {
+      enable =
+        mkEnableOption "JQ LSP support"
+        // {
+          default = config.vim.lsp.enable;
+          defaultText = literalExpression "config.vim.lsp.enable";
+        };
+      servers = mkOption {
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
+        description = "JQ LSP server to use";
+      };
+    };
+
+    format = {
+      enable =
+        mkEnableOption "JQ formatting"
+        // {
+          default = config.vim.languages.enableFormat;
+          defaultText = literalExpression "config.vim.languages.enableFormat";
+        };
+
+      type = mkOption {
+        description = "JQ formatter to use";
+        type = listOf (enum (attrNames formats));
+        default = defaultFormat;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter = {
+        enable = true;
+        grammars = [cfg.treesitter.package];
+      };
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts = {
+          formatters_by_ft.jq = cfg.format.type;
+          formatters =
+            mapListToAttrs (name: {
+              inherit name;
+              value = formats.${name};
+            })
+            cfg.format.type;
+        };
+      };
+    })
+  ]);
+}

modules/plugins/languages/liquid.nix

@@ -0,0 +1,34 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.options) mkEnableOption literalExpression;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.types) mkGrammarOption;
+
+  cfg = config.vim.languages.liquid;
+in {
+  options.vim.languages.liquid = {
+    enable = mkEnableOption "Liquid templating language support";
+
+    treesitter = {
+      enable =
+        mkEnableOption "Liquid treesitter"
+        // {
+          default = config.vim.languages.enableTreesitter;
+          defaultText = literalExpression "config.vim.languages.enableTreesitter";
+        };
+      package = mkGrammarOption pkgs "liquid";
+    };
+    # TODO: if curlylint gets packaged for nix, add it.
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+  ]);
+}

modules/plugins/languages/markdown.nix

@@ -21,7 +21,7 @@
     marksman = {
       enable = true;
       cmd = [(getExe pkgs.marksman) "server"];
-      filetypes = ["markdown" "markdown.mdx"];
+      filetypes = ["markdown" "mdx"];
       root_markers = [".marksman.toml" ".git"];
     };
 

modules/plugins/languages/openscad.nix

@@ -0,0 +1,62 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) mkEnableOption mkOption literalExpression;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) enum listOf;
+  inherit (lib.meta) getExe;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+
+  cfg = config.vim.languages.openscad;
+  /*
+  There is no Treesitter module for OpenSCAD yet.
+  Luckily vim already ships with a builtin syntax that is used by default.
+
+  The LSP already ships with diagnostics, but there is also an experimental analyzer called sca2d
+  <https://search.nixos.org/packages?channel=unstable&query=sca2d>
+  But it isn't packaged for nvim-lint and would need extra work.
+  */
+
+  defaultServers = ["openscad-lsp"];
+  servers = {
+    openscad-lsp = {
+      enable = true;
+      cmd = [(getExe pkgs.openscad-lsp) "--stdio"];
+      filetypes = ["openscad"];
+    };
+  };
+in {
+  options.vim.languages.openscad = {
+    enable = mkEnableOption "OpenSCAD language support";
+
+    lsp = {
+      enable =
+        mkEnableOption "OpenSCAD LSP support"
+        // {
+          default = config.vim.lsp.enable;
+          defaultText = literalExpression "config.vim.lsp.enable";
+        };
+
+      servers = mkOption {
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
+        description = "OpenSCAD LSP server to use";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.lsp.enable {
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
+    })
+  ]);
+}

modules/plugins/languages/php.nix

@@ -136,7 +136,7 @@ in {
           type = attrs;
           default = {
             type = "executable";
-            command = "${pkgs.nodePackages_latest.nodejs}/bin/node";
+            command = getExe pkgs.nodejs;
             args = [
               "${pkgs.vscode-extensions.xdebug.php-debug}/share/vscode/extensions/xdebug.php-debug/out/phpDebug.js"
             ];

modules/plugins/languages/svelte.nix

@@ -9,7 +9,7 @@
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
-  inherit (lib.types) enum package coercedTo;
+  inherit (lib.types) enum coercedTo;
   inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.generators) mkLuaInline;
@@ -60,7 +60,7 @@
     prettierPluginPath = "${prettierPlugin}/lib/node_modules/prettier-plugin-svelte/plugin.js";
   in {
     prettier = {
-      command = getExe pkgs.nodePackages.prettier;
+      command = getExe pkgs.prettier;
       options.ft_parsers.svelte = "svelte";
       prepend_args = ["--plugin=${prettierPluginPath}"];
     };
@@ -130,7 +130,12 @@ in {
     };
 
     format = {
-      enable = mkEnableOption "Svelte formatting" // {default = config.vim.languages.enableFormat;};
+      enable =
+        mkEnableOption "Svelte formatting"
+        // {
+          default = config.vim.languages.enableFormat;
+          defaultText = literalExpression "config.vim.languages.enableFormat";
+        };
 
       type = mkOption {
         type = formatType;
@@ -140,7 +145,12 @@ in {
     };
 
     extraDiagnostics = {
-      enable = mkEnableOption "extra Svelte diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
+      enable =
+        mkEnableOption "extra Svelte diagnostics"
+        // {
+          default = config.vim.languages.enableExtraDiagnostics;
+          defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
+        };
 
       types = diagnostics {
         langDesc = "Svelte";

modules/plugins/languages/terraform.nix

@@ -9,23 +9,43 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
   inherit (lib.types) enum listOf;
-  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.terraform;
 
-  defaultServers = ["terraformls"];
+  defaultServers = ["tofuls-tf"];
   servers = {
-    terraformls = {
+    terraformls-tf = {
       enable = true;
       cmd = [(getExe pkgs.terraform-ls) "serve"];
-      filetypes = ["terraform" "terraform-vars"];
+      filetypes = ["terraform" "terraform-vars" "tf"];
       root_markers = [".terraform" ".git"];
     };
+    tofuls-tf = {
+      enable = true;
+      cmd = [(getExe pkgs.tofu-ls) "serve"];
+      filetypes = ["terraform" "terraform-vars" "tf"];
+      root_markers = [".terraform" ".git"];
+    };
+  };
+
+  defaultFormat = ["tofu-fmt"];
+  formats = {
+    tofu-fmt = {
+      command = "${getExe pkgs.opentofu}";
+      args = ["fmt" "$FILENAME"];
+      stdin = false;
+    };
+    terraform-fmt = {
+      command = "${getExe pkgs.terraform}";
+      args = ["fmt" "$FILENAME"];
+      stdin = false;
+    };
   };
 in {
   options.vim.languages.terraform = {
-    enable = mkEnableOption "Terraform/HCL support";
+    enable = mkEnableOption "Terraform support";
 
     treesitter = {
       enable =
@@ -44,14 +64,28 @@ in {
           default = config.vim.lsp.enable;
           defaultText = literalExpression "config.vim.lsp.enable";
         };
-
       servers = mkOption {
         type = listOf (enum (attrNames servers));
         default = defaultServers;
         description = "Terraform LSP server to use";
       };
     };
+
+    format = {
+      enable =
+        mkEnableOption "Enable Terraform formatting"
+        // {
+          default = config.vim.languages.enableFormat;
+          defaultText = literalExpression "config.vim.languages.enableFormat";
+        };
+      type = mkOption {
+        type = listOf (enum (attrNames formats));
+        default = defaultFormat;
+        description = "Terraform formatter to use";
+      };
+    };
   };
+
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
@@ -59,12 +93,29 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (n: {
-          name = n;
-          value = servers.${n};
-        })
-        cfg.lsp.servers;
+      vim = {
+        lsp.servers =
+          mapListToAttrs (n: {
+            name = n;
+            value = servers.${n};
+          })
+          cfg.lsp.servers;
+      };
+    })
+
+    (mkIf cfg.format.enable {
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts = {
+          formatters_by_ft.terraform = cfg.format.type;
+          formatters =
+            mapListToAttrs (name: {
+              inherit name;
+              value = formats.${name};
+            })
+            cfg.format.type;
+        };
+      };
     })
   ]);
 }

modules/plugins/languages/tex.nix

@@ -0,0 +1,115 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.meta) getExe;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.options) literalExpression mkEnableOption mkOption;
+  inherit (lib.types) bool enum listOf;
+  inherit (lib.nvim.types) mkGrammarOption;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
+
+  cfg = config.vim.languages.tex;
+  defaultServers = ["texlab"];
+  servers = {
+    texlab = {
+      enable = true;
+      cmd = [(getExe pkgs.texlab) "run"];
+      filetypes = ["plaintex" "tex" "bib"];
+      root_markers = [".git" ".latexmkrc" "latexmkrc" ".texlabroot" "texlabroot" ".texstudio" "Tectonic.toml"];
+    };
+  };
+
+  defaultFormat = ["tex-fmt"];
+  formats = {
+    tex-fmt = {
+      command = getExe pkgs.tex-fmt;
+    };
+    latexindent = {
+      command = "${pkgs.texlive.withPackages (ps: [ps.latexindent])}/bin/latexindent";
+    };
+  };
+in {
+  options.vim.languages.tex = {
+    enable = mkEnableOption "TeX language support";
+
+    treesitter = {
+      enable = mkOption {
+        type = bool;
+        default = config.vim.languages.enableTreesitter;
+        defaultText = literalExpression "config.vim.languages.enableTreesitter";
+        description = "Enable TeX treesitter";
+      };
+      latexPackage = mkGrammarOption pkgs "latex";
+      bibtexPackage = mkGrammarOption pkgs "bibtex";
+    };
+
+    lsp = {
+      enable =
+        mkEnableOption "TeX LSP support"
+        // {
+          default = config.vim.lsp.enable;
+          defaultText = literalExpression "config.vim.lsp.enable";
+        };
+
+      servers = mkOption {
+        description = "TeX LSP server to use";
+        type = listOf (enum (attrNames servers));
+        default = defaultServers;
+      };
+    };
+
+    format = {
+      enable =
+        mkEnableOption "TeX formatting"
+        // {
+          default = config.vim.languages.enableFormat;
+          defaultText = literalExpression "config.vim.languages.enableFormat";
+        };
+
+      type = mkOption {
+        type = listOf (enum (attrNames formats));
+        default = defaultFormat;
+        description = "TeX formatter to use";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [
+        cfg.treesitter.latexPackage
+        cfg.treesitter.bibtexPackage
+      ];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.servers =
+        mapListToAttrs (n: {
+          name = n;
+          value = servers.${n};
+        })
+        cfg.lsp.servers;
+    })
+
+    (mkIf cfg.format.enable {
+      vim.formatter.conform-nvim = {
+        enable = true;
+        setupOpts = {
+          formatters_by_ft.tex = cfg.format.type;
+          formatters_by_ft.plaintex = cfg.format.type;
+          formatters =
+            mapListToAttrs (name: {
+              inherit name;
+              value = formats.${name};
+            })
+            cfg.format.type;
+        };
+      };
+    })
+  ]);
+}

modules/plugins/languages/ts.nix

@@ -120,6 +120,19 @@
         end
       '';
     };
+
+    tsgo = {
+      cmd = [(getExe pkgs.typescript-go) "--lsp" "--stdio"];
+      filetypes = [
+        "javascript"
+        "javascriptreact"
+        "javascript.jsx"
+        "typescript"
+        "typescriptreact"
+        "typescript.tsx"
+      ];
+      root_markers = ["tsconfig.json" "jsconfig.json" "package.json" ".git"];
+    };
   };
 
   denols_handlers = ''
@@ -186,6 +199,14 @@
     biome = {
       command = getExe pkgs.biome;
     };
+
+    biome-check = {
+      command = getExe pkgs.biome;
+    };
+
+    biome-organize-imports = {
+      command = getExe pkgs.biome;
+    };
   };
 
   # TODO: specify packages
@@ -208,6 +229,14 @@
         ];
       };
     };
+    biomejs = let
+      pkg = pkgs.biome;
+    in {
+      package = pkg;
+      config = {
+        cmd = getExe pkg;
+      };
+    };
   };
 in {
   _file = ./ts.nix;
@@ -321,7 +350,7 @@ in {
             # .tsx/.jsx files
             typescriptreact = cfg.format.type;
           };
-          setupOpts.formatters =
+          formatters =
             mapListToAttrs (name: {
               inherit name;
               value = formats.${name};

modules/plugins/notes/neorg/config.nix

@@ -4,9 +4,7 @@
   ...
 }: let
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.binds) pushDownDefault;
-  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.notes.neorg;
 in {
@@ -19,17 +17,21 @@ in {
           "nvim-nio"
           "pathlib-nvim"
           "plenary-nvim"
-          "neorg"
           "neorg-telescope"
         ];
 
+        lazy.plugins.neorg = {
+          package = "neorg";
+          setupModule = "neorg";
+          inherit (cfg) setupOpts;
+
+          ft = ["norg"];
+          cmd = ["Neorg"];
+        };
+
         binds.whichKey.register = pushDownDefault {
           "<leader>o" = "+Notes";
         };
-
-        pluginRC.neorg = entryAnywhere ''
-          require('neorg').setup(${toLuaObject cfg.setupOpts})
-        '';
       };
     }
 

modules/plugins/notes/obsidian/config.nix

@@ -5,22 +5,32 @@
 }: let
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.generators) mkLuaInline;
-  inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.notes.obsidian;
 in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = [
-        "obsidian-nvim"
         "vim-markdown"
         "tabular"
+        "plenary-nvim"
       ];
 
-      pluginRC.obsidian = entryAnywhere ''
-        require("obsidian").setup(${toLuaObject cfg.setupOpts})
-      '';
+      lazy.plugins.obsidian-nvim = {
+        package = "obsidian-nvim";
+        # NOTE: packaged plugin directory is `obsidian.nvim`; loading by the
+        # spec key (`obsidian-nvim`) misses and makes `require("obsidian")`
+        # resolve to a loader function via lzn-auto-require.
+        # I don't love this, but I can't think of anything better
+        load = ''
+          vim.cmd.packadd("obsidian.nvim")
+        '';
+        setupModule = "obsidian";
+        inherit (cfg) setupOpts;
+
+        ft = ["markdown"];
+        cmd = ["Obsidian"];
+      };
 
       notes.obsidian.setupOpts = let
         # may not be defined

modules/plugins/repl/conjure/conjure.nix

@@ -14,6 +14,32 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.startPlugins = [pkgs.vimPlugins.conjure];
+    vim.lazy.plugins.conjure = {
+      package = pkgs.vimPlugins.conjure;
+      ft = [
+        "clojure"
+        "fennel"
+        "janet"
+        "hy"
+        "julia"
+        "racket"
+        "scheme"
+        "lua"
+        "lisp"
+        "python"
+        "rust"
+        "sql"
+        "javascript"
+        "typescript"
+        "php"
+        "r"
+      ];
+      cmd = [
+        "ConjureSchool"
+        "ConjureEval"
+        "ConjureConnect"
+        "ConjureClientState"
+      ];
+    };
   };
 }

modules/plugins/theme/supported-themes.nix

@@ -37,6 +37,29 @@ in {
     '';
     styles = ["dark" "darker" "cool" "deep" "warm" "warmer"];
   };
+  gruber-darker = {
+    setup = _: ''
+      require('gruber-darker').setup({
+        -- defaults
+        bold = true,
+        invert = {
+          signs = false,
+          tabline = false,
+          visual = false,
+        },
+        italic = {
+          strings = true,
+          comments = true,
+          operators = false,
+          folds = true,
+        },
+        undercurl = true,
+        underline = true,
+      })
+      vim.cmd('colorscheme gruber-darker')
+    '';
+    styles = ["dark"];
+  };
 
   tokyonight = {
     setup = {

modules/plugins/treesitter/config.nix

@@ -54,10 +54,6 @@ in {
             callback = function()
               vim.wo[0][0].foldmethod = "expr"
               vim.wo[0][0].foldexpr = "v:lua.vim.treesitter.foldexpr()"
-              -- This is optional, but is set rather as a sane default.
-              -- If unset, opened files will be folded by automatically as
-              -- the files are opened
-              vim.o.foldenable = false
             end,
           })
         ''}

modules/plugins/utility/crazy-coverage/config.nix

@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) toLuaObject;
+  cfg = config.vim.utility.crazy-coverage;
+in {
+  config = mkIf cfg.enable {
+    vim.startPlugins = ["crazy-coverage"];
+
+    vim.pluginRC.crazy-coverage = entryAnywhere ''
+      require("crazy-coverage").setup(${toLuaObject cfg.setupOpts})
+    '';
+  };
+}

modules/plugins/utility/crazy-coverage/crazy-coverage.nix

@@ -0,0 +1,11 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.utility.crazy-coverage = {
+    enable = mkEnableOption "coverage for neovim";
+
+    setupOpts =
+      mkPluginSetupOption "crazy-coverage.nvim" {};
+  };
+}

modules/plugins/utility/crazy-coverage/default.nix

@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./crazy-coverage.nix
+    ./config.nix
+  ];
+}

modules/plugins/utility/default.nix

@@ -30,5 +30,6 @@
     ./yanky-nvim
     ./yazi-nvim
     ./undotree
+    ./crazy-coverage
   ];
 }

modules/plugins/utility/leetcode-nvim/config.nix

@@ -11,7 +11,6 @@ in {
     vim = {
       startPlugins = [
         "plenary-nvim"
-        "fzf-lua"
         "nui-nvim"
       ];
 

modules/wrapper/build/config.nix

@@ -24,7 +24,10 @@
     );
 
   # Build a given Treesitter grammar.
-  buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
+  buildTreesitterPlug = grammars:
+    vimPlugins.nvim-treesitter.withPlugins (
+      _: builtins.filter (g: g != null) grammars
+    );
 
   pluginBuilders = {
     nvim-treesitter = buildTreesitterPlug config.vim.treesitter.grammars;