Compare commits

..
5 Commits
Author SHA1 Message Date
m3ta-chiron ef584cfa06 fix: broken vibetyper pkg 2026-11-03 19:49:19 +01:00
m3ta-chiron 8b7d52f5d4 Merge pull request 'refactor(m3-hermes): use the T3 Code module from m3ta-home' (#33) from feat/m3-hermes-t3code-module into master 2026-11-03 18:10:31 +01:00
m3ta-chiron 26bc5b5562 Merge pull request 'chore(flake): update inputs and drop unsupported systems' (#34) from chore/flake-update into master 2026-11-03 18:10:30 +01:00
m3ta-chironandClaude Opus 5.5 464de584a4 chore(flake): update inputs and drop unsupported systems
Full flake update. Drops x86_64-darwin (unsupported by nixpkgs 26.11) and
i686-linux (agenix and colmena publish no packages for it), so
`nix flake check --all-systems` passes. m3ta-nixpkgs and m3ta-home carry
the fixes the new nixpkgs and home-manager need.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 18:10:06 +01:00
m3ta-chironandClaude Opus 5.5 6a608a8e6a refactor(m3-hermes): use the T3 Code module from m3ta-home
The server now binds the NetBird address of wt0 instead of 0.0.0.0, so
the pairing URL is reachable from mesh peers, and the port opens on wt0
via the module instead of hand-written ip46tables rules. The agent
runtime (agent-lib sync, Claude skills, Gitea SSH) stays host-specific.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 18:03:04 +01:00
3 changed files with 61 additions and 102 deletions

No files matched your search

Generated
+50 -50
View File
@@ -95,11 +95,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1792718584, "lastModified": 1793681603,
"narHash": "sha256-YPYAhIfS8Ma5CmP0Jdc6pjLqhRNXlAFdElaKErSNfXA=", "narHash": "sha256-1tMfhG7z4CQnHDPrnCYHxjI1h+ttU2ggAnjplZcz63E=",
"owner": "akitaonrails", "owner": "akitaonrails",
"repo": "ai-memory", "repo": "ai-memory",
"rev": "1bd866375b01031d63db54862a133376598d3701", "rev": "4921bb93110a00602147a8024162f716c2e5d969",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -253,11 +253,11 @@
"treefmt-nix": "treefmt-nix_3" "treefmt-nix": "treefmt-nix_3"
}, },
"locked": { "locked": {
"lastModified": 1792485075, "lastModified": 1793694265,
"narHash": "sha256-o04WvscL+MhtarpbluifQZLA6lIP3B0g6NDUWaM/asc=", "narHash": "sha256-U0LOK1W4jopvSKjM1gDIOutEUuz6vZZJwPTUnVaT8KA=",
"owner": "mulatta", "owner": "mulatta",
"repo": "buzz.nix", "repo": "buzz.nix",
"rev": "22a9f566d21317181b4b40601570e81a02ff2d8c", "rev": "44d468360b22d94a11ba55c3d5c4c4c3f7620725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -276,11 +276,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1791553562, "lastModified": 1793370552,
"narHash": "sha256-jp+gxgnCdMhpBxxBnOoHW5fRVc+C5rKCFHsP/afoh3w=", "narHash": "sha256-Dv4jEQeqvPpicC3H8mLTyqtTgXp23p4HPiCMKqKWXFA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "colmena", "repo": "colmena",
"rev": "e269669b798a361a521029d5d15e289124a15038", "rev": "fc7d67ed1cd52af91415f92ba92b543bc7245f25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -415,11 +415,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1790898470, "lastModified": 1793576659,
"narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", "narHash": "sha256-V1h85lUaJBQoHFrB2vpXZOE0Ju1MYSnIpsehoVZYlDo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "024633cd702b10285db5cb19b40ad48d2399ba60", "rev": "ea2630b7470978622c7689a1ff75d2b389175399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -593,11 +593,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1792605213, "lastModified": 1793193205,
"narHash": "sha256-J73EBU30r2hXvHCcBtaigQDAIu/GGPYk1nc6P9THcmg=", "narHash": "sha256-X6xa6sGA7RnJQuZGbFMC+K+KToWAlBDCCjJXfTwEPsw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ab97a5d09e0f2aa7339cfd35ec5824fd6653e27c", "rev": "095fef2f265c3c0da4fe315efba8f8a04495ab34",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -680,11 +680,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1793429632, "lastModified": 1793708775,
"narHash": "sha256-as+Ue5OQyPXaA9myksf2YOhTtHONATTFFjbmumxKW2M=", "narHash": "sha256-TCztCGO7C7rgg3S4JscvKm4lA5b1R3zy5MPKfYirOHI=",
"owner": "numtide", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "c16784396ad0473d85e058caf0f148d6856c4822", "rev": "a854ddf4456f5fd67474e2d844cb4a29c32702d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -709,11 +709,11 @@
"nur": "nur" "nur": "nur"
}, },
"locked": { "locked": {
"lastModified": 1793719203, "lastModified": 1793725748,
"narHash": "sha256-thMA1QY/KTEwPg0QafeyB4Am0QF2NYm4EKU1Dae4Lk0=", "narHash": "sha256-+fHuAgYQc0DcUdaZcBwl/b+S1NXPGwlztJgqEW8cCIY=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "38d53d68c090a77b8de87f2b276050f4b3984eca", "rev": "4e46e08e4d5364945128066a4b90bbcfd331ff88",
"revCount": 179, "revCount": 181,
"type": "git", "type": "git",
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home" "url": "ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home"
}, },
@@ -760,11 +760,11 @@
"opencode": "opencode_2" "opencode": "opencode_2"
}, },
"locked": { "locked": {
"lastModified": 1793719079, "lastModified": 1793731645,
"narHash": "sha256-EZ9bxny6yjBr3LLnZCO/UPVHRy+MpMEl9IdRvIPlEuU=", "narHash": "sha256-d+/UEmzF9xGXBDILszp6ZpQwV9P5SCUaboxsOvKSM2s=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "919264cca85ed268c3f24214a26a25134390825c", "rev": "f2b7a0eab045cf91961a9006152b3c6fd9da0c37",
"revCount": 419, "revCount": 423,
"type": "git", "type": "git",
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
}, },
@@ -930,11 +930,11 @@
}, },
"nixpkgs-master_2": { "nixpkgs-master_2": {
"locked": { "locked": {
"lastModified": 1792653584, "lastModified": 1793722985,
"narHash": "sha256-vniEjRZ2skWqpreoaSJt7MCXDc/uZI/+ZDdLSa1/h6I=", "narHash": "sha256-LG9Fc7wXwhm67Mz999kX1O/gUPeNGj9ThL+b7diR2js=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c21ae394d8839a9d4cad6e2fb2f312ebef0447b", "rev": "99faf641a2977fdf121860f9e3369f148807ccca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -946,11 +946,11 @@
}, },
"nixpkgs-master_3": { "nixpkgs-master_3": {
"locked": { "locked": {
"lastModified": 1792659130, "lastModified": 1793722985,
"narHash": "sha256-O8Eu5JrtHKJqsA0a4suXwgEcrK4aVHsfrRHzbLDTB74=", "narHash": "sha256-LG9Fc7wXwhm67Mz999kX1O/gUPeNGj9ThL+b7diR2js=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6e931d843e890e1e7aab5d3a45e3eecbb167da5", "rev": "99faf641a2977fdf121860f9e3369f148807ccca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -962,11 +962,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1792615934, "lastModified": 1793633738,
"narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=", "narHash": "sha256-tItrb9M8eYA6WhFgmT9tpGKueri3+wRuVA952o/2xSU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36", "rev": "7dcdd87373d72e7a2173e4db02e20d3d7f495cfd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -978,11 +978,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1792506237, "lastModified": 1793706278,
"narHash": "sha256-Q/8KLB6jNfpaUN1HAedE/u/Et9feE/zYSsutBLKrCFk=", "narHash": "sha256-CE1GD35mj//AKYuLNbQJZDelQYWzef5GBpQno9uyNP0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5adc50831c259f87faeb09ddf930d43597197473", "rev": "ea9e3ef341e11c193537f674f821a99f9f436729",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1206,11 +1206,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1792659131, "lastModified": 1793722696,
"narHash": "sha256-GaqMC/GkKEUzX4XlVnCxhEQfR3wicT0XlpRhfDsGm0c=", "narHash": "sha256-Fn9EY9BbSoUZehtTyAMCDwlNq9jzCXT3iUCYcsjLvAI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b1e5d9527e6d663d09cb082d44ac834155798e69", "rev": "3571a9d461119a501d9861715c4862f25f51b285",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1243,11 +1243,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1792644899, "lastModified": 1793723922,
"narHash": "sha256-ub192yT1SwxVyf2DHKW34xHJnL/LXRi2jm1IFyZMkqQ=", "narHash": "sha256-0d9go7harq36rwMOSqVhOnnd6fD9FEJ9bvx9m8/S37Q=",
"owner": "anomalyco", "owner": "anomalyco",
"repo": "opencode", "repo": "opencode",
"rev": "c93aaae37157d785f76a8e9a9243a6560e286468", "rev": "8b038f672b0ee520d3ab6bc1014fc3eddba5961c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1455,11 +1455,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1792219666, "lastModified": 1793434469,
"narHash": "sha256-RMO08tKD+hFIL5ryWi85VY4aHE5oIpdV1h4kVFctOkw=", "narHash": "sha256-+sgVNI2c67di+XIeMaz5KSei4T65kX68s5Nl0E5Gzbc=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a110337465cfb76e3806b81b9db3094c3e6e770a", "rev": "6ecf534a7c16e7c969f26838fdd8c93597ae93f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1470,11 +1470,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1791219833, "lastModified": 1793044983,
"narHash": "sha256-q8KNN9Zs/nau7Cc8+f5ZGJeMXmCQqm5+bgy5m/uYxmw=", "narHash": "sha256-TMADWku9ye40AQKGMdSoCpByfqaL7kbO+o8E46Q7CLQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1f623a1582190fa3ba3f5cea25aba925055d43eb", "rev": "89844ad35df40e876cb6d0a3a319fbf65ea4b984",
"type": "github" "type": "github"
}, },
"original": { "original": {
-2
View File
@@ -87,10 +87,8 @@
inherit (self) outputs; inherit (self) outputs;
systems = [ systems = [
"aarch64-linux" "aarch64-linux"
"i686-linux"
"x86_64-linux" "x86_64-linux"
"aarch64-darwin" "aarch64-darwin"
"x86_64-darwin"
]; ];
forAllSystems = nixpkgs.lib.genAttrs systems; forAllSystems = nixpkgs.lib.genAttrs systems;
allOverlays = import ./overlays {inherit inputs outputs;}; allOverlays = import ./overlays {inherit inputs outputs;};
+11 -50
View File
@@ -7,8 +7,9 @@
# - Lane 3, control & inbox: Hermes via Matrix (unchanged). # - Lane 3, control & inbox: Hermes via Matrix (unchanged).
# #
# Flow: T3 desktop/mobile app ──NetBird mesh──▶ wt0 :3773 (this server). # Flow: T3 desktop/mobile app ──NetBird mesh──▶ wt0 :3773 (this server).
# The server binds 0.0.0.0, but the firewall admits the port for mesh # The server itself comes from m3ta-home's t3code module: it binds the
# peers only — same posture as ai-memory and the hermes dashboard. # current NetBird address of wt0 and opens the port on wt0 only. This file
# adds the hermes-specific agent runtime around it.
# #
# Agent runtime for the T3 harnesses (OpenCode / Claude Code, 2026-10-31): # Agent runtime for the T3 harnesses (OpenCode / Claude Code, 2026-10-31):
# - Skills/commands/agents via agent-lib v2: a timer syncs the work repo # - Skills/commands/agents via agent-lib v2: a timer syncs the work repo
@@ -17,7 +18,7 @@
# path unit mirrors skills into ~/.claude/skills for Claude Code # path unit mirrors skills into ~/.claude/skills for Claude Code
# (port of m3ta-home profiles/sets/coding/agents/claude-skills.nix). # (port of m3ta-home profiles/sets/coding/agents/claude-skills.nix).
# - Git identity and Gitea push auth: m3ta-chiron for every harness spawned # - Git identity and Gitea push auth: m3ta-chiron for every harness spawned
# by T3, baked into the package (overlays/default.nix, # by T3, baked into the package (m3ta-home overlay
# t3code-agent-identity), so m3tam3re's interactive git is untouched. # t3code-agent-identity), so m3tam3re's interactive git is untouched.
# - Gitea SSH: m3tam3re's ssh config pins User gitea + key ~/.ssh/gitea # - Gitea SSH: m3tam3re's ssh config pins User gitea + key ~/.ssh/gitea
# (one-time keygen; pubkey added to the m3ta-chiron account) for # (one-time keygen; pubkey added to the m3ta-chiron account) for
@@ -47,10 +48,6 @@
pkgs, pkgs,
... ...
}: let }: let
# Mesh-only via interface match on wt0 (NetBird) — an IPv4 CIDR in -s
# would abort the ip6tables run of ip46tables and fail the unit.
port = config.m3ta.ports.get "t3code";
# ── Lane-1 agent runtime ───────────────────────────────────────────── # ── Lane-1 agent runtime ─────────────────────────────────────────────
cockpitUser = "m3tam3re"; cockpitUser = "m3tam3re";
cockpitHome = "/home/${cockpitUser}"; cockpitHome = "/home/${cockpitUser}";
@@ -111,38 +108,13 @@ in {
pkgs.agent-lib pkgs.agent-lib
]; ];
# ── T3 Code server (system service, cockpit user) ──────────────────── # ── T3 Code server (m3ta-home module, cockpit user) ─────────────────
systemd.services.t3code = { # The harnesses, git and beads for the agents come from the system
description = "T3 Code server (interactive coding-agent cockpit)"; # profile above (the module puts /run/current-system/sw on the path).
after = ["network-online.target"]; m3ta.t3code = {
wants = ["network-online.target"]; enable = true;
wantedBy = ["multi-user.target"]; user = cockpitUser;
port = config.m3ta.ports.get "t3code";
serviceConfig = {
User = "m3tam3re";
Group = "users";
WorkingDirectory = "/home/m3tam3re";
ExecStart = "${pkgs.llm-agents.t3code}/bin/t3 serve --host 0.0.0.0";
Restart = "on-failure";
RestartSec = "5";
};
environment = {
T3CODE_PORT = toString port;
# Deterministic service context: HOME explicit so tools resolve ~ in
# every process this service spawns, however deep t3's pty/sandbox
# chain resets the environment.
HOME = cockpitHome;
};
# Harness CLIs, git and the issue tracker for the agents T3 Code spawns.
path = with pkgs; [
git
openssh
llm-agents.opencode2
llm-agents.claude-code
llm-agents.beads
];
}; };
# ── Gitea (code.m3ta.dev) for the T3 lane ──────────────────────────── # ── Gitea (code.m3ta.dev) for the T3 lane ────────────────────────────
@@ -215,15 +187,4 @@ in {
}; };
environment.HOME = cockpitHome; environment.HOME = cockpitHome;
}; };
networking.firewall = {
extraCommands = ''
# Allow t3code only from Netbird mesh VPN
ip46tables -A nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept
'';
extraStopCommands = ''
ip46tables -D nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept 2>/dev/null || true
'';
};
} }