wip: simplifying tools handling in buildRig via coercedTo

Author: YPares

lib/buildRig.nix

@@ -78,11 +78,7 @@ let
     riglet.meta
     // {
       # Add computed command names to each riglet's metadata
-      commandNames =
-        let
-          normalized = normalizeTools riglet.tools;
-        in
-        map getToolMainProgramName (normalized.wrapped ++ normalized.unwrapped);
+      commandNames = map getToolMainProgramName (riglet.tools.wrapped ++ riglet.tools.unwrapped);
     }
   ) evaluated.config.riglets;
 
@@ -92,32 +88,10 @@ let
     paths = map (riglet: riglet.configFiles) (attrValues evaluated.config.riglets);
   };
 
-  normalizeTools =
-    tools:
-    let
-      # Normalize a tool item: if it's a path, wrap it with wrapScriptPath; otherwise return as-is
-      normalizeOne = tool: if builtins.isPath tool then riglib.wrapScriptPath tool else tool;
-    in
-    if builtins.isList tools then
-      {
-        wrapped = map normalizeOne tools;
-        unwrapped = [ ];
-      }
-    else
-      {
-        wrapped = map normalizeOne tools.wrapped;
-        unwrapped = map normalizeOne tools.unwrapped;
-      };
-
-  accumRigletTools =
-    acc: riglet:
-    let
-      normalized = normalizeTools riglet.tools;
-    in
-    {
-      wrapped = acc.wrapped ++ normalized.wrapped;
-      unwrapped = acc.unwrapped ++ normalized.unwrapped;
-    };
+  accumRigletTools = acc: riglet: {
+    wrapped = acc.wrapped ++ riglet.tools.wrapped;
+    unwrapped = acc.unwrapped ++ riglet.tools.unwrapped;
+  };
 
   wrapWithConfigHome =
     tools:

lib/rigletSchema.nix

@@ -1,36 +1,38 @@
 # rigup flake's self
-_flake:
+flake:
 # Base module that defines common riglet structure
 { pkgs, ... }:
 with pkgs.lib;
 let
-  packageLike = types.oneOf [
-    types.package
-    types.path
-  ];
+  riglib = flake.lib.mkRiglib { inherit pkgs; };
+
+  packageLike = types.coercedTo types.path riglib.wrapScriptPath types.package;
 
   packageList = types.listOf packageLike;
 
-  toolset = types.oneOf [
-    # If just a list of packages is given as a toolset, these tools are considered _wrapped_:
-    packageList
-    # Else, for more explicit control over which tools should be wrapped and which should not,
-    # the toolset can be given as a { wrapped = [...]; unwrapped [...]; } attrset:
-    (types.submodule {
-      options = {
-        wrapped = mkOption {
-          description = "Tools that should be wrapped to use the rig's isolated XDG_CONFIG_HOME";
-          type = packageList;
-          default = [ ];
-        };
-        unwrapped = mkOption {
-          description = "Tools that must directly use the user's XDG_CONFIG_HOME";
-          type = packageList;
-          default = [ ];
-        };
-      };
-    })
-  ];
+  toolset =
+    types.coercedTo
+      # If just a list of packages is given as a toolset, these tools are considered _wrapped_:
+      packageList
+      (x: { wrapped = x; })
+      # Else, for more explicit control over which tools should be wrapped and which should not,
+      # the toolset can be given as a { wrapped = [...]; unwrapped [...]; } attrset:
+      (
+        types.submodule {
+          options = {
+            wrapped = mkOption {
+              description = "Tools that should be wrapped to use the rig's isolated XDG_CONFIG_HOME";
+              type = packageList;
+              default = [ ];
+            };
+            unwrapped = mkOption {
+              description = "Tools that must directly use the user's XDG_CONFIG_HOME";
+              type = packageList;
+              default = [ ];
+            };
+          };
+        }
+      );
 
   localMcpServer = types.submodule {
     options.command = mkOption {
@@ -238,7 +240,7 @@ in
         Optional entrypoint for the rig. Only ONE riglet in a rig should define this.
         Takes the rig attrset and should return a folder derivation with a SINGLE bin/xxx executable (e.g. via pkgs.writeShellScriptBin).
       '';
-      type = types.nullOr (types.functionTo packageLike);
+      type = types.nullOr (types.functionTo types.package);
       default = null;
     };