Full rewrite with separate architechture and modular modules

default.nix

@@ -1,21 +1,27 @@
 let
+  overlays.default =
+    final: prev:
+    prev.lib.packagesFromDirectoryRecursive {
+      inherit (final) callPackage;
+      directory = ./pkgs;
+    };
+
   eval =
     {
       pkgs,
-      lib ? pkgs.lib,
       modules ? [ ],
       specialArgs ? { },
     }:
-    lib.evalModules {
-      modules = [
-        ./modules/many-wrappers.nix
-      ] ++ modules;
+    pkgs.lib.evalModules {
+      modules = [ ./modules ] ++ modules;
       specialArgs = {
-        inherit pkgs;
-      } // specialArgs;
+        pkgs = pkgs.extend overlays.default;
+      }
+      // specialArgs;
     };
 in
 {
+  inherit overlays;
   lib = {
     inherit eval;
     __functor = _: eval;
@@ -24,10 +30,11 @@ in
       (pkgs.lib.evalModules {
         modules = [
           ./modules/wrapper.nix
+          pkgs.mkWrapper.modules.wrapped
           module
         ];
         specialArgs = {
-          inherit pkgs;
+          pkgs = pkgs.extend overlays.default;
         };
       }).config.wrapped;
   };

docs/api.md

@@ -14,12 +14,16 @@ import { RenderDocs } from "easy-nix-documentation";
 
 ## Main API
 
-<RenderDocs :options="data" :exclude="[/^_module\.args$/, /^build\.*/, /programs/]"  />
+<RenderDocs :options="data" :exclude="[/^_module\.args$/, /^build\.*/, /programs/, /^\<imports = \[ .* \]\>/]"  />
 
 ## Program configuration
 
 <RenderDocs :options="data" :include="[/programs/]" />
 
+## Modular modules
+
+<RenderDocs :options="data" :include="[/^\<imports = \[ .* \]\>/]" />
+
 ## Outputs
 
 <RenderDocs :options="data" :include="/^build\.*/" />

docs/modular-modules.nix

@@ -0,0 +1,40 @@
+# https://github.com/NixOS/nixpkgs/blob/52c032768a8bd0c7a23fdad4232e50a2962079c2/nixos/modules/misc/documentation/modular-services.nix
+{ lib, pkgs, ... }:
+let
+  fakeSubmodule =
+    module:
+    lib.mkOption {
+      type = lib.types.submodule [
+        module
+        {
+          _file = ../modules;
+          options.wrappers =
+            lib.mapAttrs
+              (
+                name: _:
+                lib.mkOption {
+                  type = lib.types.submodule ../modules/wrapper.nix;
+                  description = "Wrapper created by option `${name}`.";
+                }
+              )
+              (lib.evalModules {
+                modules = [
+                  module
+                  {
+                    options.wrappers = lib.mkOption {
+                      type = lib.types.attrsOf (lib.types.submodule ../modules/wrapper.nix);
+                    };
+                  }
+                ];
+              }).config.wrappers;
+        }
+      ];
+      description = "This is a modular module (inspired by [modular service](https://nixos.org/manual/nixos/unstable/#modular-services)), which can be imported into a wrapper-manager configuration using the `wrappers` option.";
+    };
+
+  modularModulesModule = {
+    _file = "${__curPos.file}#L${toString __curPos.line}";
+    options = { };
+  };
+in
+modularModulesModule

docs/package.nix

@@ -9,10 +9,19 @@ let
   options_json =
     (nixosOptionsDoc {
       options =
-        ((import ../.).lib {
-          inherit pkgs;
-          modules = [ ];
-        }).options;
+        lib.recursiveUpdate
+          ((import ../.).lib {
+            inherit pkgs;
+            modules = [ ./modular-modules.nix ];
+          }).options
+          {
+            wrappers.type = lib.types.attrsOf (
+              lib.types.submodule [
+                ../modules/wrapper.nix
+                (pkgs.extend (import ../.).overlays.default).mkWrapper.modules.wrapped
+              ]
+            );
+          };
     }).optionsJSON;
 in
 buildNpmPackage {
@@ -25,7 +34,7 @@ buildNpmPackage {
   inherit (importNpmLock) npmConfigHook;
 
   env.WRAPPER_MANAGER_OPTIONS_JSON = options_json;
-  passthru = {inherit options_json;};
+  passthru = { inherit options_json; };
 
   buildPhase = ''
     runHook preBuild

docs/readme.md

@@ -172,6 +172,11 @@ https://github.com/viperML/wrapper-manager/issues
 
 ## Changelog
 
+- 2025-09-20
+  - Full rewrite
+  - `env` has been renamed to `envVars`
+  - `flags` and `wrapFlags` has been removed
+
 - 2025-06-19
   - Full rewrite
   - `flags` has been removed in favor of `prependFlags`