From d13dbbaedd60dd48b0ce1e8f3996d15a88ceb288 Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Sat, 25 Apr 2026 12:49:38 +0300
Subject: [PATCH] Rename package directories to match t3code outputs

- Move server and desktop Nix packages under `packages/t3code-*`
- Update flake outputs and README references to the new names
---
 README.md                                     | 38 +++++++++----------
 flake.nix                                     | 22 +++++------
 .../build-nix-desktop-package.mjs             |  0
 .../{desktop => t3code-desktop}/default.nix   |  0
 .../desktop-nix-autoupdate.patch              |  0
 .../{server => t3code-server}/default.nix     |  0
 6 files changed, 29 insertions(+), 31 deletions(-)
 rename packages/{desktop => t3code-desktop}/build-nix-desktop-package.mjs (100%)
 rename packages/{desktop => t3code-desktop}/default.nix (100%)
 rename packages/{desktop => t3code-desktop}/desktop-nix-autoupdate.patch (100%)
 rename packages/{server => t3code-server}/default.nix (100%)

diff --git a/README.md b/README.md
index f74bd43..448b180 100644
--- a/README.md
+++ b/README.md
@@ -8,35 +8,29 @@ This repository does not rely on upstream Nix packaging. It fetches the upstream
 
 For each supported system, the flake exports:
 
-- `packages.<system>.t3code-server`
-- `packages.<system>.t3code-desktop`
-- `packages.<system>.default`
-- `apps.<system>.t3code-server`
-- `apps.<system>.t3code-desktop`
 - `apps.<system>.default`
-- `checks.<system>.t3code-server`
+- `apps.<system>.t3code-desktop`
+- `apps.<system>.t3code-server`
+- `packages.<system>.default`
+- `packages.<system>.t3code-desktop`
+- `packages.<system>.t3code-server`
 - `checks.<system>.t3code-desktop`
+- `checks.<system>.t3code-server`
 
-Current `default` points to the desktop package/app.
+Current `default` points to the `t3code-desktop`.
 
 ## Usage
 
-Build the server package:
-
-```bash
-nix build .#t3code-server
-```
-
 Build the desktop package:
 
 ```bash
 nix build .#t3code-desktop
 ```
 
-Run the server app:
+Build the server package:
 
 ```bash
-nix run .#t3code-server
+nix build .#t3code-server
 ```
 
 Run the desktop app:
@@ -45,6 +39,12 @@ Run the desktop app:
 nix run .#t3code-desktop
 ```
 
+Run the server app:
+
+```bash
+nix run .#t3code-server
+```
+
 Inspect the flake surface:
 
 ```bash
@@ -63,11 +63,11 @@ nix flake show --all-systems
     ├── scripts
     │   ├── canonicalize-node-modules.ts
     │   └── normalize-bun-binaries.ts
-    ├── desktop
+    ├── t3code-desktop
     │   ├── build-nix-desktop-package.mjs
     │   ├── default.nix
     │   └── desktop-nix-autoupdate.patch
-    └── server
+    └── t3code-server
         └── default.nix
 ```
 
@@ -75,6 +75,6 @@ nix flake show --all-systems
 
 - `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.
+- `packages/t3code-desktop/build-nix-desktop-package.mjs` is local packaging glue carried by this repo.
+- `packages/t3code-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/flake.nix b/flake.nix
index 9f4c8c0..cca9253 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,10 +3,8 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
-    t3code = {
-      url = "github:pingdotgg/t3code";
-      flake = false;
-    };
+    t3code.url = "github:pingdotgg/t3code";
+    t3code.flake = false;
   };
 
   outputs = {
@@ -27,30 +25,30 @@
     packages = forAllSystems (
       system: let
         pkgs = import nixpkgs {inherit system;};
-        t3code-server = pkgs.callPackage ./packages/server {src = t3code;};
-        t3code-desktop = pkgs.callPackage ./packages/desktop {src = t3code;};
+        t3code-desktop = pkgs.callPackage ./packages/t3code-desktop {src = t3code;};
+        t3code-server = pkgs.callPackage ./packages/t3code-server {src = t3code;};
       in {
-        inherit t3code-server t3code-desktop;
+        inherit t3code-desktop t3code-server;
         default = t3code-desktop;
       }
     );
 
     apps = forAllSystems (system: rec {
-      t3code-server = {
-        type = "app";
-        program = lib.getExe self.packages.${system}.t3code-server;
-      };
       t3code-desktop = {
         type = "app";
         program = lib.getExe self.packages.${system}.t3code-desktop;
       };
+      t3code-server = {
+        type = "app";
+        program = lib.getExe self.packages.${system}.t3code-server;
+      };
       default = t3code-desktop;
     });
 
     checks = forAllSystems (
       system: {
-        t3code-server = self.packages.${system}.t3code-server;
         t3code-desktop = self.packages.${system}.t3code-desktop;
+        t3code-server = self.packages.${system}.t3code-server;
       }
     );
   };
diff --git a/packages/desktop/build-nix-desktop-package.mjs b/packages/t3code-desktop/build-nix-desktop-package.mjs
similarity index 100%
rename from packages/desktop/build-nix-desktop-package.mjs
rename to packages/t3code-desktop/build-nix-desktop-package.mjs
diff --git a/packages/desktop/default.nix b/packages/t3code-desktop/default.nix
similarity index 100%
rename from packages/desktop/default.nix
rename to packages/t3code-desktop/default.nix
diff --git a/packages/desktop/desktop-nix-autoupdate.patch b/packages/t3code-desktop/desktop-nix-autoupdate.patch
similarity index 100%
rename from packages/desktop/desktop-nix-autoupdate.patch
rename to packages/t3code-desktop/desktop-nix-autoupdate.patch
diff --git a/packages/server/default.nix b/packages/t3code-server/default.nix
similarity index 100%
rename from packages/server/default.nix
rename to packages/t3code-server/default.nix