lib/modules: init with specialArgs helpers

docs/default.nix

@@ -40,6 +40,8 @@ let
     pkgs = pkgsDoc;
   };
 
+  inherit (helpers.modules) specialArgs;
+
   nixvimPath = toString ./..;
 
   gitHubDeclaration = user: repo: branch: subpath: {
@@ -75,16 +77,7 @@ let
 
   options-json =
     (pkgsDoc.nixosOptionsDoc {
-      inherit
+      inherit (lib.evalModules { inherit modules specialArgs; }) options;
-        (lib.evalModules {
-          inherit modules;
-          specialArgs = {
-            inherit helpers;
-            defaultPkgs = pkgsDoc;
-          };
-        })
-        options
-        ;
       inherit transformOptions;
       warningsAreErrors = false;
     }).optionsJSON;
@@ -113,10 +106,10 @@ in
     # > sandbox-exec: pattern serialization length 69298 exceeds maximum (65535)
     docs = pkgsDoc.callPackage ./mdbook {
       inherit
-        helpers
         modules
         hmOptions
         transformOptions
+        specialArgs
         ;
       # TODO: Find how to handle stable when 24.11 lands
       search = mkSearch "/nixvim/search/";

docs/mdbook/default.nix

@@ -2,21 +2,15 @@
   pkgs,
   lib,
   modules,
-  helpers,
   nixosOptionsDoc,
   transformOptions,
   hmOptions,
   search,
+  specialArgs,
 }:
 with lib;
 let
-  options = lib.evalModules {
+  options = lib.evalModules { inherit modules specialArgs; };
-    inherit modules;
-    specialArgs = {
-      inherit helpers;
-      defaultPkgs = pkgs;
-    };
-  };
 
   inherit (options.config.meta) nixvimInfo;
 

lib/helpers.nix

@@ -20,6 +20,7 @@ let
     extendedLib = call ./extend-lib.nix { inherit lib; };
     keymaps = call ./keymap-helpers.nix { };
     lua = call ./to-lua.nix { };
+    modules = call ./modules.nix { };
     neovim-plugin = call ./neovim-plugin.nix { };
     nixvimTypes = call ./types.nix { };
     options = call ./options.nix { };

lib/modules.nix

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  lib,
+  helpers,
+}:
+rec {
+  # Minimal specialArgs required to evaluate nixvim modules
+  specialArgs = specialArgsWith { };
+
+  # Build specialArgs for evaluating nixvim modules
+  specialArgsWith =
+    extraSpecialArgs:
+    {
+      # TODO: deprecate `helpers`
+      inherit lib helpers;
+      defaultPkgs = pkgs;
+    }
+    // extraSpecialArgs;
+}

modules/top-level/files/default.nix

@@ -3,7 +3,7 @@
   config,
   options,
   lib,
-  helpers,
+  specialArgs,
   ...
 }:
 let
@@ -11,10 +11,7 @@ let
 
   fileModuleType = types.submoduleWith {
     shorthandOnlyDefinesConfig = true;
-    specialArgs = {
+    inherit specialArgs;
-      inherit helpers;
-      defaultPkgs = pkgs;
-    };
     # Don't include the modules in the docs, as that'd be redundant
     modules = lib.optionals (!config.isDocs) [
       ../../.

wrappers/darwin.nix

@@ -23,12 +23,7 @@ in
       default = { };
       type = types.submoduleWith {
         shorthandOnlyDefinesConfig = true;
-        specialArgs = {
+        specialArgs = config.lib.nixvim.modules.specialArgsWith { darwinConfig = config; };
-          darwinConfig = config;
-          defaultPkgs = pkgs;
-          helpers = config.lib.nixvim;
-          lib = config.lib.nixvim.extendedLib;
-        };
         modules = [
           ./modules/darwin.nix
           ../modules/top-level

wrappers/hm.nix

@@ -22,12 +22,7 @@ in
       default = { };
       type = types.submoduleWith {
         shorthandOnlyDefinesConfig = true;
-        specialArgs = {
+        specialArgs = config.lib.nixvim.modules.specialArgsWith { hmConfig = config; };
-          hmConfig = config;
-          defaultPkgs = pkgs;
-          helpers = config.lib.nixvim;
-          lib = config.lib.nixvim.extendedLib;
-        };
         modules = [
           ./modules/hm.nix
           ../modules/top-level

wrappers/nixos.nix

@@ -23,12 +23,7 @@ in
       default = { };
       type = types.submoduleWith {
         shorthandOnlyDefinesConfig = true;
-        specialArgs = {
+        specialArgs = config.lib.nixvim.modules.specialArgsWith { nixosConfig = config; };
-          nixosConfig = config;
-          defaultPkgs = pkgs;
-          helpers = config.lib.nixvim;
-          lib = config.lib.nixvim.extendedLib;
-        };
         modules = [
           ./modules/nixos.nix
           ../modules/top-level

wrappers/standalone.nix

@@ -1,15 +1,16 @@
 default_pkgs: self:
 {
   pkgs ? default_pkgs,
+  lib ? pkgs.lib,
   extraSpecialArgs ? { },
   _nixvimTests ? false,
   module,
 }:
 let
-  inherit (pkgs) lib;
-
   helpers = import ../lib/helpers.nix { inherit pkgs lib _nixvimTests; };
 
+  inherit (helpers.modules) specialArgsWith;
+
   handleAssertions =
     config:
     let
@@ -29,11 +30,7 @@ let
           ./modules/standalone.nix
           ../modules/top-level
         ];
-        specialArgs = {
+        specialArgs = specialArgsWith extraSpecialArgs;
-          inherit helpers;
-          lib = helpers.extendedLib;
-          defaultPkgs = pkgs;
-        } // extraSpecialArgs;
       };
       config = handleAssertions evaledModule.config;
     in