From b9913d968b1f32f31618130f01ca2daa4f834d57 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Wed, 9 Sep 2026 14:06:21 -0700
Subject: [PATCH] Add codex-acp overlay

---
 nix/flake.nix              |  2 ++
 nix/overlays/codex-acp.nix |  3 +++
 nix/packages/codex-acp.nix | 25 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 nix/overlays/codex-acp.nix
 create mode 100644 nix/packages/codex-acp.nix

diff --git a/nix/flake.nix b/nix/flake.nix
index 9519889..acf8d33 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -16,6 +16,7 @@
     pkgsForSystem = (system: import nixpkgs {
       inherit system;
       config.allowUnfree = true;
+      overlays = [ (import ./overlays/codex-acp.nix) ];
     });
 
     mkHomeConfig = ({system, username ? "ttm" }: home-manager.lib.homeManagerConfiguration {
@@ -34,6 +35,7 @@
     });
   in
     utils.lib.eachDefaultSystem (system: {
+      packages.codex-acp = (pkgsForSystem system).codex-acp;
       legacyPackages.homeConfigurations.std = mkHomeConfig { inherit system; };
     });
 }
diff --git a/nix/overlays/codex-acp.nix b/nix/overlays/codex-acp.nix
new file mode 100644
index 0000000..4eb87a3
--- /dev/null
+++ b/nix/overlays/codex-acp.nix
@@ -0,0 +1,3 @@
+final: prev: {
+  codex-acp = final.callPackage ../packages/codex-acp.nix { };
+}
diff --git a/nix/packages/codex-acp.nix b/nix/packages/codex-acp.nix
new file mode 100644
index 0000000..b3cc540
--- /dev/null
+++ b/nix/packages/codex-acp.nix
@@ -0,0 +1,25 @@
+{ lib, buildNpmPackage, fetchFromGitHub }:
+
+# The nixpkgs package still builds the Rust adapter. Version 1.x uses Node
+# and ships a compatible Codex CLI through its locked npm dependencies.
+buildNpmPackage (finalAttrs: {
+  pname = "codex-acp";
+  version = "1.10.0";
+
+  src = fetchFromGitHub {
+    owner = "agentclientprotocol";
+    repo = "codex-acp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-D8uYd30NRXQYUSBFCi66Oq0iRZXpl8P7nWv2m3+KBig=";
+  };
+
+  npmDepsHash = "sha256-df1/kPiZFBEq9Um26Qbo9XaYj2J8BOXQmunCQWquDTo=";
+
+  meta = {
+    description = "ACP adapter for Codex CLI";
+    homepage = "https://github.com/agentclientprotocol/codex-acp";
+    license = lib.licenses.asl20;
+    mainProgram = "codex-acp";
+    platforms = [ "aarch64-darwin" "x86_64-darwin" "aarch64-linux" "x86_64-linux" ];
+  };
+})