From af080846926453f510b6e3ed6e5a3167a5e5d087 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Mon, 11 May 2026 19:27:11 +0200 Subject: [PATCH] chore: fix git identity for m3-hermes --- .beads/issues.jsonl | 2 +- flake.lock | 8 ++++---- hosts/m3-hermes/services/hermes-agent.nix | 12 +++++------- secrets/honcho-key.age | Bin 1373 -> 0 bytes 4 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 secrets/honcho-key.age diff --git a/.beads/issues.jsonl b/.beads/issues.jsonl index 5f44807..5de9830 100644 --- a/.beads/issues.jsonl +++ b/.beads/issues.jsonl @@ -1,3 +1,3 @@ {"_type":"issue","id":"home-profile-restructuring-edz","title":"Create copy-hermes-skills systemd service","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:44:42Z","started_at":"2026-04-26T12:36:30Z","closed_at":"2026-04-26T12:44:42Z","close_reason":"Created systemd service in hosts/m3-hermes/services/hermes-agent.nix - copies skills to /var/lib/hermes/.agents/skills before hermes-agent starts","labels":["hermes-agent","nixos"],"dependencies":[{"issue_id":"home-profile-restructuring-edz","depends_on_id":"home-profile-restructuring-ycz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":1,"comment_count":0} -{"_type":"issue","id":"home-profile-restructuring-ycz","title":"Build hermes-agent skills using mkSkills:w","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":2,"created_at":"2026-04-26T12:30:09Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:35:15Z","started_at":"2026-04-26T12:31:35Z","closed_at":"2026-04-26T12:35:15Z","close_reason":"Added inputs to module signature and defined hermesSkills via inputs.agents.lib.mkSkills with basecamp, anthropic, and kestra external skills. Verified with nixos-rebuild dry-run --flake .#m3-hermes (no errors).","labels":["hermes-agent","nixos"],"dependency_count":0,"dependent_count":1,"comment_count":0} +{"_type":"issue","id":"home-profile-restructuring-ycz","title":"Build hermes-agent skills using mkOpencodeSkills","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":2,"created_at":"2026-04-26T12:30:09Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:35:15Z","started_at":"2026-04-26T12:31:35Z","closed_at":"2026-04-26T12:35:15Z","close_reason":"Added inputs to module signature and defined hermesSkills via inputs.agents.lib.mkOpencodeSkills with basecamp, anthropic, and kestra external skills. Verified with nixos-rebuild dry-run --flake .#m3-hermes (no errors).","labels":["hermes-agent","nixos"],"dependency_count":0,"dependent_count":1,"comment_count":0} {"_type":"issue","id":"home-profile-restructuring-cxa","title":"Verify skills available at /var/lib/hermes/.agents/skills","status":"closed","priority":2,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:50:58Z","started_at":"2026-04-26T12:38:15Z","closed_at":"2026-04-26T12:50:58Z","close_reason":"Manually verified - skills are present at /var/lib/hermes/.agents/skills on m3-hermes","labels":["hermes-agent","testing"],"dependencies":[{"issue_id":"home-profile-restructuring-cxa","depends_on_id":"home-profile-restructuring-edz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":0,"comment_count":0} diff --git a/flake.lock b/flake.lock index e071254..4f96b71 100644 --- a/flake.lock +++ b/flake.lock @@ -602,11 +602,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1778516940, - "narHash": "sha256-BhC9zIEmXoWY0TK0achwUueKhzUA5sja6bjonzrEPxo=", + "lastModified": 1778520138, + "narHash": "sha256-X58c8BUIshyUnp6XEKumFUYXqMFnrDTj+aGuGIbKwxg=", "ref": "refs/heads/master", - "rev": "7894a89843559cb1597bf0f32e0579f37052f497", - "revCount": 28, + "rev": "a87d9510bd84f51bf93970730b8688ab7221bbdd", + "revCount": 30, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, diff --git a/hosts/m3-hermes/services/hermes-agent.nix b/hosts/m3-hermes/services/hermes-agent.nix index d67bcd7..91e7e92 100644 --- a/hosts/m3-hermes/services/hermes-agent.nix +++ b/hosts/m3-hermes/services/hermes-agent.nix @@ -49,13 +49,6 @@ in { user: m3ta-chiron default: true ''}" - "f /home/hermes/.gitconfig 0644 hermes hermes - ${pkgs.writeText "gitconfig" '' - [user] - name = m3ta-chiron - email = m3ta-chiron@agentmail.to - [init] - defaultBranch = master - ''}" ]; systemd.services.copy-hermes-skills = { @@ -95,12 +88,17 @@ in { ]; # Non-secret environment variables + # Git identity is set entirely via env vars (GIT_AUTHOR_*, GIT_COMMITTER_*, + # GIT_INIT_DEFAULT_BRANCH) — no .gitconfig file needed. Env vars take + # precedence over any gitconfig, and the hermes gateway injects them into + # all terminal sessions via .env. environment = { GLM_BASE_URL = "https://api.z.ai/api/coding/paas/v4/"; GIT_AUTHOR_NAME = "m3ta-chiron"; GIT_AUTHOR_EMAIL = "m3ta-chiron@agentmail.to"; GIT_COMMITTER_NAME = "m3ta-chiron"; GIT_COMMITTER_EMAIL = "m3ta-chiron@agentmail.to"; + GIT_INIT_DEFAULT_BRANCH = "master"; # ── API Server (OpenAI-compatible, for Hermes Desktop App) ───────── # Accessible via Netbird mesh VPN — not exposed to the public internet. diff --git a/secrets/honcho-key.age b/secrets/honcho-key.age deleted file mode 100644 index 930b6aa28742d5659914a10fad0a5f53dcd0ed57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1373 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSP@$>O6DpzpUHuUr} zv@{6}%}a9$4>K;!aE$2!}$;t4o2no>k4L2() z%+WS0Gc!&Oip)xJPR%y-3)l88GI7gtDk?Fpa7DMxG`l>x*ij)O#WC9>BrqVbXuC@)33)W5<%(zo2-B|SaUz}q+9#811}!;#B8!pt(#&?79Zu)x(aFC^3`BGJg- z*~F;C-NN6=GSWFPr>e*xGc!CqG7{Z3%M_DH&p-ulbH6-y!?2_%U*`a!6 zV{-$?FlV3Ks(=8)yt2Z|T*s(z4+AdG;398-H^<26F+`RJi4fG40Gs1I|6H5ycO^m$! zBceQwO#{(wOE&Qf%yCr6s45OKuJUv(4XX+<%XJJ1wM^E|4)pRgv&fAyP7KL)bxC(F zG7B|y%`WE3^$p4nsjBo#3U)4vDh+Z;Oe;$cF;Di)h%oUE_jPitG%KkHFZIxlN-T!i zR#cp*;1ZbQYF^HjY~kk-;_XyW;^k9pY3z~iTH%~-nVVE*VCq%k?HcT?ADL&7oMBuX zloOa;;^>s)V;-93T&5l7;*sp-lwVoJ<(wYk;uMx=9_F5FmL8NBlI56d5S-+g?r-Yq z9+v1C=9lH3?3v*nk!hag=IK?QR%&8YX!c|h{sPAuRvsOJzY`L59DpmuafAi)*2OWs;w{rD>^&fwyIGx_`1y zT1B9nwsWGpTVPVCnOR7oSwx6gqzhM3x>K^bcW`;7pP`{qkak*_vA=(ASctPxxp_f> zyJw++u~(W|qG48|p=CyrvtycHQKWfFMn+&!g`0a}M42O(t3{NtOPFO~US3(ad10kt zp>|2Cdr)G5S6E42kbAOAYD#8mMy8XKX}VXUK}4BPv8i)erB7sJW>j#1L1yLm;qi;rhnp^vvqX?dVanM-b(ew1@T zR8VDUQIxiJB^NAdzzPuOVBgA&bcN8|j7+0^!$3#xtN>3>3(Ne-kaV|Tlg#wg$N;xc zuSk<{&;0CE=fL2ga;{XL$~4nd!>Vlk#L_J1On1-X07ush%Z%WN>|mqPEJIJ95=S@B z^1>CLjA9K^nN_jSE zFHlJqI5MF}-)J-UMn0YsQUV)xExB<{Rq~yyoWP_@stwiR30-s7J=}iHn*EB#;hLK7 MEf>yynN-0F0E7C+mjD0&