diff --git a/docs/README.md b/docs/README.md index 838e847..8aeebc0 100644 --- a/docs/README.md +++ b/docs/README.md @@ -75,10 +75,10 @@ h.nul.ie ├── palace (physical VM host — AMD, 100G, SR-IOV) │ ├── river ── primary router VM (PPPoE / Digiweb WAN) │ ├── cellar ─ NVMe-oF / SPDK storage target VM -│ └── sfh ──── container host VM ("shill from home") -│ ├── hass ── Home Assistant + Frigate + MQTT (container) -│ ├── unifi ─ UniFi controller (container) -│ └── slop-cannon ─ coding agents via Paseo (container) +│ ├── sfh ──── container host VM ("shill from home") +│ │ ├── hass ── Home Assistant + Frigate + MQTT (container) +│ │ └── unifi ─ UniFi controller (container) +│ └── slop-cannon ─ coding agents via Paseo (VM, on untrusted) ├── stream (physical secondary router — Virgin Media WAN) └── castle (workstation / gaming desktop — netboot, NVMe-oF root) ``` diff --git a/docs/deployment.md b/docs/deployment.md index fdfb306..373497b 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -127,8 +127,13 @@ a running custom installer, SSHing as root with `.keys/deploy.key`): | `installer-shell [cmd]` | Runs a command (default: a shell) inside the installer. | | `do-install [--no-bootloader] [--no-substitute] ` | Builds the system's `toplevel`, `nix copy`s it into the installer's target store, sets the system profile, and activates it with `switch-to-configuration boot` (with `NIXOS_INSTALL_BOOTLOADER=1` unless `--no-bootloader`). | -From [`devshell/vm-tasks.nix`](../devshell/vm-tasks.nix) (remote VM consoles; they forward the -VM's unix sockets from `/run/vms//` on `` over SSH): +### VM consoles + +The [`my.vms` module](../nixos/modules/vms.nix) provides `doas vm-tty ` on the VM host. +It opens the serial console in `minicom` via `/run/vms//tty.sock`. + +The [devshell commands](../devshell/vm-tasks.nix) forward the VM's Unix sockets from +`/run/vms//` on `` over SSH. | Command | What it does | |---|---| diff --git a/docs/networking.md b/docs/networking.md index 2395e2d..f2455c6 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -380,6 +380,7 @@ blocks access to colony, where the home prefixes are trusted across the mesh. `untrusted` hosts. - Traffic to the routers themselves goes through the same `input` rules as `wan`. - Clients on `untrusted` share layer 2 with each other; the routers can't filter that. +- [`slop-cannon`](sites/home/slop-cannon.md) uses a static address on the `untrusted` VLAN. #### DNS binding diff --git a/docs/sites/home/README.md b/docs/sites/home/README.md index f2a7478..f1f106c 100644 --- a/docs/sites/home/README.md +++ b/docs/sites/home/README.md @@ -17,6 +17,7 @@ pair, and everything clients touch (gateway, DNS) is a floating VIP that follows | [`stream`](stream.md) | Secondary router (VRRP pair with `river`) | physical | | [`cellar`](cellar.md) | NVMe-oF / SPDK storage target | VM on `palace` | | [`sfh`](sfh/README.md) | NixOS container host (containers on its page) | VM on `palace` | +| [`slop-cannon`](slop-cannon.md) | Coding agents, driven remotely through Paseo; on `untrusted` | VM on `palace` | | [`castle`](castle.md) | Workstation / gaming desktop | physical | ## Router VIPs diff --git a/docs/sites/home/cellar.md b/docs/sites/home/cellar.md index d016535..cbc5216 100644 --- a/docs/sites/home/cellar.md +++ b/docs/sites/home/cellar.md @@ -2,7 +2,7 @@ The home storage target. A VM on `palace` that drives three passed-through NVMe disks with SPDK and exports them over NVMe-oF/RDMA — `river`, `sfh` and `castle` all run their root storage off -it. +it, and `slop-cannon`'s disk lives on it. - **Source:** [`nixos/boxes/home/palace/vms/cellar/`](../../../nixos/boxes/home/palace/vms/cellar) (`default.nix`, `spdk.nix`) @@ -22,6 +22,7 @@ it. | `NVMeRaidp1` | `nqn.2016-06.io.spdk:river` | [`river`](river.md) | | `NVMeRaidp2` | `nqn.2016-06.io.spdk:castle` | [`castle`](castle.md) | | `NVMeRaidp3` | `nqn.2016-06.io.spdk:sfh` | [`sfh`](sfh/README.md) | + | `NVMeRaidp4` | `nqn.2016-06.io.spdk:slop-cannon` | [`palace`](palace.md#slop-cannons-disk), for [`slop-cannon`](slop-cannon.md) | Each subsystem is pinned to its consumer's `hostnqn` (the `my.nvme.uuid` on the client side). - `spdk-tgt` doesn't restart on deploy (`restartIfChanged = false`): restarting it takes every @@ -38,7 +39,7 @@ See the consolidated [network assignments](../../networking.md#box-assignments) Partitions on `NVMeRaid` are ordinary GPT partitions. SPDK's `gpt` module finds them when it examines the RAID (`bdev_examine` in `spdk.nix`; auto-examine is off) and exposes those whose type -GUID is SPDK's, as `NVMeRaidp`. `p1`–`p3` use the current type GUID, +GUID is SPDK's, as `NVMeRaidp`. `p1`–`p4` use the current type GUID, `6527994e-2c5a-4eec-9613-8f5944074e8b`. Use it for new partitions and leave existing partition types as they are. SPDK still supports its deprecated type, `7c5222bd-8f5d-4087-9c00-bf9843c7b58c`, and exposes one fewer block for that type to preserve compatibility with existing on-disk metadata. @@ -51,9 +52,10 @@ while the exports are live: every consumer has to be down. Start from a box that when the exports are offline. 1. Shut down every consumer. Power off `castle` and run - `doas systemctl stop vm@sfh vm@river` on `palace`. `stream` takes over the router VIPs. On - `cellar`, verify that `doas spdk-rpc nvmf_subsystem_get_controllers ` returns `[]` for each - exported subsystem in the table above. + `doas systemctl stop vm@sfh vm@river slop-cannon-disk` on `palace`. `stream` takes over the + router VIPs. Stopping `slop-cannon-disk` shuts down `vm@slop-cannon` before disconnecting its + disk. On `cellar`, verify that `doas spdk-rpc nvmf_subsystem_get_controllers ` returns `[]` + for each exported subsystem in the table above. 2. On `cellar`, stop the target and start `spdk-debug` in its place. It runs `spdk_tgt` on a config generated from the real one: the same controllers and RAID, but nothing examined (so the `gpt` module never claims the RAID), nothing exported, and the RAID exposed through ublk @@ -88,7 +90,7 @@ when the exports are offline. serial), deploy `cellar` (the unit doesn't restart) and `doas systemctl start spdk-tgt`. Check `doas spdk-rpc bdev_get_bdevs` lists the new partition and `doas spdk-rpc nvmf_get_subsystems` the new subsystem. -7. Start the consumers again. +7. Start the consumers again. Starting `vm@slop-cannon` also starts `slop-cannon-disk`. If `spdk-tgt` won't start in step 6, the usual cause is a config naming a bdev that doesn't exist. Switch `cellar` back to its previous generation diff --git a/docs/sites/home/palace.md b/docs/sites/home/palace.md index a650157..58b47df 100644 --- a/docs/sites/home/palace.md +++ b/docs/sites/home/palace.md @@ -1,7 +1,7 @@ # palace -The physical VM host for the home site. Runs the `river`, `cellar` and `sfh` VMs and feeds them -SR-IOV VFs, PCI NVMe drives and LVM disks. +The physical VM host for the home site. Runs the `river`, `cellar`, `sfh` and `slop-cannon` VMs and +feeds them SR-IOV VFs, PCI NVMe drives, LVM disks and an NVMe-oF disk. - **Source:** [`nixos/boxes/home/palace/default.nix`](../../../nixos/boxes/home/palace/default.nix) (VM definitions in [`palace/vms/default.nix`](../../../nixos/boxes/home/palace/vms/default.nix)) @@ -35,7 +35,7 @@ See the consolidated [network assignments](../../networking.md#box-assignments) ## Networking 100G `uplink-dave` (mlx5, MTU 9000) connects to the `dave` switch and carries `lan-hi` (VLAN 100, -the `hi` assignment). A udev rule creates five SR-IOV VFs on the PF. Two physically separate Intel +the `hi` assignment). A udev rule creates six SR-IOV VFs on the PF. Two physically separate Intel connections lead to `jim`: `host-jim` serves `palace` and `sfh`, while `river-jim-phy` is exported exclusively to `river`. @@ -64,14 +64,15 @@ BPDUs without a guest-to-host receive-filter synchronization service. ```text dave └─ palace uplink-dave (ConnectX-4 PF) - ├─ VLAN 100 ───────────────────────────────> palace lan-hi + ├─ VLAN 100 ───────────────────────────────> palace lan-hi ───> cellar NVMe/RDMA (slop-cannon's disk) ├─ VF 0 cellar-hi ────────────────────────> cellar lan-hi ├─ VF 1 river-rdma ───────────────────────> river rdma-hi ──> cellar NVMe/RDMA ├─ VF 2 sfh-hi ───────────────────────────> sfh lan-hi ─────> cellar NVMe/RDMA ├─ VF 3 sfh-ctrs ─────────────────────────> sfh ctrs-hi │ ├─> hass host0 │ └─> unifi host0 - └─ VF 4 river-dave ───────────────────────> river lan-dave ──┐ + ├─ VF 4 river-dave ───────────────────────> river lan-dave ──┐ + └─ VF 5 slop-cannon-ut ───> slop-cannon lan-untrusted │ ├─> river lan (RSTP) jim │ ├─ palace river-jim-phy ── river-jim-tap ─────> river lan-jim ───┘ @@ -101,13 +102,13 @@ from the host to its guests. Interface names in the destination columns belong t | Switch port | Host interface | Host networks | Guest handoff | |---|---|---|---| -| `dave` `palace` | `uplink-dave` | VLAN 100 → `lan-hi` | Five PCI VFs, listed below | +| `dave` `palace` | `uplink-dave` | VLAN 100 → `lan-hi` | Six PCI VFs, listed below | | `jim` `palace` | `host-jim` | Native `core` → `lan-core`; VLAN 110 → `lan-lo-phy` → `lan-lo` | `sfh-core-tap` and `sfh-lo-tap` | | `jim` `river` | `river-jim-phy` | No host L3 configuration | `river-jim-tap` macvtap → `river` `lan-jim` | #### ConnectX-4 VFs -All five VFs belong to `uplink-dave`. VLAN filtering and carrier policy are applied on the PF. +All six VFs belong to `uplink-dave`. VLAN filtering and carrier policy are applied on the PF. | VF / PCI BDF | QEMU device | Guest | Guest interface | VLAN / carrier | Role | |---|---|---|---|---|---| @@ -116,6 +117,7 @@ All five VFs belong to `uplink-dave`. VLAN filtering and carrier policy are appl | 2 / `44:00.3` | `sfh-hi` | [sfh](sfh/README.md) | `lan-hi` | 100 / forced up | NVMe/RDMA root and management | | 3 / `44:00.4` | `sfh-ctrs` | [sfh](sfh/README.md#networking) | `ctrs-hi` | 100 / forced up | Container `hi` network | | 4 / `44:00.5` | `river-dave` | [river](river.md#virtual-machine-and-network-attachment) | `lan-dave` | Unfiltered trunk / automatic | Preferred RSTP attachment | +| 5 / `44:00.6` | `slop-cannon-ut` | [slop-cannon](slop-cannon.md#network) | `lan-untrusted` | 120 / automatic | Agents' only network. MAC spoof checking is on. | #### Virtual Ethernet handoffs @@ -139,19 +141,43 @@ run before stage-two module loading. `sfh` requires the `frigate` LV before QEMU |---|---|---|---|---| | `cellar` | 8c × 2t | 16 GiB | `cellar-hi` VF 0 (`44:00.1`); NVMe `41:00.0`–`43:00.0` | pinned to NUMA node 1; split IRQ chip + vIOMMU | | `river` | 3c × 2t | 4 GiB | `river-rdma` VF 1 (`44:00.2`), `river-dave` VF 4 (`44:00.5`), `river-jim-tap` | only an ESP local disk (plus an installer ISO) — root is NVMe-oF from `cellar` | -| `sfh` | 16c × 2t | 96 GiB | `sfh-hi` VF 2 (`44:00.3`), `sfh-ctrs` VF 3 (`44:00.4`); two USB host ports | no boot disk — netboots; gets the `hdds/frigate` LV | +| `sfh` | 8c × 2t | 32 GiB | `sfh-hi` VF 2 (`44:00.3`), `sfh-ctrs` VF 3 (`44:00.4`); two USB host ports | no boot disk — netboots; gets the `hdds/frigate` LV | +| `slop-cannon` | 16c × 2t | 48 GiB | `slop-cannon-ut` VF 5 (`44:00.6`) | disk is NVMe-oF from `cellar`, connected by `palace` (plus an installer ISO) | -`sfh`'s vCPUs are overcommitted (the VMs total more vCPUs than the host's 32 threads) so the coding -agents in [`slop-cannon`](sfh/containers/slop-cannon.md) can burst; that container's own CPU weight -and memory cap keep `hass` and `unifi` responsive. +`slop-cannon`'s vCPUs are overcommitted (the VMs total more vCPUs than the host's 32 threads) so +coding agents can burst; `vm@slop-cannon` has a low `CPUWeight`, so `cellar`, `river` and `sfh` +win under contention. Boot ordering is enforced with systemd dependencies: `vm@river` waits for `cellar`'s SSH port (and for the `river-jim-tap` device), and `vm@sfh` waits for `river` — storage first, then the router, -then everything that boots off both. +then everything that boots off both. `vm@slop-cannon` waits only for its disk (below); nothing +waits for it. + +`vm@` units don't restart on deploy (`restartIfChanged = false`); a changed VM config applies the +next time the VM starts. + +### `slop-cannon`'s disk + +`palace` is an NVMe-oF initiator for one guest: `slop-cannon`'s disk is +`nqn.2016-06.io.spdk:slop-cannon` on [`cellar`](cellar.md), connected by `palace` (`my.nvme.uuid` +is its host NQN) and passed to QEMU as a virtio disk. The guest never speaks NVMe-oF itself: +SPDK only checks the host NQN, which root in the guest could forge. + +`palace` hosts `cellar`, so the connection is kept out of `palace`'s own boot and shutdown: + +- `slop-cannon-disk.service` waits for `cellar`'s SSH port, runs `nvme connect -t rdma` over + `lan-hi` and disconnects on stop. It is `BindsTo` / `After` `vm@cellar`, and only + `vm@slop-cannon` requires it. Nothing in the initrd, `fileSystems` or `multi-user.target` uses + the disk. +- Shutdown runs in reverse: `vm@slop-cannon`, then the disconnect, then `cellar`. +- `--ctrl-loss-tmo 60`: if `cellar` dies, the controller is removed after a minute and QEMU sees + I/O errors, instead of the kernel retrying forever. +- `devices/global_filter` rejects `/dev/nvme*` in `lvm.conf`, so `palace` never activates the + guest's volume group (also called `main`). `palace` has no NVMe of its own. ## Notable config files - [`nixos/boxes/home/palace/default.nix`](../../../nixos/boxes/home/palace/default.nix) — host hardware, networkd (links/bridges/SR-IOV), LVM. - [`nixos/boxes/home/palace/vms/default.nix`](../../../nixos/boxes/home/palace/vms/default.nix) — - VM instances and boot ordering. + VM instances, boot ordering and `slop-cannon`'s disk connection. diff --git a/docs/sites/home/sfh/README.md b/docs/sites/home/sfh/README.md index 623019a..b68269d 100644 --- a/docs/sites/home/sfh/README.md +++ b/docs/sites/home/sfh/README.md @@ -24,8 +24,6 @@ from `river` and runs its root off NVMe-oF from `cellar`. `/var/lib/frigate`. - USB: two host ports are passed to the VM (qemu flags) for the Zigbee coordinator and webcam used by `hass`; the nspawn unit gets `DeviceAllow` for `char-ttyUSB` and `char-video4linux`. -- `slop-cannon`'s nspawn unit gets a low `CPUWeight` and a `MemoryMax`, so agent builds can't starve - `hass` and `unifi`, and a larger `/tmp` tmpfs than nspawn's default (10% of RAM). ## Network assignments @@ -55,7 +53,6 @@ back through the VM handoffs to the physical switch connections. |---|---| | [`hass`](containers/hass.md) | Home Assistant + Frigate + MQTT | | [`unifi`](containers/unifi.md) | UniFi controller | -| [`slop-cannon`](containers/slop-cannon.md) | Coding agents, driven remotely through Paseo | ## Notable config files diff --git a/docs/sites/home/sfh/containers/slop-cannon.md b/docs/sites/home/sfh/containers/slop-cannon.md deleted file mode 100644 index b1abe3f..0000000 --- a/docs/sites/home/sfh/containers/slop-cannon.md +++ /dev/null @@ -1,162 +0,0 @@ -# slop-cannon - -Coding agents (Claude Code and Codex), driven from the phone or a browser through -[Paseo](https://github.com/getpaseo/paseo), running as a container on [`sfh`](../README.md). - -- **Source:** [`nixos/boxes/home/palace/vms/sfh/containers/slop-cannon.nix`](../../../../../nixos/boxes/home/palace/vms/sfh/containers/slop-cannon.nix) -- **Host:** NixOS container on `sfh` -- **nixpkgs:** `mine` - -## Role - -- Runs the Paseo daemon and the agents it starts, all as the unprivileged user `slop-cannon`. -- Not a deploy-rs target (`my.deploy.enable = false`): it's rendered via `my.asContainer` and - deployed with `sfh`. -- `sfh` gives the container a low `CPUWeight`, a `MemoryMax` and a larger `/tmp` tmpfs for agent - scratch files; `/tmp` counts against the memory cap. - -## Network assignments - -See the consolidated [network assignments](../../../../networking.md#box-assignments) table (this box: `slop-cannon`). - -A single MACVLAN interface, `host0` on `sfh`'s `ctrs-hi`, carries the `hi` assignment. Nothing -listens on it apart from SSH. - -## Users - -| User | Purpose | -|---|---| -| `slop-cannon` | Runs Paseo and the agents; no `wheel`, locked password, Dev's SSH key; home persisted; UID/GID pinned in `lib.my.c.ids` | -| `dev` | Administration (`doas`); the usual primary user | - -Both have Dev's SSH key; connect with the shared `ssh` aliases `slop-cannon` and `slop-cannon-dev` -(see [SSH and first login](#ssh-and-first-login)). - -## Paseo - -A daemon (`paseo-server`) that starts and manages agents and serves a WebSocket API to the Paseo -app, the web UI and the `paseo` CLI. Claude Code runs through the Claude Agent SDK, using the -installed `claude` and its claude.ai login; Codex runs through `codex app-server`. - -### Service - -- The upstream `services.paseo` module (flake input `paseo`, pinned to a release, imported in - `nixos/modules/common.nix`), with a package override for the web UI bug - [getpaseo/paseo#7673](https://github.com/getpaseo/paseo/issues/7673). -- Runs as `slop-cannon`, so agents use that user's logins and settings, with `~/.paseo` as - `PASEO_HOME`. -- The daemon password comes from the age secret `slop-cannon/paseo.env` (`PASEO_PASSWORD=…`). Read - it with `ragenix -e secrets/slop-cannon/paseo.env.age`. -- The service is not restarted on deploy, so running agents aren't interrupted. Restart it by hand - (`doas systemctl restart paseo`) to pick up a new config; stopping it stops its agents. -- Startup takes about a minute and a half while bundled plugins load; the daemon answers 503 until - it is ready. - -### Settings - -`services.paseo.settings` is rewritten into `~/.paseo/config.json` on every start, so changes made -from the app don't survive a restart. It: - -- disables the tools Paseo injects into agents (`daemon.mcp.injectIntoAgents = false`), which would - let an agent change its own mode, answer its own permission prompts or open terminals; -- requires relay replay protection; -- turns off dictation and voice, which would otherwise download a large local speech model; -- hides providers other than Claude and Codex; -- adds a "Claude, accept edits" agent profile. Each provider's default mode is hardcoded upstream - (Claude `auto`, Codex `auto-review`), and profiles are the only way to preset one. - -### Connectivity - -- The daemon listens on `127.0.0.1:6767` only. The phone app and the browser reach it through our - relay on [`middleman`](../../../colony/shill/containers/middleman.md#paseo-relay) - (`paseo-relay.nul.ie`). -- Traffic through the relay is end-to-end encrypted between the app and the daemon; the relay sees - only addresses, timing and sizes. The pairing QR code or link is the trust anchor; treat it like a - password. Switching relays means re-pairing. -- Push notifications go from the daemon to Expo's push service (`exp.host`), one outbound request - per notification carrying its text. -- In a browser, open the link `paseo daemon pair` prints. `app.baseUrl` points it at our copy of - the web app on `paseo.nul.ie`, served by `middleman`, instead of `app.paseo.sh`. The daemon's own - web UI stays off, so nothing needs to reach the daemon directly. -- Opening a pairing link in the address bar adds the host without asking for the daemon password, - and the host page then shows "Password required" with no way to enter it. Instead, use the app's - option to paste a pairing link, which prompts for the password; remove a host added the other way - first. - -### State - -Paseo keeps only its own records in `~/.paseo`: `config.json`, the daemon keypair and local -credentials, one record per agent under `agents/`, registered projects and workspaces, and the git -worktrees it creates under `worktrees/`. Conversations stay in the providers' own stores: a Claude -agent is a normal session under `~/.claude/projects/`, a Codex agent a normal rollout under -`~/.codex/sessions/`. - -## Repos, worktrees and jj - -Repos live under `~/src` as colocated jj clones (see `slop-clone` below). Paseo only calls `git`: - -- A `local` workspace runs the agent in the checkout itself; `jj` and Paseo's git views see the same - changes. Use it for work you want to steer with `jj`. -- A worktree workspace is a `git worktree` under `~/.paseo/worktrees` on its own branch. Use it for - unattended agents. Archiving it removes the worktree with `--force`, losing uncommitted work. -- Archiving a `local` workspace removes only Paseo's record; the folder is kept. -- Only one colocated working copy per repo is possible, so parallel jj-driven work needs separate - clones. -- Don't run `jj` in a folder while an agent is mid-turn there: jj snapshots its partial edits. - -## Terminal access - -- The `paseo` CLI talks to the running daemon: `paseo ls`, `paseo logs -f `, `paseo send - "…"`, `paseo permit ls|allow|deny`. It is command-line only, not a chat interface. -- A session can be taken over in the provider's own TUI by its ID: `claude --resume ` in - the agent's folder, or `codex resume `. `paseo import` goes the other way. This is a - hand-off, not a shared view: stop the agent in Paseo first and don't type in both. - -## Agent permissions - -Paseo has the full rights of `slop-cannon`: anyone with the daemon password or a pairing can start -agents in any mode, answer prompts and open terminals. The boundaries are the container, the -unprivileged user and the approval broker in front of the deploy key. - -- Claude Code and Codex come from the shared `my.agents` home-manager module. -- Claude's user settings deny raw `deploy`, `ssh-machine` and `.keys/`, and ask before - `slop-deploy` / `slop-ssh`. These match command text, so they steer agents rather than enforce a - boundary. -- Claude's managed settings (`/etc/claude-code/managed-settings.json`) repeat the `deny` rules and - disable bypass mode; agents can edit `~/.claude` but not `/etc`. The app still lists Bypass, but - choosing it fails. -- Codex stores its credentials in a file. A bubblewrap diagnostic compatibility override enables - its existing nspawn fallback; deployed and verified directly and through a fresh Paseo session. - See [Codex sandbox in nspawn](../../../../../agents-remote.md#codex-sandbox-in-nspawn). -- Deploys and `ssh-machine` access are meant to go through an approval broker, which is not built - yet; until then agents can't deploy. - -## SSH and first login - -`slop-cannon` is not a deploy node, so `ssh-machine` can't reach it; SSH to -`slop-cannon-ctr.h.nul.ie` directly. Never forward your SSH agent into the box: agents could use -it while you're logged in. As a last resort, `ssh-machine sfh` and -`doas machinectl shell root@slop-cannon`. - -The box has one Git key, `~slop-cannon/.ssh/id_ed25519`, generated on first boot. Add its public key -in Gitea as a write-enabled deploy key on each repo agents may use. Commits are authored as Dev -through the shared Git config. - -First login, once, over `ssh slop-cannon`: - -1. `claude auth login` (a full login; `setup-token` tokens are not enough for every feature). -2. `codex login --device-auth`. -3. `paseo daemon pair`, then scan the QR code with the Paseo app. The pairing link carries the - relay endpoint. -4. `slop-clone /` for each repo. It clones a colocated jj repo into `~/src/`, - registers it with Paseo as a local workspace, and prints the box's public key if Gitea refuses - the clone. - -## Notable config files - -- [`nixos/boxes/home/palace/vms/sfh/containers/slop-cannon.nix`](../../../../../nixos/boxes/home/palace/vms/sfh/containers/slop-cannon.nix) — - container system: users, Paseo, Claude settings, `slop-clone`. -- [`home-manager/modules/agents/default.nix`](../../../../../home-manager/modules/agents/default.nix) — - shared Claude Code and Codex configuration. -- [`nixos/boxes/home/palace/vms/sfh/default.nix`](../../../../../nixos/boxes/home/palace/vms/sfh/default.nix) — - the `sfh` side: container instance, MACVLAN, CPU, memory and `/tmp` limits. diff --git a/docs/sites/home/slop-cannon.md b/docs/sites/home/slop-cannon.md new file mode 100644 index 0000000..a47c55b --- /dev/null +++ b/docs/sites/home/slop-cannon.md @@ -0,0 +1,208 @@ +# slop-cannon + +Coding agents (Claude Code and Codex), driven from the phone or a browser through +[Paseo](https://github.com/getpaseo/paseo), running in a VM on [`palace`](palace.md) with root +inside it. + +- **Source:** [`nixos/boxes/home/palace/vms/slop-cannon.nix`](../../../nixos/boxes/home/palace/vms/slop-cannon.nix) + (the VM itself in [`palace/vms/default.nix`](../../../nixos/boxes/home/palace/vms/default.nix)) +- **Host:** VM on `palace` +- **nixpkgs:** `mine` + +## VM resources + +| vCPUs | RAM | Disk | Network | Other | +|---|---|---|---|---| +| 16c × 2t (overcommitted) | 48 GiB | 512 GiB virtio, NVMe-oF from `cellar` via `palace` | SR-IOV VF 5 (`44:00.6`) on VLAN 120 | installer ISO | + +`vm@slop-cannon` has a low `CPUWeight` on `palace`, so `cellar`, `river` and `sfh` win under +contention. `palace` has `kvm_amd` `nested=1`, so the guest has `/dev/kvm`. + +## Role + +- Runs the Paseo daemon and the agents it starts, as the user `slop-cannon`. Agents have root in + the VM (`wheel`, passwordless `doas`): nested VMs, kernel modules, system services. +- A normal deploy node (`deploy .#slop-cannon`, `ssh-machine slop-cannon`). +- Everything inside the guest is treated as agent-controlled. The boundaries are outside it: + the `untrusted` filter on the routers, the VLAN tag on the NIC and the disk connection on + `palace`. Credentials for deploying or logging into other boxes stay outside the VM. + +## Network assignments + +See the consolidated [network assignments](../../networking.md#box-assignments) table (this box: +`slop-cannon`). + +## Network + +- The only interface, `lan-untrusted`, is SR-IOV VF 5 on `palace`. The NIC tags and filters VLAN + 120 and enforces MAC spoof checking on the host side. The guest loads `mlx5_core` at boot. + See the [VF attachment table](palace.md#connectx-4-vfs). +- A static `untrusted` address (outside both routers' DHCP pools), MTU 1500. DNS is Cloudflare, + as `untrusted`'s DHCP and RAs hand out; the routers' resolvers aren't reachable from + `untrusted`. +- The routers keep `untrusted` to the Internet (see + [Untrusted clients](../../networking.md#untrusted-clients)). `git.nul.ie` and + `paseo-relay.nul.ie` resolve to colony IPv6 addresses, which are rejected, so Gitea SSH and the + Paseo relay fall back to IPv4 immediately. +- SSH from `hi` and `lo` works through the routers. The VM shares layer 2 with other clients + on the `untrusted` VLAN. +- Builds use the guest's own Nix daemon and store, behind the same filter. + +## Storage + +- One virtio disk: GPT with a 2 GiB ESP (partition label `esp`) and an LVM PV in VG `main`. +- `slop-cannon-nix`, `slop-cannon-persist` and `slop-cannon-tmp` are thin LVs in `main/tpool`, + overcommitted, so space goes to whichever needs it. The pool takes 90% of the VG; LVM grows it + into the rest at 80% full (`thin_pool_autoextend_threshold`). Watch `lvs` if it gets close. +- The root is `tmproot`; `/tmp` is its own LV, cleaned on boot and mounted with `discard`, so + agents' scratch files don't use RAM and freed space returns to the pool. +- The disk is `nqn.2016-06.io.spdk:slop-cannon` on [`cellar`](cellar.md), connected by `palace` + (see [`palace`'s disk notes](palace.md#slop-cannons-disk)). The guest never speaks NVMe-oF. + +## Users and secrets + +| User | Purpose | +|---|---| +| `slop-cannon` | Runs Paseo and the agents; `wheel` and `kvm`; locked password, Dev's SSH key; home persisted; UID/GID pinned in `lib.my.c.ids` | +| `dev` | Administration; locked password, Dev's SSH key | + +- No `user-passwd.txt` (`my.user.passwordSecret = null`): root belongs to the agents, so the box + gets no shared secrets. Recovery is through the installer ISO. +- The VM's SSH host key is the age identity for `slop-cannon/paseo.env` and + `slop-cannon/gitea-key`. Agents can read the host key and decrypt anything encrypted to it. + +## Paseo + +A daemon (`paseo-server`) that starts and manages agents and serves a WebSocket API to the Paseo +app, the web UI and the `paseo` CLI. Claude Code runs through the Claude Agent SDK, using the +installed `claude` and its claude.ai login; Codex runs through `codex app-server`. + +### Service + +- The upstream `services.paseo` module (flake input `paseo`, pinned to a release, imported in + `nixos/modules/common.nix`), with a package override for the web UI bug + [getpaseo/paseo#7673](https://github.com/getpaseo/paseo/issues/7673). +- Runs as `slop-cannon`, so agents use that user's logins and settings, with `~/.paseo` as + `PASEO_HOME`. +- The daemon password comes from the age secret `slop-cannon/paseo.env`. To read it for a new + client, follow [Pair a Paseo client](#pair-a-paseo-client). +- The service is not restarted on deploy, so running agents aren't interrupted. Restart it by hand + (`doas systemctl restart paseo`) to pick up a new config; stopping it stops its agents. +- Startup takes about a minute and a half while bundled plugins load; the daemon answers 503 until + it is ready. + +### Settings + +`services.paseo.settings` is rewritten into `~/.paseo/config.json` on every start, so changes made +from the app don't survive a restart. It: + +- disables the tools Paseo injects into agents (`daemon.mcp.injectIntoAgents = false`), which would + let an agent change its own mode, answer its own permission prompts or open terminals; +- requires relay replay protection; +- turns off dictation and voice, which would otherwise download a large local speech model; +- hides providers other than Claude and Codex; +- adds a "Claude, accept edits" agent profile. Each provider's default mode is hardcoded upstream + (Claude `auto`, Codex `auto-review`), and profiles are the only way to preset one. + +### Connectivity + +- The daemon listens on `127.0.0.1:6767` only. The phone app and the browser reach it through our + relay on [`middleman`](../colony/shill/containers/middleman.md#paseo-relay) + (`paseo-relay.nul.ie`). +- Traffic through the relay is end-to-end encrypted between the app and the daemon; the relay sees + only addresses, timing and sizes. The pairing QR code or link is the trust anchor; treat it like a + password. Switching relays means re-pairing. +- Push notifications go from the daemon to Expo's push service (`exp.host`), one outbound request + per notification carrying its text. +- `middleman` serves the static web app on `paseo.nul.ie`. The daemon's own web UI stays off. + +### State + +The agent home is backed by `/persist/home/slop-cannon`. It holds the provider logins and +sessions, repos, and `~/.paseo`, which contains the daemon keypair, agent records, projects, +workspaces and Paseo-managed Git worktrees. Paired clients trust that daemon keypair. Claude +sessions live under `~/.claude/projects/` and Codex sessions under `~/.codex/sessions/`. + +## Repos, worktrees and jj + +Repos live under `~/src` as colocated jj clones (see `slop-clone` below). Paseo only calls `git`: + +- A `local` workspace runs the agent in the checkout itself; `jj` and Paseo's git views see the same + changes. Use it for work you want to steer with `jj`. +- A worktree workspace is a `git worktree` under `~/.paseo/worktrees` on its own branch. Use it for + unattended agents. Archiving it removes the worktree with `--force`, losing uncommitted work. +- Archiving a `local` workspace removes only Paseo's record; the folder is kept. +- Only one colocated working copy per repo is possible, so parallel jj-driven work needs separate + clones. +- Don't run `jj` in a folder while an agent is mid-turn there: jj snapshots its partial edits. + +## Terminal access + +- The `paseo` CLI talks to the running daemon: `paseo ls`, `paseo logs -f `, `paseo send + "…"`, `paseo permit ls|allow|deny`. It is command-line only, not a chat interface. +- A session can be taken over in the provider's own TUI by its ID: `claude --resume ` in + the agent's folder, or `codex resume `. `paseo import` goes the other way. This is a + hand-off, not a shared view: stop the agent in Paseo first and don't type in both. + +## Agent permissions + +Paseo has the full rights of `slop-cannon`, and `slop-cannon` has root: anyone with the daemon +password or a pairing controls the VM. + +- Claude Code and Codex come from the shared `my.agents` home-manager module. +- Claude's user settings deny raw `deploy`, `ssh-machine` and `.keys/`, and ask before + `slop-deploy` / `slop-ssh`. Claude's managed settings (`/etc/claude-code/managed-settings.json`) + repeat the `deny` rules and disable bypass mode. All of these match command text and live inside + the guest, so they steer agents rather than enforce anything. +- Codex stores its credentials in a file and uses its standard Linux sandbox. +- Deployments and administrative SSH to other boxes are handled by an operator outside the VM. + +## SSH and first login + +`ssh slop-cannon` (agent user) and `ssh slop-cannon-dev` (`dev`) are the shared aliases, both with +`ForwardAgent=no`. Never forward your SSH agent into the box: agents could use it while you're +logged in. For recovery, use the [VM serial console](../../deployment.md#vm-consoles) for +`slop-cannon` on `palace`. + +The VM uses a Gitea deploy key from the age secret +`slop-cannon/gitea-key`. As `slop-cannon`, run +`ssh-keygen -y -f /run/secrets/slop-cannon/gitea-key` to get its public key. Add that public key +in Gitea as a write-enabled deploy key on each repo agents may use. Commits are authored as Dev +through the shared Git config. + +To set up provider logins and repos on a fresh agent home, connect with `ssh slop-cannon`: + +1. `claude auth login` (a full login; `setup-token` tokens are not enough for every feature). +2. `codex login --device-auth`. +3. [Pair a Paseo client](#pair-a-paseo-client). +4. `slop-clone /` for each repo. It clones a colocated jj repo into `~/src/`, + registers it with Paseo as a local workspace, and prints the box's public key if Gitea refuses + the clone. + +## Pair a Paseo client + +1. On the VM, run `slop-pair` as `slop-cannon`. It prints the QR code, pairing link and + `PASEO_PASSWORD`. Keep its output private. +2. If you only need the QR code and link, run `paseo daemon pair` as `slop-cannon`. To look up the + password separately, run `doas cat /run/secrets/slop-cannon/paseo.env` on the VM. You can also + decrypt it from a repo checkout with access to the dev age key: + + ```sh + rage --decrypt -i .keys/dev.key secrets/slop-cannon/paseo.env.age + ``` + +3. On a phone, scan the QR code from the Paseo app. In a browser, open `https://paseo.nul.ie` and + use the app's paste-pairing-link option. Enter the value after `PASEO_PASSWORD=` when prompted + and open the paired host. If the browser shows “Password required” after opening the link in + the address bar, remove that host entry and pair again using the paste dialog. + +## Notable config files + +- [`nixos/boxes/home/palace/vms/slop-cannon.nix`](../../../nixos/boxes/home/palace/vms/slop-cannon.nix) — + the box: users, Paseo, Claude settings, `slop-clone`, `slop-pair`, disk layout, network. +- [`nixos/boxes/home/palace/vms/default.nix`](../../../nixos/boxes/home/palace/vms/default.nix) — + the VM on `palace` and `slop-cannon-disk.service`. +- [`nixos/boxes/home/palace/default.nix`](../../../nixos/boxes/home/palace/default.nix) — VF 5, the + NVMe host ID and the LVM filter. +- [`home-manager/modules/agents/default.nix`](../../../home-manager/modules/agents/default.nix) — + shared Claude Code and Codex configuration. diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index bad1ed4..adc275f 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -171,12 +171,12 @@ in # Coding agents run as `slop-cannon`; never forward an agent there slop-cannon = { - HostName = "slop-cannon-ctr.${lib.my.c.home.domain}"; + HostName = "slop-cannon.${lib.my.c.home.domain}"; User = "slop-cannon"; ForwardAgent = "no"; }; slop-cannon-dev = { - HostName = "slop-cannon-ctr.${lib.my.c.home.domain}"; + HostName = "slop-cannon.${lib.my.c.home.domain}"; User = "dev"; ForwardAgent = "no"; }; diff --git a/lib/default.nix b/lib/default.nix index 92fa44c..bf6ab4f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -179,11 +179,11 @@ rec { }; vm = rec { - lvmDisk'' = name: vg: lv: { + blockDisk = name: filename: { inherit name; backend = { driver = "host_device"; - filename = "/dev/${vg}/${lv}"; + inherit filename; # It appears this needs to be set on the backend _and_ the format discard = "unmap"; }; @@ -193,6 +193,7 @@ rec { }; frontend = "virtio-blk"; }; + lvmDisk'' = name: vg: lv: blockDisk name "/dev/${vg}/${lv}"; lvmDisk' = vg: lv: lvmDisk'' lv vg lv; lvmDisk = lvmDisk' "main"; disk = vm: lv: lvmDisk'' lv "main" "vm-${vm}-${lv}"; diff --git a/nixos/boxes/home/palace/default.nix b/nixos/boxes/home/palace/default.nix index cf34d59..ded4f14 100644 --- a/nixos/boxes/home/palace/default.nix +++ b/nixos/boxes/home/palace/default.nix @@ -53,7 +53,7 @@ in }; }; }); - kernelModules = [ "dm-raid" "kvm-amd" ]; + kernelModules = [ "dm-raid" "kvm-amd" "nvme-rdma" ]; kernelParams = [ "amd_iommu=on" ]; initrd = { availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; @@ -85,6 +85,12 @@ in }; }; + # NVMe-oF disks connected here belong to guests (`palace` has no NVMe of its own; its + # drives are passed to `cellar`); never activate their volume groups + environment.etc."lvm/lvm.conf".text = '' + devices/global_filter = [ "r|^/dev/nvme|" "a|.*|" ] + ''; + services = { lvm = { boot.thin.enable = true; @@ -96,7 +102,7 @@ in extraOptions = [ "-A /var/log/smartd/" "--interval=600" ]; }; udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="net", ENV{ID_NET_DRIVER}=="mlx5_core", ENV{ID_PATH}=="pci-0000:44:00.0", ATTR{device/sriov_numvfs}="5" + ACTION=="add", SUBSYSTEM=="net", ENV{ID_NET_DRIVER}=="mlx5_core", ENV{ID_PATH}=="pci-0000:44:00.0", ATTR{device/sriov_numvfs}="6" ''; }; @@ -212,6 +218,14 @@ in MACAddress=52:54:00:8a:8a:f4 Trust=yes MACSpoofCheck=no + + # slop-cannon (untrusted) + [SR-IOV] + VirtualFunction=5 + VLANId=${toString vlans.untrusted} + LinkState=auto + MACAddress=52:54:00:71:22:ea + MACSpoofCheck=yes ''; }; "60-lan-hi" = mkMerge [ @@ -247,6 +261,9 @@ in server.enable = true; deploy.node.hostname = "192.168.68.22"; + + # Host NQN for guest disks on `cellar`; nothing on `palace` itself boots from it + nvme.uuid = "a5b573fe-59e0-4760-802d-4b6d2df6dcf2"; }; }; }; diff --git a/nixos/boxes/home/palace/vms/cellar/spdk.nix b/nixos/boxes/home/palace/vms/cellar/spdk.nix index 53dd85e..bc4cbc4 100644 --- a/nixos/boxes/home/palace/vms/cellar/spdk.nix +++ b/nixos/boxes/home/palace/vms/cellar/spdk.nix @@ -128,6 +128,13 @@ in hostnqn = "nqn.2014-08.org.nvmexpress:uuid:85d7df36-0de0-431b-b06e-51f7c0a455b4"; serial = "SPDK00000000000003"; + }) ++ (nvmfBdev { + # `slop-cannon`'s disk; `palace` connects it and hands it to the VM + bdev = "NVMeRaidp4"; + nqn = "nqn.2016-06.io.spdk:slop-cannon"; + hostnqn = + "nqn.2014-08.org.nvmexpress:uuid:a5b573fe-59e0-4760-802d-4b6d2df6dcf2"; + serial = "SPDK00000000000004"; }); }; }; diff --git a/nixos/boxes/home/palace/vms/default.nix b/nixos/boxes/home/palace/vms/default.nix index b08b567..97a92b0 100644 --- a/nixos/boxes/home/palace/vms/default.nix +++ b/nixos/boxes/home/palace/vms/default.nix @@ -3,11 +3,13 @@ ./cellar ./river.nix ./sfh + ./slop-cannon.nix ]; nixos.systems.palace.configuration = { lib, pkgs, config, systems, allAssignments, ... }: let inherit (lib) mkMerge; + inherit (config.my.nvme) uuid; inherit (lib.my) vm; inherit (lib.my.c) networkd; inherit (lib.my.c.home) hiMTU; @@ -25,6 +27,13 @@ bootindex = 1; }; }; + + # `slop-cannon`'s disk: a partition of `cellar`'s RAID, connected here so the guest never + # speaks NVMe-oF itself + slopDisk = { + nqn = "nqn.2016-06.io.spdk:slop-cannon"; + device = "/dev/disk/by-id/nvme-SPDK_bdev_Controller_SPDK00000000000004"; + }; in { systemd.network = { @@ -99,6 +108,38 @@ } ]; "vm@sfh" = (awaitVM "river"); + + # Only `vm@slop-cannon` needs this; stops before `cellar` does, and gives up on a dead + # target rather than hanging I/O on `palace` + slop-cannon-disk = mkMerge [ + (awaitVM "cellar") + { + description = "Connect slop-cannon's NVMe-oF disk"; + path = with pkgs; [ nvme-cli systemd ]; + script = '' + until nvme connect -t rdma -a ${allAssignments.cellar.hi.ipv4.address} -s 4420 \ + -n ${slopDisk.nqn} -q nqn.2014-08.org.nvmexpress:uuid:${uuid} --ctrl-loss-tmo 60; do + sleep 5 + done + udevadm wait --timeout 30 ${slopDisk.device} + ''; + preStop = '' + nvme disconnect -n ${slopDisk.nqn} + ''; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + TimeoutStartSec = "5min"; + }; + } + ]; + "vm@slop-cannon" = { + requires = [ "slop-cannon-disk.service" ]; + bindsTo = [ "slop-cannon-disk.service" ]; + after = [ "slop-cannon-disk.service" ]; + # Coding agents; keep storage and the router responsive + serviceConfig.CPUWeight = 20; + }; }; my = { @@ -181,10 +222,10 @@ uuid = "82ec149d-577c-421a-93e2-a9307c756cd8"; cpu = "host,topoext"; smp = { - cpus = 16; + cpus = 8; threads = 2; }; - memory = 98304; + memory = 32768; cleanShutdown.timeout = 120; networks = { netboot = { @@ -222,6 +263,28 @@ "device usb-host,hostbus=1,hostport=3" ]; }; + + slop-cannon = { + uuid = "9de7dc84-7506-445f-8e37-37c4cc6d8ed5"; + cpu = "host,topoext"; + # Overcommitted so agents can burst; `vm@slop-cannon` has a low CPU weight + smp = { + cpus = 16; + threads = 2; + }; + memory = 49152; + cleanShutdown.timeout = 120; + drives = [ + installerDisk + (mkMerge [ (vm.blockDisk "disk" slopDisk.device) { frontendOpts.bootindex = 0; } ]) + ]; + hostDevices = { + slop-cannon-ut = { + index = 0; + hostBDF = "44:00.6"; + }; + }; + }; }; }; }; diff --git a/nixos/boxes/home/palace/vms/sfh/containers/default.nix b/nixos/boxes/home/palace/vms/sfh/containers/default.nix index d85b388..5df1a18 100644 --- a/nixos/boxes/home/palace/vms/sfh/containers/default.nix +++ b/nixos/boxes/home/palace/vms/sfh/containers/default.nix @@ -2,6 +2,5 @@ imports = [ ./unifi.nix ./hass.nix - ./slop-cannon.nix ]; } diff --git a/nixos/boxes/home/palace/vms/sfh/default.nix b/nixos/boxes/home/palace/vms/sfh/default.nix index b703b53..61818ed 100644 --- a/nixos/boxes/home/palace/vms/sfh/default.nix +++ b/nixos/boxes/home/palace/vms/sfh/default.nix @@ -168,10 +168,6 @@ in MACVLAN = mkForce "ctrs-hi:host0 ctrs-core:lan-core"; }; }; - # nspawn's default `/tmp` is 10% of RAM; agents need more scratch space - slop-cannon = { - filesConfig.TemporaryFileSystem = [ "/tmp:mode=1777,size=32G" ]; - }; }; systemd.services = { @@ -184,11 +180,6 @@ in RuntimeDirectory = "hass-webcam"; BindPaths = [ "-/dev/video0:/run/hass-webcam/video0" ]; }; - # Coding agents; keep the other containers responsive - "systemd-nspawn@slop-cannon".serviceConfig = { - CPUWeight = 20; - MemoryMax = "64G"; - }; }; my = { @@ -212,7 +203,6 @@ in let instances = { unifi = {}; - slop-cannon = {}; hass = { bindMounts = { "/mnt/frigate" = { diff --git a/nixos/boxes/home/palace/vms/sfh/containers/slop-cannon.nix b/nixos/boxes/home/palace/vms/slop-cannon.nix similarity index 51% rename from nixos/boxes/home/palace/vms/sfh/containers/slop-cannon.nix rename to nixos/boxes/home/palace/vms/slop-cannon.nix index 8d6bf68..131532b 100644 --- a/nixos/boxes/home/palace/vms/sfh/containers/slop-cannon.nix +++ b/nixos/boxes/home/palace/vms/slop-cannon.nix @@ -1,33 +1,30 @@ { lib, ... }: let inherit (lib.my) net; - inherit (lib.my.c.home) domain prefixes vips vlanDns hiMTU; + inherit (lib.my.c.home) domain prefixes vips; in { - nixos.systems.slop-cannon = { config, ... }: { + nixos.systems.slop-cannon = { system = "x86_64-linux"; nixpkgs = "mine"; home-manager = "mine"; - rendered = config.configuration.config.my.asContainer; - assignments = { - hi = { - name = "slop-cannon-ctr"; - inherit domain; - mtu = hiMTU; - ipv4 = { - address = net.cidr.host 104 prefixes.hi.v4; - mask = 22; - gateway = vips.hi.v4; - }; - ipv6 = { - iid = "::5:4"; - address = net.cidr.host (65536*5+4) prefixes.hi.v6; - }; + # The routers limit traffic from the untrusted VLAN to the Internet + assignments.untrusted = { + inherit domain; + mtu = prefixes.untrusted.mtu; + ipv4 = { + address = net.cidr.host 5 prefixes.untrusted.v4; + mask = 24; + gateway = vips.untrusted.v4; + }; + ipv6 = { + iid = "::5"; + address = net.cidr.host 5 prefixes.untrusted.v6; }; }; - configuration = { lib, config, pkgs, inputs, assignments, ... }: + configuration = { lib, modulesPath, config, pkgs, assignments, ... }: let inherit (builtins) toJSON; inherit (lib) mkMerge; @@ -35,15 +32,8 @@ in agentUser = "slop-cannon"; agentHome = "/home/${agentUser}"; - - # TODO: Drop once Codex recognises bubblewrap's newer `/proc` error wording. - # Restore the diagnostic its procfs preflight expects so it uses its container fallback. - codexBubblewrap = pkgs.bubblewrap.overrideAttrs (old: { - postPatch = (old.postPatch or "") + '' - substituteInPlace bubblewrap.c \ - --replace-fail "Can't mount proc on %s" "Can't mount proc on /newroot%s" - ''; - }); + giteaKey = config.age.secrets."slop-cannon/gitea-key".path; + paseoPasswordFile = config.age.secrets."slop-cannon/paseo.env".path; # Steer agents to the approval broker; these match command text, so they aren't a boundary claudeDeny = [ @@ -71,23 +61,107 @@ in if ! jj git clone --colocate "git@git.nul.ie:$repo.git" "$dest"; then echo >&2 echo "Clone failed. If Gitea refused the key, add it as a write-enabled deploy key on $repo:" >&2 - cat "$HOME/.ssh/id_ed25519.pub" >&2 + ssh-keygen -y -f ${giteaKey} >&2 exit 1 fi paseo workspace create --isolation local --path "$dest" ''; }; + + slopPair = pkgs.writeShellApplication { + name = "slop-pair"; + runtimeInputs = [ pkgs.paseo ]; + text = '' + if [ "$#" -ne 0 ]; then + echo "usage: slop-pair" >&2 + exit 2 + fi + + paseo daemon pair + printf '\n' + exec doas ${pkgs.coreutils}/bin/cat ${paseoPasswordFile} + ''; + }; in { + imports = [ + "${modulesPath}/profiles/qemu-guest.nix" + ]; + config = { + boot = { + # Load the passed-through ConnectX VF even when PCI probing doesn't autoload it. + kernelModules = [ "kvm-amd" "mlx5_core" ]; + kernelParams = [ "console=ttyS0,115200n8" ]; + initrd = { + availableKernelModules = [ "virtio_pci" "ahci" "sr_mod" "virtio_blk" ]; + kernelModules = [ "dm-snapshot" ]; + }; + # On disk rather than in the tmpfs root, so agents' scratch files don't use RAM + tmp.cleanOnBoot = true; + }; + + hardware = { + enableRedistributableFirmware = true; + }; + + fileSystems = { + "/boot" = { + device = "/dev/disk/by-partlabel/esp"; + fsType = "vfat"; + }; + "/nix" = { + device = "/dev/main/slop-cannon-nix"; + fsType = "ext4"; + }; + "/persist" = { + device = "/dev/main/slop-cannon-persist"; + fsType = "ext4"; + neededForBoot = true; + }; + "/tmp" = { + device = "/dev/main/slop-cannon-tmp"; + fsType = "ext4"; + # Return deleted scratch space to the thin pool straight away + options = [ "discard" ]; + }; + }; + + networking = { inherit domain; }; + + services = { + # The LVs are thin, so space moves between them as needed + lvm = { + boot.thin.enable = true; + dmeventd.enable = true; + }; + fstrim.enable = true; + }; + + # Grow the pool into the VG's spare space before it fills + environment.etc."lvm/lvm.conf".text = '' + activation/thin_pool_autoextend_threshold = 80 + activation/thin_pool_autoextend_percent = 10 + ''; + my = { - deploy.enable = false; server.enable = true; + # Root inside this VM belongs to the agents, so it gets no shared secrets: in particular + # not `user-passwd.txt` + user = { + passwordSecret = null; + config = { + password = null; + hashedPassword = "!"; + }; + }; + secrets = { - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWhNyGER3E0cgpsl6eIiG1mJFcS6hckU74t9vzMY4Le"; + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCkgBZh/YejY+gDnGa9r5SPo1+aHWPAAAIfENE7t0Om"; files = { + "slop-cannon/gitea-key".owner = agentUser; # `PASEO_PASSWORD=...` "slop-cannon/paseo.env" = { }; }; @@ -109,6 +183,8 @@ in isNormalUser = true; uid = uids.slop-cannon; group = agentUser; + # Agents get root (passwordless `doas`) and can run nested VMs + extraGroups = [ "wheel" "kvm" ]; hashedPassword = "!"; shell = pkgs.fish; openssh.authorizedKeys.keyFiles = [ lib.my.c.sshKeyFiles.me ]; @@ -118,7 +194,7 @@ in home-manager.users.${agentUser} = { my.agents.enable = true; - home.packages = [ slopClone codexBubblewrap ]; + home.packages = [ slopClone slopPair ]; programs = { claude-code.settings.permissions = { @@ -129,12 +205,12 @@ in # The shared config pins `IdentityFile` for every host ssh.settings."git.nul.ie" = { - IdentityFile = [ "~/.ssh/id_ed25519" ]; + IdentityFile = [ giteaKey ]; }; }; }; - # Managed settings can't be edited by agents (unlike `~/.claude`) + # Not editable by the agent user without `doas`; a convenience, not a boundary environment.etc."claude-code/managed-settings.json".text = toJSON { permissions = { disableBypassPermissionsMode = "disable"; @@ -143,34 +219,37 @@ in }; systemd = { - network.networks."80-container-host0" = mkMerge [ - (networkdAssignment "host0" assignments.hi) - { networkConfig = vlanDns "hi"; } - ]; - - services = { - # Box-wide key for Gitea deploy keys - slop-cannon-ssh-key = { - description = "Generate ${agentUser}'s SSH key"; - wantedBy = [ "multi-user.target" ]; - unitConfig.RequiresMountsFor = agentHome; - path = [ pkgs.openssh ]; - script = '' - if [ ! -e ~/.ssh/id_ed25519 ]; then - install -d -m 700 ~/.ssh - ssh-keygen -q -t ed25519 -N "" -C "${agentUser}@${config.networking.hostName}" -f ~/.ssh/id_ed25519 - fi - ''; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - User = agentUser; + network = { + links = { + "10-lan-untrusted" = { + matchConfig = { + Driver = "mlx5_core"; + PermanentMACAddress = "52:54:00:71:22:ea"; + }; + linkConfig = { + Name = "lan-untrusted"; + MTUBytes = toString prefixes.untrusted.mtu; + }; }; }; + networks = { + "80-lan-untrusted" = mkMerge [ + (networkdAssignment "lan-untrusted" assignments.untrusted) + { + # As `untrusted`'s DHCP and RAs hand out; the routers' resolvers aren't reachable + networkConfig.DNS = [ + "1.1.1.1" "1.0.0.1" + "2606:4700:4700::1111" "2606:4700:4700::1001" + ]; + } + ]; + }; + }; + services = { paseo = { unitConfig.RequiresMountsFor = agentHome; - serviceConfig.EnvironmentFile = config.age.secrets."slop-cannon/paseo.env".path; + serviceConfig.EnvironmentFile = paseoPasswordFile; # Don't interrupt running agents on deploy; restart by hand when convenient restartIfChanged = false; }; diff --git a/secrets/slop-cannon/gitea-key.age b/secrets/slop-cannon/gitea-key.age new file mode 100644 index 0000000..3ff3388 Binary files /dev/null and b/secrets/slop-cannon/gitea-key.age differ diff --git a/secrets/slop-cannon/paseo.env.age b/secrets/slop-cannon/paseo.env.age index 890d90a..26afce6 100644 --- a/secrets/slop-cannon/paseo.env.age +++ b/secrets/slop-cannon/paseo.env.age @@ -1,11 +1,13 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDREcVBHdyBGRDZF -aCtlS2dXcXl6Q2xrdVprTGRJYndpdjhod2Y5Y0dmMEpZSld3aGhRClNxWC9xU05s -a1ZLUmVWRGdNTENjb3VTRE1pREgyWVNKYndxNmFOQWE4U3MKLT4gWDI1NTE5IGdS -NGZBY1IvTUZKVUZaKzViSVVSUC9KSDJyQVZ3NlVORVIzbTdCTlpHbGcKUWpobnU4 -czB1QlVscjg3OEt1YzJjOWdPL3g4S3dTNWhHNkx3bEVSb2xwSQotPiAnSC1ncmVh -c2UgJyxid205CklxS2s2RER2WG1aRHhLS2VCMVhhTGMrMG42MkdOOVFHcGE4T0VE -UUkxTEg4V0NiVQotLS0gMWYzV2FYczcrY3JVeHgvM2dhVDZWWmVZUGJvQVJrM0sy -OEI4NlFoRTBpSQobh3Shb97Y0f8WpUjMad+yi0jAk68wdLle9hn1r6WLhemtBkJ3 -AkRLG/BYMBRo5O14Th4Dql+c3SPoyzWfMRnnLstppfjsNvBTtnmhU0a/3Q== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFVTM044ZyBKMzIy +Y0hWejVrRUFJUjdXWFF3Rk5XczNYVmg0MkQxNG9PQ1N3S01oWjNjCndZMFdncjJS +d05LcVJIVGxXSVpXWFkrSzJFZVBYSGY3dVE0UGpucWxUdHMKLT4gWDI1NTE5IHRC +cUZQVlpYZENkSkY1U3BBSlp3cVhTUEIwdTIramdVazRQQXUzbE56M00KYURtUXQ3 +OEI5VEp0d3Z2V2psenJXeTRCdmt3SlUyTDFhOTV0R21lUlJyYwotPiBbLWdyZWFz +ZSAwVCBHXyByNUxQYT0gLVFkKDJpNj0KVEVnbE5rU0lUUU45elNkOHh3MlFLQ2dT +NlZmbFl4cStQa1lDS3g1TzYwcVd4S2FidFU4QjZFd1VCdXB1dDlhcQpid0tZdkFa +V0J5SW1acWJkMEJDQlBGNlB6a0dialM4WktJYitndDZkQ0EKLS0tIDZ3ams2QSty +akxNQmx0NHdRK1p3S0ZpY0ZHVi9HL1lqWlFYMGNjSXQwRVkKMMv6WyWTJH6UzCR3 +D+hq+Hh3HduTHsl05zh3v0nRqtMcszJHdQ5WvQT7bRD8VbJO7m1rqnot16idh7Af +8FFirH8kFn/2N+Mb4IhCnrY32TA= -----END AGE ENCRYPTED FILE----- diff --git a/secrets/user-passwd.txt.age b/secrets/user-passwd.txt.age index 993c3af..3408e14 100644 --- a/secrets/user-passwd.txt.age +++ b/secrets/user-passwd.txt.age @@ -1,81 +1,80 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHNqUFR5ZyBKdE1Z -d0FBeDNESk1uN2VsZ0cvdDJQeVN1Ukw1aXJNQVNnTTNOUy9iN3lFCnBWTThPZHZZ -RmdKUnFYS25BeWIxa3dKbWVLSWVoTW85QnNtdDFWVDRCZTAKLT4gc3NoLWVkMjU1 -MTkgRExNZUZnIE9LUno5Q1dhNjI3NlNZa0xaalZyQlJtU0EyV3hjaXJJWG1BZVNO -UzN1WDgKVkdvN3BnYnFrRnFMeEFJeWVyZHdWcjZ0ZFBiTVdSVDE5Vm9HdTlRZHVz -UQotPiBzc2gtZWQyNTUxOSAzYkIzWmcgUGR6Sm5KdzRRQjAvVmtLTytEdjhoblhM -cWNXdXIzb2cxSHpsVjFWUXBUUQp4clRxcDFJVUlkQmUweEJHNmpnWnhQTURPbU10 -cnBTMFZMSVpFb0FPZHZnCi0+IHNzaC1lZDI1NTE5IHErMFhjdyB0S3JnVWxqL2lV -NndOaVBFd0EvL0k5aithWCtlM2NDUU1UTlU5cVdUR21zCldpc2Qwb2R0QmJzWmVa -MTZaVjdDK0pyZmtDQ3NlQzY1Z0FpYzNqcmg0blUKLT4gc3NoLWVkMjU1MTkgWkIz -ZTZRIGFiTXN4eEZLQ2tZZUtDVEZCbVZKaUxlaGJaaEFYTDVLcXo1U1ovRG0wWFkK -eTZDUE1BdVF5YlpJSUdxTERQalJwL1F5Y3A1Qm9zeHNCV2FhOWkrM2JvbwotPiBz -c2gtZWQyNTUxOSBqNjdGWFEgMVJmeFozdzVkczRBYUgzdUhFSEhpUW80ckQ4ckhi -MTVEM2RybmVKeTZTcwpWMGFhNThoL2lMQjhOWkRxdWs5Y0ZQWS9VT0luM25TUkoz -d213bmMrUFZJCi0+IHNzaC1lZDI1NTE5IGMwVE5hUSBQaDZYdHovWXJaYVl2NkI2 -azZjVXFERGVQa3lrZzExc2NKRXBOVDBsQWdNCmhrQ1VqK3p2ZlZZdXEyNkxWNFho -cWc5alYxWkZVeTlCTldoRnF0L05uYlEKLT4gc3NoLWVkMjU1MTkgbjhDcFV3IFBE -UURjUEJjdG4yMUdwazQzTFdTZXltdGw3NkRLWHRwU2VKc1dXWXp2U3cKMDBXWGV1 -VWpaZ2NQendtMjRXQTROM05abHkyU2FNY2VyYjFBS1NHSXZJbwotPiBzc2gtZWQy -NTUxOSBWN2xnR3cgWUNsd1JWb0FjSFdJV3hJRGNLZlk2TmFQSldLNS9BN3ZQald5 -KzU3STVHZwp0T05ub2h2SnBzNEZkV2crejNDZndkMTk5WFFSeGt5K0RCdE5OOHJv -YnZNCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBGbVg3bmZadFdlcXZMWmxJNVZuQ290 -SDd5YmJHeTNycjdpTkNvbW5UcFdnCmsza2YyQm0vQkprZG9PQll2TC9sVHJtbmpj -WUJZNC9TWWJRR1pzWjZoNW8KLT4gc3NoLWVkMjU1MTkgVCtzYkdBIHlTaUxZWm1E -dU80ekpSeG1YYlMxaUQ3aE1ScS9GazEwQVR6NXBTdWhoSHcKWWQwNGNIckUzODYw -Z0FEMzJtYVNlU2xtM21ZZVdwb2cveEg5RjE3bHNJNAotPiBzc2gtZWQyNTUxOSBo -TWE0bncgc2l6TkFjSTIrdG5kVWo5NFdoam1wclhLcXpJek9md1BqdW9UT3AzMFBI -RQpmS0ZLNlk3TnpoTVlvOFJ1ZFdMWVpOWVNEVDIyWnFlVUdweVA3VW1mR01NCi0+ -IHNzaC1lZDI1NTE5IGV5cTNkZyBVYTFDNU9XUFpUc1RMaUswNDdNSDdyTDdpclBD -M1BRR2pwZ1psR3hDenlBCnd4OHJXSjBTellFb2Y1M1cvcTZpNkNCMWZtKzZocUVI -anNYcHBKVnZ0a0kKLT4gc3NoLWVkMjU1MTkgN1dROVBBIHIwOEh5V3BRejI0ellD -Y1ZtYU9PZllHWFJxS0FBbGRxTUxOSVRvQlRxalUKcGVSTnBBOEZudFBnRStyQVlR -cWZJRGRnTnQyWWs1ZWxtOEd6ZklhUFY4QQotPiBzc2gtZWQyNTUxOSBnU3hQMFEg -cms5S1lvZ05RV3FlMzhEMmRTeHlDenVWTHJyaVZDM3pVS0tta3pnOEdIOAppTDBm -a0FBdVRqOW94L1FkUFdFckRqbmcwYWcwdjhmY0lySys0WG1Xak5RCi0+IHNzaC1l -ZDI1NTE5IFZGY3c1ZyBhTnVEOGlqaW04WlpMNlNxNmxFWXFWeGpxdTd3OWhycjdS -eWdPcFRMMkM0CjJYbURhRnpiSDNBeU9rS3Jtajc5VDI2UXJaeFhqNXVCQUJtbUox -ZWlwUm8KLT4gc3NoLWVkMjU1MTkgaGtidHZnIGdOWUJlZHg1ZmZvSjZ4ei90QVcy -eStCZktva3RjWmI3WXpIeEE3OFJVRXMKY1JUaEJPZ0xuSXVUYVVUZXZUTm5lT2RS -bGFoOUN6dlBkNWlZblNjN3lsbwotPiBzc2gtZWQyNTUxOSBldDJ6cFEgY3JrYTE5 -b28waFpZaFZSME9xTHJsZzNNTEozOHdqa1l6bWpWZldzekduQQorWDRTdEVGQVU2 -WGFROFdGa1VTdzE2a3JRUUhnY1YvUE1GMllqRnRPcU1nCi0+IHNzaC1lZDI1NTE5 -IENrT1RXUSB2Z1YxUzY3WUM2S3hkYWhKampoNlFoK1VPVUFkQkxLd2lSTUVQSlVk -bGpjCmxOMW9CVE92c01xdllNakM2NmdSQ3gvczBWRG5Hc1A2L1J5MVNhenNxYTgK -LT4gc3NoLWVkMjU1MTkgWmJMSldBIDNwejRoc1JMQWJxdHEwRTNaL2JucjlLYnVI -MS9ESVlEaHRWRE5yUkI1MGsKRUtHRGRzRHpsRWp1YWFaYzBiK2g4OWQ3N2llaDM1 -enBlblE4SElvR2YrcwotPiBzc2gtZWQyNTUxOSBaTnFJb2cgMmlNTzdkdys4RHZO -QlhxajlvNVVIdm1scEIrM1JER0tRdkIzWnJ6dnBFTQpTNHo3dEpNSkoreFlmRDFM -REwrVFNvQ21KcGIyaEEzQmZzMklINjFTZS9nCi0+IHNzaC1lZDI1NTE5IHFManF5 -USBBZzhJdGthUkRmV0luVWljRnF0enhmRituMjFKK21Yakx3NzN1Um9oY3hFCmRU -a1ZmR3d1RGc1bldqbUptMCtzTW9BUGNncXdGeVZ1UGVpZGFWMEd3V2MKLT4gc3No -LWVkMjU1MTkgQmFRbFJnIFRVNGNqdnhWWHQzZE95VmhZVG9yOStUSmphUkEwd2dD -S21rQklLT2J6bFUKRmFhR0I4V0FYOVNQdWZPSFR5a0NwOXBDTVFOYkVuNjlLbXZj -OHNuQkgzOAotPiBzc2gtZWQyNTUxOSA0RHFQR3cgUjJnMkFONzZmMXp1eTZaNWRK -K0h4NFdNR3dMVmJzRk9SVGRqUXNyR3hGMApXMUpPdFJxcDRDWVkyWEMzOWpQVmc3 -NUNTS0FZbzlQRU5qZmk3OXZlVEZVCi0+IHNzaC1lZDI1NTE5IHMrcVJmZyBUZHpY -Rk15bGpwRFhDbHptbkJQMzVqYVRmSVJUZDBuQmREQ2JpVWdsblNNCmNZclFxS1hQ -QnBqMXYyL3JKc2l1K3R1M3NQMW5pbDU1dkNOQk9UczdQN28KLT4gc3NoLWVkMjU1 -MTkgNjJKY2NBIEFkRlFvRWcvNWVkbjVzWkRBRWlLMXpTT0pQNjZ2bm0wVktCMjcx -QmdJR0EKQmdCaktuMW56cXJTTHJvUVBaNnJ5R0tXdmdPVHJDazltdmhhRElYQ1dZ -NAotPiBzc2gtZWQyNTUxOSAvaHgvZEEgZjJOd0hvUk10cS9meFhqV2Nnb2ZMVmFM -NDhSVHZCNHNidlpBaTBkSTFnVQo1WnhOMG1rK0FBS3JSeXdXRWF5eXh4cCtkNUxk -TXptd0RiUnlyOTNPajFnCi0+IHNzaC1lZDI1NTE5IFd6TEdIQSBsZmdqbzMyY1NI -dkJoV3p6T1hzamdoZjZ0Ni9OWVdjZW1HRmh1M2VYcFJRCk1qNUJWL3Vnb2k0ckRG -djNzUmQvc1gyMGd1UWVIQlBZeVZlM01ueThNWTQKLT4gc3NoLWVkMjU1MTkgSEov -SjdBIHZZaUV2eVZiNVNUSVpTTkJRdmxZMCs1RHk2NmJVU0krNXBCQ29MSUpVUWsK -TXlxWm5xL2RGYWV0RjBkUTYra212ODBXaXIzY25QVTVMV3JjQ3RGSEV2RQotPiBz -c2gtZWQyNTUxOSBPRXFNc2cgVTBqM2g3RG9NOUZTVThOV25udjlGQlZTWmNkVHlN -WDltdjhlL1hMZDBCOAp2YXZYWkpRS0Q3SDNTdGRGWlp2eWYwc2FrbTRlS0o3L25i -TVllVjV3dmVRCi0+IHNzaC1lZDI1NTE5IC9FSlh2ZyBPMzJhb0xTbE80cTMrL3py -NFRKdlYzYzdOeklzaUVhZG4rTm5ZVnh5cjNBCkUwN1pYQVVUNjhYRE5ic213N01H -eE9iVEs1UXdrSHpxdEw1UUZVdURSNVkKLT4gWDI1NTE5IFZFZ1hCTVg5VW1sOCtv -bkdBZ2xOQlBuSGI4ZzR4RTlQdDY4QWUyMVFBMUEKaHlmMXh5ZU82M29lSENVcG5h -dkh0WjlvR1BjelE0d2ROOVFOMU85a2dqcwotPiBJZE4mZ0l5LWdyZWFzZSBOVEZY -CjZFcDFZTnJNQTNZRER2dGZ6VjlvUm5iS1IvZEwrMXpBakEKLS0tIFA5RVF2K3RO -UisvS2Vjb01BdlZ0N1JnSkpvcTFPTEF5dUlpTDRmRVpQUGcKMgYmxLsf4pOKLL4Z -9Hpvcw3ly5I5SvjRSWk5FlcPdD21Csy1IxcUetREH9k8PY0l/bjtWGHA4js2RmW6 -9YRXk0uAy0RMnn/K6LjYQFjRdvbJ7MdEhv6M7Bujs/MPuhc62FCT6VLRalzQHL2k -k8ZZor0qErAusLs5TEp8pZ+sVAcQxbBWf5RET+ty8A== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHNqUFR5ZyBySldv +UVdEckFnM2xqcVZTaTJhdXZLOTRReTFyOUpaMDVLbE9nVkRGWDJrCkV5WnJnVjRP +amdBUmpndXhXeHltM1lFWkpmd0cyZElteWV0eWFZNGdYUUEKLT4gc3NoLWVkMjU1 +MTkgRExNZUZnIERpRHBITThyeHZCaWhLSXlRMUNleVhySWd0eUNXTVluYWJia0Fp +MVVPVUEKNWZtMzBMOSs5clh4S3hDQm9NMXhnL3ZtQnp0dHA3ekpLMXhIWW5vY1Nq +YwotPiBzc2gtZWQyNTUxOSAzYkIzWmcgcUdHQTIxeE0rdGl6OUE4SkpZZU4yWXFM +SW9aNG9GSS8wTENtb2J4Z1FWNApxYzc1TlJLYTRmYXZSZFJnMUlhb1AreCtTYldk +NjhhOVRBM21DNUNuR2VFCi0+IHNzaC1lZDI1NTE5IHErMFhjdyB4NktvUjRRVXpP +TEc2aDc1NTh5bEYzZ1RUUlVIUCtCdUYrN1psNFJlUzBRCmNQUVRjQlJFRjZSQkEv +Skx3NkM4M28vcTJobTYwQjBsQUVyaWFxZGU1b0UKLT4gc3NoLWVkMjU1MTkgWkIz +ZTZRIDVhWFkzMitxcnJHZXlKdnU0bDRSaTZsSTJLN01QSGU2Qnh0MEV0cytSVjgK +VVd4U251V1VoY3VwT09oZkYrZjhTcG9WNTJ3Tm9mbFVxSmxMOU9Md1ByRQotPiBz +c2gtZWQyNTUxOSBqNjdGWFEgQnVQOEtnaXcrd2lHS3p5R0Q2S09JSU1hQkRSNHl3 +WkVVUUhxYk5HOW9CVQphb2Q3YWxXVFNuOTg4S0s0TTBjT2h4VWx1bVNkdTBGOGVk +MXZIYVlMd3prCi0+IHNzaC1lZDI1NTE5IGMwVE5hUSBBb3lPcDF6UGR5RGJtY21C +QTFCdTJrTm80TnEzR3BIMm5lY0JmWXMxZDJrClE4YU1iRGR5dHVxd2xwc05oQk9L +OXA3UTFKQnBDYSswNFdiVzN0ejNlSjAKLT4gc3NoLWVkMjU1MTkgbjhDcFV3IDM3 +STJ6bDlrMzJDNXpqYkcrL013T3RYNFJVdUNTTXVhaFQ5YUltZzBEUWsKS0JqZG9E +TzRLdThZNVNFQ1VGMFdFcXo2bmVHRG9CVGdJOUVscFoycTVMNAotPiBzc2gtZWQy +NTUxOSBWN2xnR3cgTGovVGtSZUIvMHJkenJuaGR4MWNRUDdiUnJkb285OTdJdmpj +VzNtb2UxMApTYXQ2ZnY3a3lpczJCSkdwUWp2ZFp0c3UwMFRub0kyTFY3a3NkVUZD +YmU0Ci0+IHNzaC1lZDI1NTE5IGpJOFJBZyBsN2VKM1JVRlE1NUl2cEhrWnVma2hi +dVBhSlJoTHZmMFR6dFh3U0RYZlJjCkpPMEdGWUVQcmhJbkNKekU5WldXVDlqcFVP +OHhQSE5YNllicGRkaFFZRFkKLT4gc3NoLWVkMjU1MTkgVCtzYkdBIFJXTy9aZ29O +ei96QXB4QlBKVkRXK3p6andzOUp3RDREVk1nSTc2S1FoQ3cKK3lKNGdwbXU4K0Vt +YUdqMGhiRVZwV1phS25EK3FrZXpqK0NCWm1TcVVpZwotPiBzc2gtZWQyNTUxOSBo +TWE0bncgWk85cUFBVkxWVmdZWXR5MHlpUXZ2OElSOXlvcmlDWVBiVzlScCtHcHFF +RQpKRjRmZXJaS0FranFmOTR1WnM4T2hLK3VTeUJNN1ZqSFk3c0VVTWZrV0JzCi0+ +IHNzaC1lZDI1NTE5IGV5cTNkZyAzdkpkQ3VldDN2TGFtS3dZWXE3Wm9saEhjYlo0 +R3h4ZFZyN0E3V29rd1djCi9UNitnYzVrV1oxSDVucmRoQVNCWFRvU3ZrTnFRbFpZ +U0t2V2JvMWI1SUUKLT4gc3NoLWVkMjU1MTkgN1dROVBBIGpoU05zaVBkcks2RnFG +dUdnU1gxeVpucnU2NkErbzg3WmhrNjNNRldTZ2MKUU52L2xWTTExSFhkOURvWHdh +dHZrWEIxekN5QmNjdURLN2pVb04wUkR0OAotPiBzc2gtZWQyNTUxOSBnU3hQMFEg +UXJmVWZsYmVQdWpGZGt2RE5LOWNhb3FWWG9UcXdXRk9sYlhtQnJGN3lnOApHZHVO +cVU4UlM5bFpoYXdmekhhVkxCakVYaHRNcmxrTjZiUmpvaUtvRWRnCi0+IHNzaC1l +ZDI1NTE5IFZGY3c1ZyBrTlhaakZib1FFZnpNVGw0REgwbko3WEJ3Q3cvSWVabEU0 +cTNKQllKL0FFCnRtRjJ2eW8rMk90aGpmc0ZwRkUyQzFxeUFLRTFiK3VQOUJrc25D +Z2krckkKLT4gc3NoLWVkMjU1MTkgaGtidHZnIFhScXJEcllydXZTNUpnTUhYYm5h +RGtoNHVtTDNPREd5aUI4NndTVlBLMVkKb3JuWGlZVkd6bzc1Y1NUZlBGMDY4cjBH +cnpDNFJGb0RzNUFhandEdEZoTQotPiBzc2gtZWQyNTUxOSBldDJ6cFEgbU1IOHBL +eVRnNXhGdE5pbFJKUGEwZXN3RDg5cFhwZ3FlRDIwNFRvWWxqSQowY2EzQ2FFaFY0 +elRHK3ptdGJxVjdJLzJmaXBVcnBRZ2VNL2tGSHlVSTVJCi0+IHNzaC1lZDI1NTE5 +IENrT1RXUSAxcEt6QTV2dE5uVmt2V0VsOXBRcWJiYURKVkE0czNHTXh5a3dLOGNs +R0FRClh3Sll0NCszb2N4TW1Oc2psSWV5OEFXM1VCMm5uaDN4eG5xc0hnUGQrVzQK +LT4gc3NoLWVkMjU1MTkgWmJMSldBIHM5WGpYSFVXLzlCQ1FUeHdjcjRDazFVTHE5 +R285eE93WFdmZVRuNmZtbUkKbGYwVzM3bDJPaG5MTmpWUHZFQ0k4V2FCc28wS3dq +UlAyOE0xaFVldnhoNAotPiBzc2gtZWQyNTUxOSBaTnFJb2cgMFNPREJpL04rWjAz +WnF4ZEpRU21uRFQzajlQQWZsdVg4SG5iWnFPaVdUZwpMc1h0ek05MUxnV25vMlRI +UlVJSE1YZ0RCL25kcVFyWEF0REF1WTJ4bGowCi0+IHNzaC1lZDI1NTE5IHFManF5 +USBKaWQ1dndhNWhOM3Zwd1Zmdkh1M1BNMjhCSVFnSExoZ1FlQU1sYy9XUGtVCjhT +Z1o0Uk4wTHJUM1BSV1JaK29vZFpOcThjeFlNb1VSZzBIYnBDSFlMWU0KLT4gc3No +LWVkMjU1MTkgQmFRbFJnIHNZa29IZmJSSTU2UWdWdVhmOWZSZGc1UW1MNHl4TzdZ +QndNdE96YVpBUlkKZFR6Nk1ac0xSVjA1L1VsMVFrYUVDVGZpU3ZTaTRhdG9BUHh2 +Q25JYmd0cwotPiBzc2gtZWQyNTUxOSBzK3FSZmcgV08zWXY3NElubi9hVE9kVm1y +Ulg1MmVqU3MyYU8rYVp0aUZpUVE2UHpBcwo5VTd6ZXJFaDZnQlhYbHJLdlJwODFo +c293ZkFJbzB4WmluNmw3elBkMjNjCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBVR1lz +U1BxZU05bS9GVUFxK09HQ2lUZE9hM2k0YTloQTJEQ0xPRVR0eHhRCnNzM1g5QXVq +U3hnWlY4NVM0aVZ4alRHcjU5c0VwbFJVa0xhb1YyVlJ5UmMKLT4gc3NoLWVkMjU1 +MTkgL2h4L2RBIFVMYTZkOXFZTFBPT3VYT3Q1NDRRYXVEdXZuOHRicDJqSERhL0hw +L3FGRFUKWmRGNmZsMktQS21lT09QaE1WMUJPaTlzczdaWHVDTERGZHdKM2JlVlFu +cwotPiBzc2gtZWQyNTUxOSBXekxHSEEgaUE3UEFtTThFZ0JFcXlWalFrQWw4NVN1 +NlM0UnhHOGpESi9pMVJJMlNoawpzQUhaaTg4Wnd3L0NLTDl3SmE0bDl5Y0dwTEdP +L2xJQXp2TkdYeW5PZklnCi0+IHNzaC1lZDI1NTE5IEhKL0o3QSAveEt3Zzg2cjZ2 +NUdKcWVaRTVFOWxGbzUyTVozZEtrZnMvSmNVUmF4c1hZCmxzczc5NE96akRJSEhD +bklLVDk2bFR1ZmpFdWFBTTRwV2h4VjNOSUFidEkKLT4gc3NoLWVkMjU1MTkgT0Vx +TXNnIFhTZ1FNN2I3QUZ2UGY3UitWY0RHOCtKR20rYkhQdFpxYmE2SGgxYmNjaXcK +cytPaDNIODRwRDlWQ09uUXdham5sK1pmUStvcUY0SFExYVgyWUltMEJCRQotPiBz +c2gtZWQyNTUxOSAvRUpYdmcgN2ZUWTJ2US9kV3Zaa012Z1pTLzY4UTlGY3d4SmtM +N3JnS0JrRFVDd0xuRQpGM0lvaS9lVlE2Ym10YmxQZXFYcklMTmVTMFNDN09wUXFF +SVEySXh6WHNBCi0+IFgyNTUxOSAvVis0dXNTbVRucXRQUjBkdkx0blR1R1NYbS84 +NkVJbjB3TDNpdk5nS0NrCjU4Q3pPeTVuelZMc3hXT0NVQjFNRnNUTGg1UFpnQ2hx +RnZCdm5JVHJBdTgKLT4gW1o0QnRSMi1ncmVhc2UgIV8pfSBBMi49WFYgZktyICMi +CjBUN2lWeXFzY0pMdm14VjJTWFRYNDVFL0pWZ1g1b2RpbEozblQweGZyL04rWUlu +VHhQZGVXa2F1SmRzRWJvaGIKTTJ6ZgotLS0gTmtmL21vOVFVK0lrZ2NiRFUrZlQ5 +UWxST2I4RVV1YjZjZzN4ZmczLzJHSQqAJWBt01K+oUXcXryqquRLIwve/AaCtTrO +Y9WKR7dTY2Qw6GNCKcmDoGGO8pMck1bcRoem1hgDF8lMKoviXFsgm2phxJcOH5tb ++sB9o6YANAvjwqXY108mWJbgyqvikmpkFg8Pq+hTZxFw0bFQJBRyHXr6eTMmflXa +rQ36vhvMI+sLvqeYRg/Ad6eP -----END AGE ENCRYPTED FILE-----