nix: collapse tools into single package

README.md

@@ -677,6 +677,7 @@ home-manager switch --rollback  # revert
 | --- | --- |
 | `clawdbot` (default) | macOS: gateway + app + tools · Linux: gateway + tools (headless) |
 | `clawdbot-gateway` | Gateway CLI only |
+| `clawdbot-tools` | Toolchain bundle (gateway helpers + CLIs) |
 | `clawdbot-app` | macOS app only |
 | `clawdbot-docker` | OCI image tarball (gateway + tools) |
 | `clawdbot-docker-stream` | OCI image stream (fast load) |

docs/rfc/2026-01-02-declarative-clawdbot-nix.md

@@ -66,8 +66,7 @@ Non‑goals:
   - `packages.<system>.clawdbot` (default batteries‑included bundle)
   - `packages.<system>.clawdbot-gateway`
   - `packages.<system>.clawdbot-app`
-  - `packages.<system>.clawdbot-tools-base`
-  - `packages.<system>.clawdbot-tools-extended`
+  - `packages.<system>.clawdbot-tools`
   - `homeManagerModules.clawdbot`
   - `darwinModules.clawdbot` (if needed)
 
@@ -135,4 +134,3 @@ This RFC is complete when:
 - App DMG pinned to `v2.0.0-beta4`.
 - Batteries‑included package output is wired in the flake.
 - README is the single onboarding source.
-

nix/images/clawdbot-docker.nix

@@ -7,7 +7,7 @@ let
     dontUnpack = true;
     installPhase = "${../scripts/docker-entrypoint-install.sh}";
   };
-  toolsBase = pkgs.clawdbot-tools-base;
+  toolsBase = pkgs.clawdbot-tools;
   baseContents = [
     pkgs.bash
     pkgs.coreutils

nix/packages/default.nix

@@ -13,22 +13,17 @@ let
     pnpmDepsHash = sourceInfo.pnpmDepsHash or null;
   };
   clawdbotApp = if isDarwin then pkgs.callPackage ./clawdbot-app.nix { } else null;
-  clawdbotToolsBase = pkgs.buildEnv {
-    name = "clawdbot-tools-base";
-    paths = toolSets.base;
-  };
-  clawdbotToolsExtended = pkgs.buildEnv {
-    name = "clawdbot-tools-extended";
-    paths = toolSets.extended;
+  clawdbotTools = pkgs.buildEnv {
+    name = "clawdbot-tools";
+    paths = toolSets.tools;
   };
   clawdbotBundle = pkgs.callPackage ./clawdbot-batteries.nix {
     clawdbot-gateway = clawdbotGateway;
     clawdbot-app = clawdbotApp;
-    extendedTools = toolSets.base;
+    extendedTools = toolSets.tools;
   };
 in {
   clawdbot-gateway = clawdbotGateway;
   clawdbot = clawdbotBundle;
-  clawdbot-tools-base = clawdbotToolsBase;
-  clawdbot-tools-extended = clawdbotToolsExtended;
+  clawdbot-tools = clawdbotTools;
 } // (if isDarwin then { clawdbot-app = clawdbotApp; } else {})

nix/tools/extended.nix

@@ -25,7 +25,7 @@ let
     "ripgrep"
   ];
 
-  extendedNames = baseNames ++ [
+  extraNames = [
     "go"
     "uv"
     "openai-whisper"
@@ -48,8 +48,8 @@ let
     "qmd"
     "nano-pdf"
   ];
+  toolNames = baseNames ++ extraNames;
 
 in {
-  base = ensure baseNames;
-  extended = ensure extendedNames;
+  tools = ensure toolNames;
 }