From 872a2656dd1f90dd1a8c0b906ac59349ba03fdd3 Mon Sep 17 00:00:00 2001 From: m3ta-chiron Date: Fri, 2 Oct 2026 08:30:12 +0200 Subject: [PATCH] fix(hermes): consume agent-lib mkHermesSkillsDir via direct flake input m3ta-home 5e91e5c removed the agent-lib input and its lib.mkHermesSkillsDir re-export. Finish the removal on our side: - add agent-lib (agent-lib-legacy on gitea) as a direct flake input, pinned to the same rev m3ta-home used before (75a2ed2) - call inputs.agent-lib.lib.${system}.mkHermesSkillsDir directly in hosts/m3-hermes/services/hermes-agent.nix - bump m3ta-home to dfe148d (drops the dangling pkgs.agent-lib reference that broke evaluation of every coding-set host) nix flake check: all checks passed. --- flake.lock | 19 +++++++++---------- flake.nix | 7 +++++++ hosts/m3-hermes/services/hermes-agent.nix | 9 ++++----- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f378b55..cd69cab 100644 --- a/flake.lock +++ b/flake.lock @@ -45,7 +45,6 @@ "agent-lib": { "inputs": { "nixpkgs": [ - "m3ta-home", "nixpkgs" ] }, @@ -747,7 +746,6 @@ "m3ta-home": { "inputs": { "agenix": "agenix_2", - "agent-lib": "agent-lib", "agents": "agents", "dms": "dms", "dms-plugin-registry": "dms-plugin-registry", @@ -761,11 +759,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1790611994, - "narHash": "sha256-cO4pI7T9EgH5Ow/2GKCpSqqCdRCjHn4+d3ndJDB08dU=", + "lastModified": 1790922417, + "narHash": "sha256-3scqz97Dg5eWH0ca7y2GHueROTuV2XGsPTSZSzKpOvE=", "ref": "refs/heads/master", - "rev": "2e75be49f49e93201876e9688d64abe4c79514e4", - "revCount": 142, + "rev": "dfe148dc6847b5feb638d8c0e11db8b226f29a41", + "revCount": 146, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, @@ -787,11 +785,11 @@ "opencode": "opencode" }, "locked": { - "lastModified": 1789141095, - "narHash": "sha256-f5NLbwOwSQL+tDDelxps1VFh84obOMyw+ox9gcvE7TU=", + "lastModified": 1790661658, + "narHash": "sha256-W6Y26W9Wqp8VIaEMTkGMTvGJi0igXPLBN9xijUNN/ag=", "ref": "refs/heads/master", - "rev": "1e0db37c579935b9916c1fcb3d3ed733b4cb3114", - "revCount": 389, + "rev": "c1e1933eafc18e0243d9e1b3f636e372ba09a246", + "revCount": 393, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" }, @@ -1395,6 +1393,7 @@ "root": { "inputs": { "agenix": "agenix", + "agent-lib": "agent-lib", "disko": "disko", "hermes-agent": "hermes-agent", "home-manager": "home-manager_3", diff --git a/flake.nix b/flake.nix index 73f1c51..39ef4f4 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,13 @@ # url = "path:/home/m3tam3re/p/NIX/nixpkgs"; }; + # Nix library for rendering agent skill source selections into store + # dirs (mkHermesSkillsDir). Consumed directly by hosts/m3-hermes. + agent-lib = { + url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib-legacy"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + llm-agents.url = "github:numtide/llm-agents.nix"; nur = { diff --git a/hosts/m3-hermes/services/hermes-agent.nix b/hosts/m3-hermes/services/hermes-agent.nix index 015960f..5c9e1d7 100644 --- a/hosts/m3-hermes/services/hermes-agent.nix +++ b/hosts/m3-hermes/services/hermes-agent.nix @@ -27,11 +27,10 @@ }) agentSkillExclusions; - # Deterministic store renderer consumed directly by Hermes. m3ta-home - # re-exports the focused helper so nixos-config does not need a direct - # agent-lib flake input. - hermesSkills = inputs.m3ta-home.lib.mkHermesSkillsDir { - system = pkgs.stdenv.hostPlatform.system; + # Deterministic store renderer consumed directly by Hermes. agent-lib's + # mkHermesSkillsDir renders the lockfile-pinned skill sources into a + # symlinked store dir (m3ta-home no longer re-exports it). + hermesSkills = inputs.agent-lib.lib.${pkgs.stdenv.hostPlatform.system}.mkHermesSkillsDir { name = "hermes-agent-lib-skills"; lockFile = ../../../agent-sources.lock.json; sources = agentLibSourceSelections;