From fdf23ebe2211f7e511a49bae592befe761d3240e Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Mon, 9 Mar 2026 13:13:59 -0400
Subject: [PATCH] oh-my-opencode: move to my llm-agents.nix fork

---
 flake.lock                      | 67 +++------------------------------
 flake.nix                       |  8 +---
 home-manager/progs/opencode.nix | 27 ++-----------
 3 files changed, 11 insertions(+), 91 deletions(-)

diff --git a/flake.lock b/flake.lock
index 643c152..2f8adee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -227,24 +227,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -404,15 +386,16 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1773068014,
-        "narHash": "sha256-5WOIh+mgU1TLBVLOCgJDc3vSlx20saK+VYVZTl6MkSo=",
-        "owner": "numtide",
+        "lastModified": 1773075920,
+        "narHash": "sha256-3ebydDinuiBxpJS2d8mAbbnbvhIYTKflOtQRxXR4XhA=",
+        "owner": "Titaniumtown",
         "repo": "llm-agents.nix",
-        "rev": "51efc59e9d492d10a2d85d57ba764898df71d0b9",
+        "rev": "838a33179e2364e010ed1dd16cb9ca95998f4237",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "Titaniumtown",
+        "ref": "pr/oh-my-opencode",
         "repo": "llm-agents.nix",
         "type": "github"
       }
@@ -613,28 +596,6 @@
         "type": "github"
       }
     },
-    "oh-my-opencode": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1770618333,
-        "narHash": "sha256-7Y9e2nrsi4yKwBXZ7RUF1B5FN4RJUT4rYI1SvA0vDEw=",
-        "owner": "yebei199",
-        "repo": "oh-my-opencode",
-        "rev": "bde5264e4c3a91ded482acd35c8ed239d21d1de2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yebei199",
-        "ref": "nix",
-        "repo": "oh-my-opencode",
-        "type": "github"
-      }
-    },
     "pre-commit": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -675,7 +636,6 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "noctalia": "noctalia",
-        "oh-my-opencode": "oh-my-opencode",
         "rust-overlay": "rust-overlay",
         "zen-browser": "zen-browser"
       }
@@ -760,21 +720,6 @@
         "type": "github"
       }
     },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 6d4004d..c821f09 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,13 +75,7 @@
     };
 
     llm-agents = {
-      url = "github:numtide/llm-agents.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    # wait for https://github.com/code-yeongyu/oh-my-opencode/pull/921 to be merged
-    oh-my-opencode = {
-      url = "github:yebei199/oh-my-opencode/nix";
+      url = "github:Titaniumtown/llm-agents.nix/pr/oh-my-opencode";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix
index 3970752..36124cb 100644
--- a/home-manager/progs/opencode.nix
+++ b/home-manager/progs/opencode.nix
@@ -41,29 +41,10 @@ let
   };
 in
 {
-  home.packages =
-    let
-      ohMyOpencode =
-        let
-          orig = inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system};
-          fixed-node_modules = orig.node_modules.overrideAttrs (_: {
-            outputHash = "sha256-qq/eEoxFELVdt4qaJkrw8XNZ/Ph/RJdsyIp7LteQE5A=";
-          });
-        in
-        orig.oh-my-opencode.overrideAttrs (_: {
-          buildPhase = ''
-            cp -r ${fixed-node_modules}/node_modules .
-            chmod -R u+w node_modules
-            patchShebangs node_modules/
-            export HOME=$(mktemp -d)
-            bun run build
-          '';
-        });
-    in
-    [
-      ohMyOpencode
-      pkgs.playwright-driver.browsers
-    ];
+  home.packages = [
+    inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode
+    pkgs.playwright-driver.browsers
+  ];
 
   home.sessionVariables = {
     PLAYWRIGHT_BROWSERS_PATH = "${pkgs.playwright-driver.browsers}";