From 0cf92db43befaf97d7afd29481baa87b315e0231 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Sat, 25 Apr 2026 12:20:35 +0300
Subject: [PATCH] Move package scripts into packages tree

- relocate Bun normalization helpers under `packages/scripts`
- update shared package build logic to use the new paths
- remove obsolete top-level package wrappers
---
 README.md                                              | 4 ++++
 nix/desktop-package.nix                                | 1 -
 nix/server-package.nix                                 | 1 -
 packages/common.nix                                    | 4 ++--
 {nix => packages}/scripts/canonicalize-node-modules.ts | 0
 {nix => packages}/scripts/normalize-bun-binaries.ts    | 0
 packages/server/default.nix                            | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 nix/desktop-package.nix
 delete mode 100644 nix/server-package.nix
 rename {nix => packages}/scripts/canonicalize-node-modules.ts (100%)
 rename {nix => packages}/scripts/normalize-bun-binaries.ts (100%)

diff --git a/README.md b/README.md
index 4684f1c..f74bd43 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,9 @@ nix flake show --all-systems
 ├── README.md
 └── packages
     ├── common.nix
+    ├── scripts
+    │   ├── canonicalize-node-modules.ts
+    │   └── normalize-bun-binaries.ts
     ├── desktop
     │   ├── build-nix-desktop-package.mjs
     │   ├── default.nix
@@ -71,6 +74,7 @@ nix flake show --all-systems
 ## Notes
 
 - `packages/common.nix` contains the shared Bun workspace and `node-pty` setup used by both packages.
+- `packages/scripts/*.ts` contains the Bun install-tree normalization helpers used by `packages/common.nix`.
 - `packages/desktop/build-nix-desktop-package.mjs` is local packaging glue carried by this repo.
 - `packages/desktop/desktop-nix-autoupdate.patch` is a downstream patch for desktop auto-update messaging in package-managed installs.
 - Upstream source is pinned in `flake.lock` via the `t3code` input.
diff --git a/nix/desktop-package.nix b/nix/desktop-package.nix
deleted file mode 100644
index aa82d79..0000000
--- a/nix/desktop-package.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ../packages/desktop
diff --git a/nix/server-package.nix b/nix/server-package.nix
deleted file mode 100644
index f00e65a..0000000
--- a/nix/server-package.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ../packages/server
diff --git a/packages/common.nix b/packages/common.nix
index ce1fc2c..c9f2c57 100644
--- a/packages/common.nix
+++ b/packages/common.nix
@@ -70,8 +70,8 @@ in {
           --no-progress \
 ${renderBunFilters filters}
 
-        bun --bun ${../nix/scripts/canonicalize-node-modules.ts}
-        bun --bun ${../nix/scripts/normalize-bun-binaries.ts}
+        bun --bun ${./scripts/canonicalize-node-modules.ts}
+        bun --bun ${./scripts/normalize-bun-binaries.ts}
 
         runHook postBuild
       '';
diff --git a/nix/scripts/canonicalize-node-modules.ts b/packages/scripts/canonicalize-node-modules.ts
similarity index 100%
rename from nix/scripts/canonicalize-node-modules.ts
rename to packages/scripts/canonicalize-node-modules.ts
diff --git a/nix/scripts/normalize-bun-binaries.ts b/packages/scripts/normalize-bun-binaries.ts
similarity index 100%
rename from nix/scripts/normalize-bun-binaries.ts
rename to packages/scripts/normalize-bun-binaries.ts
diff --git a/packages/server/default.nix b/packages/server/default.nix
index d89636d..772fccd 100644
--- a/packages/server/default.nix
+++ b/packages/server/default.nix
@@ -92,7 +92,7 @@ in
     '';
 
     meta = {
-      description = "t3 code web/server app";
+      description = "T3 Code web/server app";
       homepage = "https://github.com/pingdotgg/t3code";
       license = lib.licenses.mit;
       mainProgram = "t3";