wrapModule: output module instead of wrapper, move wrapper to module

Author: Lassulus

README.md

@@ -23,10 +23,10 @@ This library provides two main components:
 ```nix
 {
   inputs.wrappers.url = "github:lassulus/wrappers";
-  
+
   outputs = { self, nixpkgs, wrappers }: {
-    packages.x86_64-linux.default = 
-      wrappers.wrapperModules.mpv.apply {
+    packages.x86_64-linux.default =
+      (wrappers.wrapperModules.mpv.apply {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         scripts = [ pkgs.mpvScripts.mpris ];
         "mpv.conf".content = ''
@@ -37,7 +37,7 @@ This library provides two main components:
           WHEEL_UP seek 10
           WHEEL_DOWN seek -10
         '';
-      };
+      }).wrapper;
   };
 }
 ```
@@ -132,7 +132,8 @@ The function:
 Creates a reusable wrapper module with:
 - Type-safe configuration options via the module system
 - `options`: Exposed options for documentation generation
-- `apply`: Function to instantiate the wrapper with settings
+- `apply`: Function to instantiate the wrapper with settings, returning a config object
+  - Access the wrapped package via the `wrapper` attribute of the returned config
 
 Built-in options (always available):
 - `pkgs`: nixpkgs instance (required)
@@ -144,6 +145,8 @@ Built-in options (always available):
 - `env`: Environment variables
 - `passthru`: Additional passthru attributes
 - `filesToPatch`: List of file paths (glob patterns) to patch for self-references (default: `["share/applications/*.desktop"]`)
+- `filesToExclude`: List of file paths (glob patterns) to exclude from the wrapped package (default: `[]`)
+- `wrapper`: The resulting wrapped package (read-only, auto-generated from other options)
 
 Custom types:
 - `wlib.types.file`: File type with `content` and `path` options
@@ -165,7 +168,7 @@ The wrapper module system integrates with NixOS module evaluation:
 Wraps mpv with configuration file support and script management:
 
 ```nix
-wrappers.wrapperModules.mpv.apply {
+(wrappers.wrapperModules.mpv.apply {
   pkgs = pkgs;
   scripts = [ pkgs.mpvScripts.mpris pkgs.mpvScripts.thumbnail ];
   "mpv.conf".content = ''
@@ -179,15 +182,15 @@ wrappers.wrapperModules.mpv.apply {
   extraFlags = {
     "--save-position-on-quit" = {};
   };
-}
+}).wrapper
 ```
 
 ### notmuch Module
 
 Wraps notmuch with INI-based configuration:
 
 ```nix
-wrappers.wrapperModules.notmuch.apply {
+(wrappers.wrapperModules.notmuch.apply {
   pkgs = pkgs;
   config = {
     database = {
@@ -199,7 +202,7 @@ wrappers.wrapperModules.notmuch.apply {
       primary_email = "john@example.com";
     };
   };
-}
+}).wrapper
 ```
 
 ## Long-term Goals

checks/flags-module.nix

@@ -15,7 +15,7 @@ let
     }
   );
 
-  wrappedPackage = helloModule.apply { inherit pkgs; };
+  wrappedPackage = (helloModule.apply { inherit pkgs; }).wrapper;
 
 in
 pkgs.runCommand "module-flags-test" { } ''

checks/module-filesToExclude.nix

@@ -58,7 +58,7 @@ let
     ];
   };
 
-  wrappedPackage = testModule.apply { inherit pkgs; };
+  wrappedPackage = (testModule.apply { inherit pkgs; }).wrapper;
 
 in
 pkgs.runCommand "module-filesToExclude-test" { } ''

lib.nix

@@ -59,7 +59,7 @@ let
       # This will return a derivation that wraps the hello package with the --greeting flag set to "hi".
   */
   wrapModule =
-    packageInterface:
+    moduleInterface:
     let
       wrapperLib = {
         types = {
@@ -180,6 +180,27 @@ let
                   Example: [ "bin/unwanted-tool" "share/applications/*.desktop" ]
                 '';
               };
+              wrapper = lib.mkOption {
+                type = lib.types.package;
+                readOnly = true;
+                description = ''
+                  The wrapped package created by wrapPackage. This wraps the configured package
+                  with the specified flags, environment variables, runtime dependencies, and other
+                  options in a portable way.
+                '';
+                default = wrapPackage {
+                  pkgs = config.pkgs;
+                  package = config.package;
+                  runtimeInputs = config.extraPackages;
+                  flags = config.flags;
+                  flagSeparator = config.flagSeparator;
+                  args = config.args;
+                  env = config.env;
+                  filesToPatch = config.filesToPatch;
+                  filesToExclude = config.filesToExclude;
+                  passthru = config.passthru;
+                };
+              };
             };
           }
         )
@@ -193,7 +214,7 @@ let
               {
                 options.interface = lib.mkOption {
                   type = lib.types.deferredModule;
-                  default = packageInterface;
+                  default = moduleInterface;
                 };
                 options.settings = lib.mkOption {
                   type = lib.types.deferredModule;
@@ -231,21 +252,7 @@ let
           configuration = eval settings;
           config = configuration.config.result.config;
         in
-        wrapPackage {
-          pkgs = config.pkgs;
-          package = config.package;
-          runtimeInputs = config.extraPackages;
-          flags = config.flags;
-          flagSeparator = config.flagSeparator;
-          args = config.args;
-          env = config.env;
-          filesToPatch = config.filesToPatch;
-          filesToExclude = config.filesToExclude;
-          passthru = {
-            inherit configuration settings;
-          }
-          // config.passthru;
-        };
+        config;
     };
 
   /**

modules/helix/check.nix

@@ -4,9 +4,10 @@
 }:
 
 let
-  helixWrapped = self.wrapperModules.helix.apply {
-    inherit pkgs;
-  };
+  helixWrapped =
+    (self.wrapperModules.helix.apply {
+      inherit pkgs;
+    }).wrapper;
 
 in
 pkgs.runCommand "helix-test" { } ''

modules/mpv/check.nix

@@ -4,13 +4,14 @@
 }:
 
 let
-  mpvWrapped = self.wrapperModules.mpv.apply {
-    inherit pkgs;
-    "mpv.conf".content = ''
-      ao=null
-      vo=null
-    '';
-  };
+  mpvWrapped =
+    (self.wrapperModules.mpv.apply {
+      inherit pkgs;
+      "mpv.conf".content = ''
+        ao=null
+        vo=null
+      '';
+    }).wrapper;
 
 in
 pkgs.runCommand "mpv-test" { } ''

modules/notmuch/check.nix

@@ -4,12 +4,13 @@
 }:
 
 let
-  notmuchWrapped = self.wrapperModules.notmuch.apply {
-    inherit pkgs;
-    settings = {
-      database.path = "/tmp/test-mail";
-    };
-  };
+  notmuchWrapped =
+    (self.wrapperModules.notmuch.apply {
+      inherit pkgs;
+      settings = {
+        database.path = "/tmp/test-mail";
+      };
+    }).wrapper;
 
 in
 pkgs.runCommand "notmuch-test" { } ''