From b65bbcacbec2b4705d70fcafa2a7f238face64cf Mon Sep 17 00:00:00 2001
From: m3tm3re <p@m3ta.dev>
Date: Sun, 5 Apr 2026 04:16:24 +0200
Subject: [PATCH] openshell: 0.0.16 -> 0.0.22

---
 flake.lock                        |  8 +++---
 pkgs/default.nix                  |  1 +
 pkgs/eigent/default.nix           | 48 +++++++++++++++++++++++++++++++
 pkgs/opencode-desktop/default.nix | 10 ++++++-
 pkgs/openshell/sources.json       | 14 ++++-----
 5 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/eigent/default.nix

diff --git a/flake.lock b/flake.lock
index 493723d..8aae8f3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -60,16 +60,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1774807340,
-        "narHash": "sha256-OV76SWqiBguUupfbkJMBVrslJoTqSh4epNjEp/HE/cY=",
+        "lastModified": 1775004246,
+        "narHash": "sha256-P6Md0WzHK2/oAZ6VbpYnabVJyVcqwuYizoOqbxaf+lU=",
         "owner": "anomalyco",
         "repo": "opencode",
-        "rev": "e7f94f9b9a3bd8742330e4a7ba8573ac21042c01",
+        "rev": "6314f09c14fdd6a3ab8bedc4f7b7182647551d12",
         "type": "github"
       },
       "original": {
         "owner": "anomalyco",
-        "ref": "v1.3.6",
+        "ref": "v1.3.13",
         "repo": "opencode",
         "type": "github"
       }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index d61f117..2445c67 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -30,4 +30,5 @@ in {
 
   # Imported from flake inputs (with local modifications)
   opencode-desktop = pkgs.callPackage ./opencode-desktop {inherit inputs;};
+  # opencode-desktop = inputs.opencode.packages.${pkgs.system}.desktop;
 }
diff --git a/pkgs/eigent/default.nix b/pkgs/eigent/default.nix
new file mode 100644
index 0000000..399567f
--- /dev/null
+++ b/pkgs/eigent/default.nix
@@ -0,0 +1,48 @@
+{
+  appimageTools,
+  fetchurl,
+  lib,
+  nodejs,
+  nodePackages,
+  uv,
+  python3,
+  makeWrapper,
+}: let
+  pname = "eigent";
+  version = "0.0.89";
+  src = fetchurl {
+    url = "https://github.com/eigent-ai/eigent/releases/download/v${version}/Eigent-${version}.AppImage";
+    hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+  };
+  appimageContents = appimageTools.extractType2 {inherit pname version src;};
+in
+  appimageTools.wrapType2 {
+    inherit pname version src;
+
+    nativeBuildInputs = [makeWrapper];
+
+    extraPkgs = pkgs: [
+      nodejs
+      nodePackages.npm
+      uv
+      python3
+    ];
+
+    extraInstallCommands = ''
+      install -m 444 -D ${appimageContents}/Eigent.desktop -t $out/share/applications
+      substituteInPlace $out/share/applications/Eigent.desktop \
+        --replace 'Exec=AppRun' 'Exec=${pname}'
+      install -m 444 -D ${appimageContents}/Eigent.png \
+        $out/share/icons/hicolor/256x256/apps/Eigent.png
+      wrapProgram $out/bin/${pname} \
+        --prefix PATH : ${lib.makeBinPath [nodejs nodePackages.npm uv python3]}
+    '';
+
+    meta = {
+      description = "Open source AI cowork desktop app — local alternative to Claude Cowork";
+      homepage = "https://github.com/eigent-ai/eigent";
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.linux;
+      mainProgram = "eigent";
+    };
+  }
diff --git a/pkgs/opencode-desktop/default.nix b/pkgs/opencode-desktop/default.nix
index 5d3baf2..bb571a9 100644
--- a/pkgs/opencode-desktop/default.nix
+++ b/pkgs/opencode-desktop/default.nix
@@ -29,9 +29,17 @@
 
   # Workaround for https://github.com/anomalyco/opencode/issues/11755
   # Upstream is missing outputHashes for git dependencies
+  # Also fix stale npm deps hash in upstream node_modules FOD
+  fixedNodeModules = opencode.node_modules.overrideAttrs {
+    outputHash = "sha256-C7y5FMI1pGEgMw/vcPoBhK9tw5uGg1bk0gPXPUUVhgU=";
+  };
+
   opencode-desktop = rustPlatform.buildRustPackage (finalAttrs: {
     pname = "opencode-desktop";
-    inherit (opencode) version src node_modules patches;
+    version = opencode.version;
+    src = opencode.src;
+    node_modules = fixedNodeModules;
+    patches = opencode.patches;
 
     cargoRoot = "packages/desktop/src-tauri";
     cargoLock = {
diff --git a/pkgs/openshell/sources.json b/pkgs/openshell/sources.json
index f814237..3b16b06 100644
--- a/pkgs/openshell/sources.json
+++ b/pkgs/openshell/sources.json
@@ -1,17 +1,17 @@
 {
-  "version": "v0.0.16",
+  "version": "v0.0.22",
   "sources": {
     "aarch64-linux": {
-      "url": "https://github.com/NVIDIA/OpenShell/releases/download/v0.0.16/openshell-aarch64-unknown-linux-musl.tar.gz",
-      "hash": "sha256-cwG0fjf0mOZTXA+jwfjbUF04VxnL6U3hD8Hcabg+N/s="
+      "url": "https://github.com/NVIDIA/OpenShell/releases/download/v0.0.22/openshell-aarch64-unknown-linux-musl.tar.gz",
+      "hash": "sha256-yeogvG6sxUWijYTUl5QbHyb9z0f84dKwKGsmSlxyPqk="
     },
     "x86_64-linux": {
-      "url": "https://github.com/NVIDIA/OpenShell/releases/download/v0.0.16/openshell-x86_64-unknown-linux-musl.tar.gz",
-      "hash": "sha256-yV/9CHBfP85hmOXLmZL6Toxe6mO1gXWMdh21kluS/sU="
+      "url": "https://github.com/NVIDIA/OpenShell/releases/download/v0.0.22/openshell-x86_64-unknown-linux-musl.tar.gz",
+      "hash": "sha256-5qJCwQJgI8XgQ64WetNZc9jS++buT1Z0PqfBC+dYu94="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/NVIDIA/OpenShell/releases/download/v0.0.16/openshell-aarch64-apple-darwin.tar.gz",
-      "hash": "sha256-vSybSSiA+r3IJSpOwCQxSqrxJVkhlfVAfyiSKJai44M="
+      "url": "https://github.com/NVIDIA/OpenShell/releases/download/v0.0.22/openshell-aarch64-apple-darwin.tar.gz",
+      "hash": "sha256-XZLhP/7jLnkt0qmxVtZumsAwQCss7alaeiWbUW4njwM="
     }
   }
 }