diff --git a/flake.lock b/flake.lock index 72f90ec..59ef4b2 100644 --- a/flake.lock +++ b/flake.lock @@ -731,11 +731,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1790241846, - "narHash": "sha256-rmHQtarWvZxm3/dVuIkUWe0HjWfVGX8+OyaJoHIR8Jo=", + "lastModified": 1790311386, + "narHash": "sha256-bOexMr1RcAS6PFcMnEfwe5apsEoaLmSUUxlqUftd2uU=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "8bec0ce1cbb0a39f8f08dc97a7635af847779f99", + "rev": "1446b3cb242c8cd24619b58054112cc2d870e591", "type": "github" }, "original": { @@ -761,11 +761,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1789821966, - "narHash": "sha256-/alQujpdiSuDkWpteFkHqSxMfuACmROTlP6b2hJ1Hqo=", + "lastModified": 1790315016, + "narHash": "sha256-ZEA69QFuv/rhyrx2L6ytGycoixZSQCovsDTdox+SNI4=", "ref": "refs/heads/master", - "rev": "5e902610364099e6bdab393bfb63eeadfc18fd09", - "revCount": 135, + "rev": "4ef99db31d4c82762a63762511fc3232a032d935", + "revCount": 136, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, @@ -1057,11 +1057,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1790178388, - "narHash": "sha256-kK3t7gwoz4Nx8RF46cs1Xz/skKNcK7y3KYP+gGqX6W8=", + "lastModified": 1790238896, + "narHash": "sha256-ym4BG18Pu2awiJIehla1Lo9xiB2QYRcCzW3SB74gEBY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00455b0a3690d3f5dc61e9aef4277dc86235b73f", + "rev": "34ca302a9572963c02e385c056be37c85ff51b77", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 03db315..73f1c51 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hermes-agent.url = "github:NousResearch/hermes-agent/v2026.8.3"; + hermes-agent.url = "github:NousResearch/hermes-agent/v2026.8.31"; }; outputs = { diff --git a/hosts/m3-hermes/services/hermes-agent.nix b/hosts/m3-hermes/services/hermes-agent.nix index 32403d3..015960f 100644 --- a/hosts/m3-hermes/services/hermes-agent.nix +++ b/hosts/m3-hermes/services/hermes-agent.nix @@ -74,7 +74,7 @@ in { basecamp docker llm-agents.herdr - llm-agents.opencode + llm-agents.opencode2 pi-coding-agent bun git diff --git a/overlays/default.nix b/overlays/default.nix index 733a4f3..00c929c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -23,6 +23,11 @@ # maintained replacement is packaged upstream. rofi-pass = final.callPackage ./mods/rofi-pass.nix {}; rofi-pass-wayland = final.callPackage ./mods/rofi-pass.nix {backend = "wayland";}; + # OpenCode v1 attribute names now point at the v2 packages (binary names + # stay `opencode2` / `opencode2-desktop`). Re-pinned after m3ta-nixpkgs' + # overlay in the `ai-agents` overlay below. + opencode = final.llm-agents.opencode2; + opencode-desktop = final.llm-agents.opencode2-desktop; }; # Top-level pins for the OpenCode packages from llm-agents. Applied @@ -31,15 +36,9 @@ # (github:anomalyco/opencode, v1 line), which would clobber a pin placed # in `modifications`. ai-agents = final: _prev: { - # OpenCode TUI: stay on the v1 line (1.18.x) — v2 (opencode2) had config - # compatibility problems with m3ta-home's settings. llm-agents tracks - # the newest v1 release (1.18.32), ahead of nixpkgs' 1.18.30. - opencode = final.llm-agents.opencode; - - # OpenCode Desktop: no v2 desktop app exists upstream (anomalyco/opencode - # ends at v1.18.32); track the newest v1 release from llm-agents instead - # of the older m3ta-nixpkgs pin (1.18.30+95daf90). - opencode-desktop = final.llm-agents.opencode-desktop; + # OpenCode Desktop: v2 app (ai.opencode.desktop, 2.0.x) from llm-agents. + # Must stay AFTER m3ta-nixpkgs' overlay so the v1 re-export loses. + opencode-desktop = final.llm-agents.opencode2-desktop; }; # temp-packages = final: _prev: {