From cb031d3d66470db2f7e4657822976f1fb4323794 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Wed, 28 Jan 2026 12:16:00 -0500
Subject: [PATCH] Reapply "add oh-my-opencode"

This reverts commit 8297cd01f4b47e1edea4aefd3ac84091869826d6.
---
 flake.lock                      | 56 +++++++++++++++++++++++++++++++++
 flake.nix                       |  6 ++++
 home-manager/progs/opencode.nix |  4 +++
 3 files changed, 66 insertions(+)

diff --git a/flake.lock b/flake.lock
index a401625..272cf30 100644
--- a/flake.lock
+++ b/flake.lock
@@ -151,6 +151,24 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "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": [
@@ -438,6 +456,28 @@
         "type": "github"
       }
     },
+    "oh-my-opencode": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769568828,
+        "narHash": "sha256-BQVuBk91oRiXiv6a9cqvMALSDhqyJMeEVzna3vggf2Y=",
+        "owner": "yebei199",
+        "repo": "oh-my-opencode",
+        "rev": "662ca217a3a737c95b8cd3279d740015c9c524af",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yebei199",
+        "ref": "nix",
+        "repo": "oh-my-opencode",
+        "type": "github"
+      }
+    },
     "pre-commit": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -476,6 +516,7 @@
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "oh-my-opencode": "oh-my-opencode",
         "rust-overlay": "rust-overlay",
         "zen-browser": "zen-browser"
       }
@@ -545,6 +586,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "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 6c53421..c32a2f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,6 +73,12 @@
       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";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix
index 3c5f121..8ddb569 100644
--- a/home-manager/progs/opencode.nix
+++ b/home-manager/progs/opencode.nix
@@ -28,6 +28,10 @@ let
   };
 in
 {
+  home.packages = [
+    inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode
+  ];
+
   xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig;
 
   programs.opencode = {