standalone: pass extraSpecialArgs to lib.evalModules directly (#914)

tests/extra-args.nix

@@ -2,14 +2,26 @@
   makeNixvimWithModule,
   pkgs,
 }: let
+  defaultModule = {regularArg, ...}: {
+    extraConfigLua = ''
+      -- regularArg=${regularArg}
+    '';
+  };
   generated = makeNixvimWithModule {
-    module = {importedArgument, ...}: {
+    module = {
-      extraConfigLua = ''
+      regularArg,
-        -- importedArgument=${importedArgument}
+      extraModule,
-      '';
+      ...
+    }: {
+      _module.args = {regularArg = "regularValue";};
+      imports = [defaultModule extraModule];
     };
     extraSpecialArgs = {
-      importedArgument = "foobar";
+      extraModule = {
+        extraConfigLua = ''
+          -- specialArg=specialValue
+        '';
+      };
     };
   };
 in
@@ -17,8 +29,12 @@ in
     printConfig = "${generated}/bin/nixvim-print-init";
   } ''
     config=$($printConfig)
-    if ! "$printConfig" | grep -- '-- importedArgument=foobar'; then
+    if ! "$printConfig" | grep -- '-- regularArg=regularValue'; then
-      echo "Missing importedArgument in config"
+      echo "Missing regularArg in config"
+      exit 1
+    fi
+    if ! "$printConfig" | grep -- '-- specialArg=specialValue'; then
+      echo "Missing specialArg in config"
       exit 1
     fi
 

wrappers/standalone.nix

@@ -16,7 +16,8 @@ default_pkgs: {
   };
 
   eval = lib.evalModules {
-    modules = [module wrap {_module.args = extraSpecialArgs;}] ++ shared.topLevelModules;
+    modules = [module wrap] ++ shared.topLevelModules;
+    specialArgs = extraSpecialArgs;
   };
 
   handleAssertions = config: let