From aef9d84d611df5a40c7bb60b45d96367e82fe11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=B6nig?= Date: Mon, 2 Nov 2026 08:02:07 +0100 Subject: [PATCH 1/2] refactor(m3-kratos): use the T3 Code module from m3ta-home Co-Authored-By: Claude Opus 5.5 --- hosts/common/default.nix | 3 +- hosts/m3-kratos/services/t3code.nix | 44 ++------------ overlays/default.nix | 91 ----------------------------- 3 files changed, 7 insertions(+), 131 deletions(-) diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 8eebf0f..4efc92e 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -13,6 +13,7 @@ ./ports.nix ./users inputs.home-manager.nixosModules.home-manager + inputs.m3ta-home.nixosModules.t3code ]; environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"]; @@ -50,7 +51,7 @@ # overlays/default.nix. inputs.llm-agents.overlays.shared-nixpkgs # Wraps pkgs.llm-agents.t3code* with the agents' m3ta-chiron identity. - outputs.overlays.t3code-agent-identity + inputs.m3ta-home.overlays.t3code-agent-identity # You can also add overlays exported from other flakes: # neovim-nightly-overlay.overlays.default diff --git a/hosts/m3-kratos/services/t3code.nix b/hosts/m3-kratos/services/t3code.nix index 4036cff..d954ce4 100644 --- a/hosts/m3-kratos/services/t3code.nix +++ b/hosts/m3-kratos/services/t3code.nix @@ -1,41 +1,7 @@ -{ - config, - pkgs, - ... -}: let - port = config.m3ta.ports.get "t3code"; - cockpitUser = "m3tam3re"; - netbirdIp = "100.81.73.194"; -in { - # T3 Code server: reachable from NetBird mesh peers only. It owns ~/.t3, so - # the desktop app must connect as a client with its local environment off. - systemd.services.t3code = { - description = "T3 Code server"; - # Binding fails until NetBird has assigned the address; Restart retries. - after = ["netbird.service"]; - wants = ["netbird.service"]; - wantedBy = ["multi-user.target"]; - - serviceConfig = { - User = cockpitUser; - Group = "users"; - WorkingDirectory = "/home/${cockpitUser}"; - ExecStart = "${pkgs.llm-agents.t3code}/bin/t3 serve --host ${netbirdIp}"; - Restart = "on-failure"; - RestartSec = "5"; - }; - - environment = { - T3CODE_PORT = toString port; - HOME = "/home/${cockpitUser}"; - }; - - # The harnesses come from the user's profile, not from the service. - path = [ - "/etc/profiles/per-user/${cockpitUser}" - "/run/current-system/sw" - ]; +{config, ...}: { + m3ta.t3code = { + enable = true; + user = "m3tam3re"; + port = config.m3ta.ports.get "t3code"; }; - - networking.firewall.interfaces.wt0.allowedTCPPorts = [port]; } diff --git a/overlays/default.nix b/overlays/default.nix index cba45fd..df5e9c4 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -74,97 +74,6 @@ opencode-desktop = final.llm-agents.opencode2-desktop; }; - # T3 Code agents act as the m3ta-chiron bot on every host. Baked into the - # T3 packages rather than a session or service: everything T3 spawns - # inherits it, however T3 was launched (desktop launcher, systemd, shell), - # and any host installing T3 gets it. Must come AFTER shared-nixpkgs. - # - # Push auth needs ~/.ssh/m3ta-chiron on each host, with its pubkey on the - # m3ta-chiron Gitea account. A missing key fails the push instead of falling - # back to a personal key. Other hosts keep the user's own ssh config. - # - # Change requests need the agenix secret hermes-gitea-token on each host, - # owned by the T3 user. Without it T3 cannot recognize code.m3ta.dev as Gitea. - t3code-agent-identity = final: prev: let - identity = { - name = "m3ta-chiron"; - email = "m3ta-chiron@agentmail.to"; - }; - - giteaKnownHosts = final.writeText "gitea-known-hosts" '' - code.m3ta.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmmqZ4GgDEXJgj8uYrZAr/EoLIA6LJGkTIyKGQD/60a - ''; - - # ssh expands ~ from passwd, so this does not depend on $HOME. - sshConfig = final.writeText "t3-agent-ssh-config" '' - Host code.m3ta.dev - User gitea - IdentityFile ~/.ssh/m3ta-chiron - IdentitiesOnly yes - UserKnownHostsFile ${giteaKnownHosts} - - # Conditional: IdentityFile accumulates across matching blocks, so a - # personal code.m3ta.dev entry must not be read for this host. - Host * !code.m3ta.dev - Include ~/.ssh/config - ''; - - # T3 only recognizes a Gitea on a custom domain through a matching tea - # login. The config lives in a private temp dir per call, so the token stays - # out of the nix store and a personal ~/.config/tea is left alone. - giteaTokenFile = "/run/agenix/hermes-gitea-token"; - agentTea = final.writeShellApplication { - name = "tea"; - text = '' - config="$(${final.coreutils}/bin/mktemp -d)" - trap '${final.coreutils}/bin/rm -rf "$config"' EXIT - ${final.coreutils}/bin/mkdir "$config/tea" - if [ -r ${giteaTokenFile} ]; then - ${final.coreutils}/bin/cat > "$config/tea/config.yml" < Date: Mon, 2 Nov 2026 12:27:54 +0100 Subject: [PATCH 2/2] refactor(secrets): rename agent Gitea tokens per instance, add work token for m3-kratos hermes-gitea-token.age is renamed unchanged to agent-gitea-token-m3ta.age. agent-gitea-token-az.age carries the m3ta-chiron token for git.az-gruppe.com, for m3-kratos only. Also bumps m3ta-home to the T3 Code module. Co-Authored-By: Claude Opus 5.5 --- flake.lock | 8 ++++---- hosts/m3-hermes/secrets.nix | 4 ++-- hosts/m3-hermes/services/t3code.nix | 2 +- hosts/m3-kratos/secrets.nix | 8 ++++++-- secrets.nix | 3 ++- secrets/agent-gitea-token-az.age | 12 ++++++++++++ ...es-gitea-token.age => agent-gitea-token-m3ta.age} | 0 7 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 secrets/agent-gitea-token-az.age rename secrets/{hermes-gitea-token.age => agent-gitea-token-m3ta.age} (100%) diff --git a/flake.lock b/flake.lock index 3b9e05f..affb7e0 100644 --- a/flake.lock +++ b/flake.lock @@ -709,11 +709,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1793258213, - "narHash": "sha256-77LJOHABdbX+cJ332xdTd7LEBoIo9r3lQccnD64p6RU=", + "lastModified": 1793618288, + "narHash": "sha256-owOGoacp52y8Zxq366PhspAx6l76QEKS3ExJDIqncVg=", "ref": "refs/heads/master", - "rev": "5b192aadfe266733c35e40894c27fee716092294", - "revCount": 166, + "rev": "a60a28fb9ceac08278160120431e194d2736d355", + "revCount": 173, "type": "git", "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" }, diff --git a/hosts/m3-hermes/secrets.nix b/hosts/m3-hermes/secrets.nix index 156d399..1d2baeb 100644 --- a/hosts/m3-hermes/secrets.nix +++ b/hosts/m3-hermes/secrets.nix @@ -1,8 +1,8 @@ { age = { secrets = { - hermes-gitea-token = { - file = ../../secrets/hermes-gitea-token.age; + agent-gitea-token-m3ta = { + file = ../../secrets/agent-gitea-token-m3ta.age; owner = "m3tam3re"; }; hermes-env = { diff --git a/hosts/m3-hermes/services/t3code.nix b/hosts/m3-hermes/services/t3code.nix index c4915ba..1e3297b 100644 --- a/hosts/m3-hermes/services/t3code.nix +++ b/hosts/m3-hermes/services/t3code.nix @@ -22,7 +22,7 @@ # - Gitea SSH: m3tam3re's ssh config pins User gitea + key ~/.ssh/gitea # (one-time keygen; pubkey added to the m3ta-chiron account) for # interactive use and git+ssh:// flake inputs. Host key pinned system-wide. -# - Gitea change requests: tea with the hermes-gitea-token agenix secret, +# - Gitea change requests: tea with the agent-gitea-token-m3ta agenix secret, # baked into the same package. # # One-time interactive steps after deploy (deliberately NOT declarative — diff --git a/hosts/m3-kratos/secrets.nix b/hosts/m3-kratos/secrets.nix index 3a580ff..3ef0b27 100644 --- a/hosts/m3-kratos/secrets.nix +++ b/hosts/m3-kratos/secrets.nix @@ -1,8 +1,12 @@ { age = { secrets = { - hermes-gitea-token = { - file = ../../secrets/hermes-gitea-token.age; + agent-gitea-token-m3ta = { + file = ../../secrets/agent-gitea-token-m3ta.age; + owner = "m3tam3re"; + }; + agent-gitea-token-az = { + file = ../../secrets/agent-gitea-token-az.age; owner = "m3tam3re"; }; anytype-key = { diff --git a/secrets.nix b/secrets.nix index 62e628e..a87a079 100644 --- a/secrets.nix +++ b/secrets.nix @@ -55,7 +55,8 @@ in { "secrets/hermes-env.age".publicKeys = systems ++ users; "secrets/hermes-cloud-env.age".publicKeys = systems ++ users; "secrets/hermes-api-server-key.age".publicKeys = systems ++ users; - "secrets/hermes-gitea-token.age".publicKeys = systems ++ users; + "secrets/agent-gitea-token-m3ta.age".publicKeys = systems ++ users; + "secrets/agent-gitea-token-az.age".publicKeys = [m3-kratos] ++ users; "secrets/tuwunel-registration-token.age".publicKeys = systems ++ users; "secrets/ai-memory-server-env.age".publicKeys = [m3-hermes] ++ users; "secrets/ai-memory-hermes-token.age".publicKeys = [m3-hermes] ++ users; diff --git a/secrets/agent-gitea-token-az.age b/secrets/agent-gitea-token-az.age new file mode 100644 index 0000000..29ef75c --- /dev/null +++ b/secrets/agent-gitea-token-az.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDNCY3IxdyA3cDdZ +d1RIUGdOelJkL0ZZTldKYmNGRzN5RTQrSDVGNVE1dW1TaDdoR2xVCjZJTWZqVmFx +blZSemcyRjhXaHBXV1BTN3RNM0xLOVB6aGJlTlBvNnFmMFEKLT4gc3NoLWVkMjU1 +MTkgKytUcWFRICtab1hacXg2OE5QK3FRTlRVdmZoSmtUTThwUVU5dk14cnNnMzdM +RmVLV1kKTzJUNU12VnBzeW9yZjBYUUtmcUNxcmttMGVGV3VYNWhOcldSQkxXSndw +NAotPiBzc2gtZWQyNTUxOSBDU015aGcgdmdxVWI2UG5USFBWR24vRGpKQmF0QXlE +dFlqTFFsWHUxRlpDZitYUE1RRQpxS2cvTURGZUFjNVlwRmRtcVZ6bWhLRTZPa0lQ +U3pzSXhtazMxcXkrRnJnCi0tLSB3OUsyT2YzL05UVWhJMVEwdno4Z0U0WGhTb1Qx +SmNyVWNhZHVOeDdkVHFNCvfBDJ9SzlWGD3URDtM74LvjYRNcb33SCstNhwCYswur +dnu8OawdQeVcYV1dhAMW/16F/n/Nd9MSVkaW4K7tUsOs8XbCHTB7Fxg= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/hermes-gitea-token.age b/secrets/agent-gitea-token-m3ta.age similarity index 100% rename from secrets/hermes-gitea-token.age rename to secrets/agent-gitea-token-m3ta.age