WIP: matrix: add signal bridge

2023-01-16 06:20:17 +00:00
1892 changed files with 14218 additions and 730539 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/build
-/.working
 result
-result-*
 /secrets/local.nix
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,27 +1,21 @@
 keys:
  - &user_desko_colin age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x
-  - &user_flowy_colin age1nw3z25gn6l8gxneqw43tp8d2354c83d9sn3r0dqy5tapakdwhyvse0j2cc
  - &user_lappy_colin age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g
  - &user_servo_colin age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu
  - &user_moby_colin age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9
-  - &host_crappy age1hl50ufuxnqy0jnk8fqeu4tclh4vte2xn2d59pxff0gun20vsmv5sp78chj
  - &host_desko age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v
-  - &host_flowy age1azm6carlm6tdjup37u5dr40585vjujajev70u4glwd9sv7swa99sk6mswx
  - &host_lappy age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn
  - &host_servo age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf
  - &host_moby age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt
 creation_rules:
-  - path_regex: secrets/common*
+  - path_regex: secrets/universal*
    key_groups:
    - age:
      - *user_desko_colin
-      - *user_flowy_colin
      - *user_lappy_colin
      - *user_servo_colin
      - *user_moby_colin
-      - *host_crappy
      - *host_desko
-      - *host_flowy
      - *host_lappy
      - *host_servo
      - *host_moby
@@ -29,36 +23,25 @@ creation_rules:
    key_groups:
    - age:
      - *user_desko_colin
-      - *user_flowy_colin
      - *user_lappy_colin
      - *user_servo_colin
      - *host_servo
-  - path_regex: secrets/desko*
+  - path_regex: secrets/desko.yaml$
    key_groups:
    - age:
      - *user_desko_colin
-      - *user_flowy_colin
      - *user_lappy_colin
      - *host_desko
-  - path_regex: secrets/flowy*
+  - path_regex: secrets/lappy.yaml$
    key_groups:
    - age:
      - *user_lappy_colin
-      - *user_flowy_colin
-      - *user_desko_colin
-      - *host_flowy
-  - path_regex: secrets/lappy*
-    key_groups:
-    - age:
-      - *user_lappy_colin
-      - *user_flowy_colin
      - *user_desko_colin
      - *host_lappy
-  - path_regex: secrets/moby*
+  - path_regex: secrets/moby.yaml$
    key_groups:
    - age:
      - *user_desko_colin
-      - *user_flowy_colin
      - *user_lappy_colin
      - *user_moby_colin
      - *host_moby
--- a/README.md
+++ b/README.md
@@ -1,125 +0,0 @@
-![hello](doc/hello.gif)
-
-# .❄️≡We|_c0m3 7o m`/ f14k≡❄️.
-
-(er, it's not a flake anymore. welcome to my nix files.)
-
-## What's Here
-
-this is the top-level repo from which i configure/deploy all my NixOS machines:
- desktop
- laptop
- server
- mobile phone (Pinephone)
-
-everything outside of [hosts/](./hosts/) and [secrets/](./secrets/) is intended for export, to be importable for use by 3rd parties.
-the only hard dependency for my exported pkgs/modules should be [nixpkgs][nixpkgs].
-building [hosts/](./hosts/) will require [sops][sops].
-
-you might specifically be interested in these files (elaborated further in #key-points-of-interest):
- [my packages](./pkgs/by-name)
- [my implementation of impermanence](./modules/persist/default.nix)
- my way of deploying dotfiles/configuring programs per-user:
-  - [modules/fs/](./modules/fs/default.nix)
-  - [modules/programs/](./modules/programs/default.nix)
-  - [modules/users/](./modules/users/default.nix)
-
-if you find anything here genuinely useful, message me so that i can work to upstream it!
-
-[nixpkgs]: https://github.com/NixOS/nixpkgs
-[sops]: https://github.com/Mic92/sops-nix
-[uninsane-org]: https://uninsane.org
-
-
-## Using This Repo In Your Own Config
-
-follow the instructions [here][NUR] to access my packages through the Nix User Repositories.
-
-[NUR]: https://nur.nix-community.org/
-
-
-## Layout
- `doc/`
-  - instructions for tasks i find myself doing semi-occasionally in this repo.
- `hosts/`
-  - configs which aren't factored with external use in mind.
-  - that is, if you were to add this repo to a flake.nix for your own use,
-    you won't likely be depending on anything in this directory.
- `integrations/`
-  - code intended for consumption by external tools (e.g. the Nix User Repos).
- `modules/`
-  - config which is gated behind `enable` flags, in similar style to nixpkgs' `nixos/` directory.
-  - if you depend on this repo for anything besides packages, it's most likely for something in this directory.
- `overlays/`
-  - predominantly a list of `callPackage` directives.
- `pkgs/`
-  - derivations for things not yet packaged in nixpkgs.
-  - derivations for things from nixpkgs which i need to `override` for some reason.
-  - inline code for wholly custom packages (e.g. `pkgs/by-name/sane-scripts/` for CLI tools
-    that are highly specific to my setup).
- `scripts/`
-  - scripts which aren't reachable on a deployed system, but may aid manual deployments.
- `secrets/`
-  - encrypted keys, API tokens, anything which one or more of my machines needs
-    read access to but shouldn't be world-readable.
-  - not much to see here.
- `templates/`
-  - used to instantiate short-lived environments.
-  - used to auto-fill the boiler-plate portions of new packages.
-
-
-## Key Points of Interest
-
-i.e. you might find value in using these in your own config:
-
- `modules/fs/`
-  - use this to statically define leafs and nodes anywhere in the filesystem,
-    not just inside `/nix/store`.
-  - e.g. specify that `/var/www` should be:
-    - owned by a specific user/group
-    - set to a specific mode
-    - symlinked to some other path
-    - populated with some statically-defined data
-    - populated according to some script
-    - created as a dependency of some service (e.g. `nginx`)
-  - this is akin to using [Home Manager's][home-manager] file API -- the part which lets you
-    statically define `~/.config` files -- just with a different philosophy.
-    namely, it avoids any custom activation scripts by leveraging `systemd-tmpfiles`.
- `modules/persist/`
-  - my implementation of impermanence, built atop the above `fs` module, with a few notable features:
-    - no custom activation scripts or services (uses `systemd-tmpfiles` and `.mount` units)
-    - "persist" cache directories -- to free up RAM -- but auto-wipe them on mount
-      and encrypt them to ephemeral keys so they're unreadable post shutdown/unmount.
-    - persist to encrypted storage which is unlocked at login time.
- `modules/programs/`
-  - like nixpkgs' `programs` options, but allows both system-wide or per-user deployment.
-  - allows `fs` and `persist` config values to be gated behind program deployment:
-    - e.g. `/home/<user>/.mozilla/firefox` is persisted only for users who
-      `sane.programs.firefox.enableFor.user."<user>" = true;`
-  - allows aggressive sandboxing any program:
-    - `sane.programs.firefox.sandbox.enable = true;  # wraps the program so that it isolates itself into a new namespace when invoked`
-    - `sane.programs.firefox.sandbox.whitelistWayland = true;  # allow it to render a wayland window`
-    - `sane.programs.firefox.sandbox.extraHomePaths = [ "Downloads" ];  # allow it read/write access to ~/Downloads`
-    - integrated with `fs` and `persist` modules so that programs' config files and persisted data stores are linked into the sandbox w/o any extra involvement.
- `modules/users/`
-  - convenience layer atop the above modules so that you can just write
-    `fs.".config/git"` instead of `fs."/home/colin/.config/git"`
-  - simplified `systemd.services` API
-
-[home-manager]: https://github.com/nix-community/home-manager
-
-
-## Mirrors
-
-this repo exists in a few known locations:
- primary: <https://git.uninsane.org/colin/nix-files>
- mirror: <https://github.com/nix-community/nur-combined/tree/master/repos/colinsane>
-
-
-## Contact
-
-if you want to contact me for questions, or collaborate to split something useful into a shared repo, etc,
-you can reach me via any method listed [here](https://uninsane.org/about).
-patches, for this repo or any other i host, will be warmly welcomed in any manner you see fit:
-`git send-email`, DM'ing the patch over Matrix/Lemmy/ActivityPub/etc, even a literal PR where you
-link me to your own clone.
--- a/TODO.md
+++ b/TODO.md
@@ -1,182 +0,0 @@
-## BUGS
- alacritty Ctrl+N frequently fails to `cd` to the previous directory
- bunpen dbus sandboxing can't be *nested* (likely a problem in xdg-dbus-proxy)
- dissent has a memory leak (3G+ after 24hr)
-  - set a max memory use in the systemd service, to force it to restart as it leaks?
- `rmDbusServices` may break sandboxing
-  - e.g. if the package ships a systemd unit which references $out, then make-sandboxed won't properly update that unit.
-  - `rmDbusServicesInPlace` is not affected
- mpv: audiocast has mpv sending its output to the builtin speakers unless manually changed
- syshud (volume overlay): when casting with `blast`, syshud doesn't react to volume changes
- dissent: if i launch it without net connectivity, it gets stuck at the login, and never tries again
- newsflash on moby can't play videos
-  - "open in browser" works though -- in mpv
- gnome-maps can't use geoclue *and* openstreetmap at the same time
-  - get gnome-maps to speak xdg-desktop-portal, and this will be fixed
- epiphany can't save cookies
-  - see under "preferences", cookies are disabled
-  - prevents logging into websites (OpenStreetMap)
-  - works when sandbox is disabled
- rsync to ssh target fails because of restrictive sandboxing
- `/mnt/.servo_ftp` retries every 10s, endlessly, rather than doing a linear backoff
-  - repro by `systemctl stop sftpgo` on servo, then watching `mnt-.servo_ftp.{mount,timer}` on desko
- `ovpns` (and presumably `doof`) net namespaces aren't firewalled
-  - not great because things like `bitmagnet` expose unprotected admin APIs by default!
- moby: NetworkManager doesn't connect to network until _after_ `systemctl restart NetworkManager`
-  - probably a dependency ordering issue
-    - e.g. we try to bring up NetworkManager before bringing up `lo`
-  - could be a perms issue (over-restrictive sandboxing)
-
-## REFACTORING:
- fold hosts/modules/ into toplevel modules/
- add import checks to my Python nix-shell scripts
- consolidate ~/dev and ~/ref
-  - ~/dev becomes a link to ~/ref/cat/mine
- fold hosts/common/home/ssh.nix -> hosts/common/users/colin.nix
- don't hardcode IP addresses so much in servo
- modules/netns: migrate `sane.netns.$NS.services = [ FOO ]` option to be `systemd.services.$FOO.sane.netns = NS`
-  - then change the ExecStartPre check to not ping `ipinfo.net` or whatever.
-    either port all of `sane-ip-check` to use a self-hosted reflector,
-    or settle for something like `test -eq "$(ip route get ...)" "$expectedGateway"`
-
-### sops/secrets
- user secrets could just use `gocryptfs`, like with ~/private?
-  - can gocryptfs support nested filesystems, each with different perms (for desko, moby, etc)?
-
-### upstreaming
- upstream blueprint-compiler cross fixes -> nixpkgs
- upstream cargo cross fixes -> nixpkgs
- upstream `gps-share` package -> nixpkgs
-
-#### upstreaming to non-nixpkgs repos
- gnome-calls: retry net connection when DNS is down
- gtk: build schemas even on cross compilation: <https://github.com/NixOS/nixpkgs/pull/247844>
- linux: upstream PinePhonePro device trees
- nwg-panel: configurable media controls
- nwg-panel / playerctl hang fix (i think nwg-panel is what should be patched here)
-
-
-## IMPROVEMENTS:
- servo: expand /boot to 2 GiB like all other hosts
- moby: port to systemd-boot
- sane-deadlines: show day of the week for upcoming items
-  - and only show on "first" terminal opened; not on Ctrl+N terminals
- curlftpfs: replace with something better
-  - safer (rust? actively maintained? sandboxable?)
-  - handles spaces/symbols in filenames
-  - has better multi-stream perf (e.g. `sane-sync-music` should be able to copy N items in parallel)
- firefox: open *all* links (http, https, ...) with system handler
-  - removes the need for open-in-mpv, firefox-xdg-open, etc.
-  - matrix room links *just work*.
-  - `network.protocol-handler.external.https = true` in about:config *seems* to do this,
-    but breaks some webpages (e.g. Pleroma)
- associate http(s)://*.pdf with my pdf handler
-  - can't do that because lots of applications don't handle URIs
-  - could workaround using a wrapper that downloads the file and then passes it to the program
- geary: replace with envelope
-  - likely requires updating envelope to a more recent version (for multi-accounting), and therefore updating libadwaita...
-
-### security/resilience
- /mnt/desko/home, etc, shouldn't include secrets (~/private)
-  - 95% of its use is for remote media access and stuff which isn't in VCS (~/records)
- harden systemd services:
-  - servo: `coturn.service`
-  - servo: `postgresql.service`
-  - servo: `postfix.service`
-  - servo: `prosody.service`
-  - servo: `slskd.service`
-  - desko: `usbmuxd.service`
-  - servo: `backup-torrents.service`
-  - servo: `dedupe-media.service`
-  - remove SGID /run/wrappers/bin/sendmail, and just add senders to `postdrop` group
- port all sane.programs to be sandboxed
-  - sandbox `nix`
-  - enforce that all `environment.packages` has a sandbox profile (or explicitly opts out)
-  - enforce granular dbus sandboxing (bunpen-dbus-*)
- make gnome-keyring-daemon less monolithic
-  - no reason every application with _a_ secret needs to see _all_ secrets
-  - check out oo7-daemon?
-  - also unix-pass based provider: <https://github.com/mdellweg/pass_secret_service>
- make dconf stuff less monolithic
-  - i.e. per-app dconf profiles for those which need it. possible static config.
-  - flatpak/spectrum has some stuff to proxy dconf per-app
- rework `programs` API to be just an overlay which wraps each binary in an env with XDG_DATA_DIRS etc set & the config/state links placed in /nix/store instead of $HOME.
-
-### user experience
- setup a real calendar system, for recurring events
- rofi: sort items case-insensitively
- rofi: enable mouse mode?
- mpv: add media looping controls (e.g. loop song, loop playlist)
- mpv: add/implement an extension to search youtube
-  - apparently `yt-dlp` does searching!
- replace starship prompt with something more efficient
-  - watch `forkstat`: it does way too much
- cleanup nwg-panel so that it's not invoking swaync every second
-  - nwg-panel: doesn't know that virtual-desktop 10/TV exists
- install apps:
-  - display QR codes for WiFi endpoints: <https://linuxphoneapps.org/apps/noappid.wisperwind.wifi2qr/>
-  - shopping list (not in nixpkgs): <https://linuxphoneapps.org/apps/ro.hume.cosmin.shoppinglist/>
-  - offline Wikipedia (or, add to `wike`)
-  - some type of games manager/launcher
-    - Gnome Highscore (retro games)?: <https://gitlab.gnome.org/World/highscore>
-  - note-taking app: <https://linuxphoneapps.org/categories/note-taking/>
-    - Folio is nice, uses standard markdown, though it only supports flat repos
-  - OSK overlay specifically for mobile gaming
-    - i.e. mock joysticks, for use with SuperTux and SuperTuxKart
-  - game: Hedgewars
- install mobile-friendly games:
-  - Shattered Pixel Dungeon (nixpkgs `shattered-pixel-dungeon`; doesn't cross-compile b/c openjdk/libIDL) <https://github.com/ebolalex/shattered-pixel-dungeon>
-  - UnCiv (Civ V clone; nixpkgs `unciv`; doesn't cross-compile):  <https://github.com/yairm210/UnCiv>
-  - Simon Tatham's Puzzle Collection (not in nixpkgs) <https://git.tartarus.org/?p=simon/puzzles.git>
-  - Shootin Stars  (Godot; not in nixpkgs) <https://gitlab.com/greenbeast/shootin-stars>
-  - numberlink (generic name for Flow Free). not packaged in Nix
-  - Neverball (https://neverball.org/screenshots.php). nix: as `neverball`
-  - blurble (https://linuxphoneapps.org/games/app.drey.blurble/). nix: not as of 2024-02-05
-  - Trivia Quiz (https://linuxphoneapps.org/games/io.github.nokse22.trivia-quiz/)
- sane-sync-music: remove empty dirs
- soulseek: install a CLI app usable over ssh
- moby: replace `spot` with its replacement, `riff` (<https://github.com/Diegovsky/riff>)
-
-#### moby
- moby: port battery support to something upstreamable
- moby: install transito/mobroute public transit app: <https://sr.ht/~mil/mobroute/> <https://git.sr.ht/~mil/transito>
-  - see: <https://github.com/NixOS/nixpkgs/pull/335613>
- moby: consider honeybee instead of gnome-calls for calling? <https://git.sr.ht/~anjan/honeybee>
-  - uses XMPP, so more NAT/WoWLAN-friendly
- fix cpuidle (gets better power consumption): <https://xnux.eu/log/077.html>
- fix cpupower for better power/perf
-  - `journalctl -u cpupower --boot` (problem is present on lappy, at least)
- use dynamic DRAM clocking to reduce power by 0.5W: <https://xnux.eu/log/083.html>
-  - coreboot implements DRAM training for rk3399: <https://gitlab.com/vicencb/kevinboot/-/blob/master/cb/sdram.c>
- moby: tune keyboard layout
- SwayNC/nwg-panel: add option to change audio output
- Newsflash: sync OPML on start, same way i do with gpodder
- better podcasting client?
- hardware upgrade (OnePlus)?
-
-#### non-moby
- RSS: integrate a paywall bypass
-  - e.g. self-hosted [ladder](https://github.com/everywall/ladder) (like 12ft.io)
- RSS: have podcasts get downloaded straight into ~/Videos/...
-  - and strip the ads out using Whisper transcription + asking a LLM where the ad breaks are
- neovim: integrate ollama
- neovim: better docsets (e.g. c++, glib)
- firefox: persist history
-  - just not cookies or tabs
- have xdg-open parse `<repo:...> URIs (or adjust them so that it _can_ parse)
- sane-bt-search: show details like 5.1 vs stereo, h264 vs h265
-  - maybe just color these "keywords" in all search results?
- transmission: apply `sane-tag-media` path fix in `torrent-done` script
-  - many .mkv files do appear to be tagged: i'd just need to add support in my own tooling
-  - more aggressively cleanup non-media files after DL (ripper logos, info txts)
- uninsane.org: make URLs relative to allow local use (and as offline homepage)
- email: fix so that local mail doesn't go to junk
-  - git sendmail flow adds the DKIM signatures, but gets delivered locally w/o having the sig checked, so goes into Junk
-  - could change junk filter from "no DKIM success" to explicit "DKIM failed"
-  - add an auto-reply address (e.g. `reply-test@uninsane.org`) which reflects all incoming mail; use this (or a friend running this) for liveness checks
-
-## NEW FEATURES:
- migrate Kodi box to nix
- migrate MAME cabinet to nix
-  - boot it from PXE from servo?
- enable IPv6
--- a/default.nix
+++ b/default.nix
@@ -1,5 +0,0 @@
-{ ... }@args:
-let
-  sane-nix-files = import ./pkgs/by-name/sane-nix-files/package.nix { };
-in
-  import "${sane-nix-files}/impure.nix" args
--- a/doc/adding-a-host.md
+++ b/doc/adding-a-host.md
@@ -1,33 +0,0 @@
-to add a host:
- create the new nix targets
-  - hosts/by-name/HOST
-  - let the toplevel (impure.nix) know about HOST
-  - let the other hosts know about this host (hosts/common/hosts.nix)
-  - let sops know about the host's pubkey (.sops.yaml)
-    - re-encrypt all sops keys in secrets/common
- build and flash an image
- optionally expand the rootfs
-  - `cfdisk /dev/sda2` -> resize partition
-  - `mount /dev/sda2 boot`
-  - `btrfs filesystem resize max root`
- setup required persistent directories
-  - `mkdir -p root/persist/private`
-  - `gocryptfs -init root/persist/private`
-  - then boot the device, and for every dangling symlink in ~/.local/share, ~/.cache, do `mkdir -p` on it
- setup host ssh
-  - `mkdir -p root/persist/plaintext/etc/ssh/host_keys`
-  - boot the machine and let it create its own ssh keys
-  - add the pubkey to `hosts/common/hosts.nix`
- setup user ssh
-  - `ssh-keygen`. don't enter any password; it's stored in a password-encrypted fs.
-  - add the pubkey to `hosts/common/hosts.nix`
- allow the new host to view secrets
-  - instructions in hosts/common/secrets.nix
-  - run `ssh-to-age` on user/host pubkeys
-  - add age key to .sops.yaml
-  - update encrypted secrets: `find secrets -type f -exec sops updatekeys -y '{}' ';'`
- setup wireguard keys
-  - `pk=$(wg genkey)`
-  - `echo "$pk" | sops encrypt --filename-override secrets/$(hostname)/wg-home.priv.bin --output secrets/$(hostname)/wg-home.priv.bin`
-  - `pub=$(echo "$pk" | wg pubkey)`
-  - add pubkey to hosts/common/hosts.nix
--- a/doc/adding-a-program.md
+++ b/doc/adding-a-program.md
@@ -1,13 +0,0 @@
-to ship `pkgs.foo` on some host, either:
- add it as an entry in `suggestedPrograms` to the appropriate category in `hosts/common/programs/assorted.nix`, or
- `sane.programs.foo.enableFor.user.colin = true` in `hosts/by-name/myhost/default.nix`
-
-if the program needs customization (persistence, configs, secrets):
- add a file for it at `hosts/common/programs/<foo>.nix`
- set the options, `sane.programs.foo.{fs,persist}`
-
-if it's unclear what fs paths a program uses:
- run one of these commands, launch the program, run it again, and `diff`:
-  - `du -x --apparent-size ~`
-  - `find ~ -xdev`
- or, inspect the whole tmpfs root with `ncdu -x /`
--- a/doc/hello.gif
+++ b/doc/hello.gif
--- a/doc/migrating-storage-device.md
+++ b/doc/migrating-storage-device.md
@@ -1,49 +0,0 @@
-## migrating a host to a new drive
-### 1. copy persistent data off of the host:
-```sh
-$ mkdir -p mnt old/persist
-$ mount /dev/$old mnt
-$ rsync -arv mnt/persist/ old/persist/
-```
-
-### 2. flash the new drive
-```
-$ nix-build -A hosts.moby.img
-$ dd if=$(readlink ./result) of=/dev/$new bs=4M oflag=direct conv=sync status=progress
-```
-
-### 3.1. expand the partition
-```sh
-$ cfdisk /dev/$new
-# scroll to the last partition
-> Resize
-  leave at default (max)
-> Write
-  type "yes"
-> Quit
-```
-### 3.2. expand the filesystem
-```
-$ mkdir -p /mnt/$new
-$ mount /dev/$new /mnt/$new
-$ btrfs filesystem resize max /mnt/$new
-```
-
-### 4. copy data onto the new host
-```
-$ mkdir /mnt/$new
-$ mount /dev/$new /mnt/$new
-# if you want to use btrfs snapshots (e.g. snapper), then create the data directory as a subvolume:
-$ btrfs subvolume create /mnt/$new/persist
-# restore the data
-$ rsync -arv old/persist/ /mnt/$new/persist/
-```
-
-### 5. ensure/fix ownership
-```
-$ chmod -R a+rX /mnt/$new/nix
-# or, let the nix daemon do it:
-$ nix copy --no-check-sigs --to /mnt/$new $(nix-build -A hosts.moby)
-```
-
-### 6. insert the disk into the system, and boot!
--- a/doc/recovery.md
+++ b/doc/recovery.md
@@ -1,12 +0,0 @@
-## deploying to SD card
- build a toplevel config: `nix build '.#hosts.moby.img'`
- mount a system:
-  - `mkdir -p root/{nix,boot}`
-  - `mount /dev/sdX1 root/boot`
-  - `mount /dev/sdX2 root/nix`
- copy the config:
-  - `sudo nix copy --no-check-sigs --to root/ $(readlink result)`
-    - nix will copy stuff to `root/nix/store`
- install the boot files:
-  - `sudo /nix/store/sbwpwngjlgw4f736ay9hgi69pj3fdwk5-extlinux-conf-builder.sh -d ./root/boot -t 5 -c $(readlink ./result)`
-    - extlinux-conf-builder can be found in `/run/current-system/bin/switch-to-configuration`
--- a/flake.lock
+++ b/flake.lock
@@ -0,0 +1,177 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667907331,
+        "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-22.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "mobile-nixos": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1670131242,
+        "narHash": "sha256-T/o1/3gffr010fsqgNshs1NJJjsnUYvQnUZgm6hilsY=",
+        "owner": "nixos",
+        "repo": "mobile-nixos",
+        "rev": "5ee45cc1f8e43f4af14ee17ccef9156b0db8cd77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "mobile-nixos",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unpatched"
+        ],
+        "patches": []
+      },
+      "locked": {
+        "lastModified": 1,
+        "narHash": "sha256-d3XSehPFkNwvwlOYy7gch0NLxOgdXuV7j5r/Qsn7kHc=",
+        "path": "/nix/store/wq6rmmnd7yhw9w44k54w4x5v63ah1psr-source/nixpatches",
+        "type": "path"
+      },
+      "original": {
+        "path": "/nix/store/wq6rmmnd7yhw9w44k54w4x5v63ah1psr-source/nixpatches",
+        "type": "path"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1673704454,
+        "narHash": "sha256-5Wdj1MgdOgn3+dMFIBtg+IAYZApjF8JzwLWDPieg0C4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "a83ed85c14fcf242653df6f4b0974b7e1c73c6c6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1673740915,
+        "narHash": "sha256-MMH8zONfqahgHly3K8/A++X34800rajA/XgZ2DzNL/M=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7c65528c3f8462b902e09d1ccca23bb9034665c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unpatched": {
+      "locked": {
+        "lastModified": 1673631141,
+        "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "befc83905c965adfd33e5cae49acb0351f6e0404",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "mobile-nixos": "mobile-nixos",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unpatched": "nixpkgs-unpatched",
+        "sops-nix": "sops-nix",
+        "uninsane-dot-org": "uninsane-dot-org"
+      }
+    },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable_2"
+      },
+      "locked": {
+        "lastModified": 1673752321,
+        "narHash": "sha256-EFfXY1ZHJq4FNaNQA9x0djtu/jiOhBbT0Xi+BT06cJw=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "e18eefd2b133a58309475298052c341c08470717",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
+    "uninsane-dot-org": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1666870107,
+        "narHash": "sha256-b9eXZxSwhzdJI5uQgfrMhu4SY2POrPkinUg7F5gQVYo=",
+        "ref": "refs/heads/master",
+        "rev": "80c6ec95bd430e29d231cf745f19279bb76fb382",
+        "revCount": 164,
+        "type": "git",
+        "url": "https://git.uninsane.org/colin/uninsane"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.uninsane.org/colin/uninsane"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake.nix
+++ b/flake.nix
@@ -0,0 +1,195 @@
+# FLAKE FEEDBACK:
+# - if flake inputs are meant to be human-readable, a human should be able to easily track them down given the URL.
+#   - this is not the case with registry URLs, like `nixpkgs/nixos-22.11`.
+#   - this is marginally the case with schemes like `github:nixos/nixpkgs`.
+#   - given the *existing* `git+https://` scheme, i propose expressing github URLs similarly:
+#     - `github+https://github.com/nixos/nixpkgs/tree/nixos-22.11`
+# - need some way to apply local patches to inputs.
+#
+#
+# DEVELOPMENT DOCS:
+# - Flake docs: <https://nixos.wiki/wiki/Flakes>
+# - Flake RFC: <https://github.com/tweag/rfcs/blob/flakes/rfcs/0049-flakes.md>
+#   - Discussion: <https://github.com/NixOS/rfcs/pull/49>
+# - <https://serokell.io/blog/practical-nix-flakes>
+
+{
+  # XXX: use the `github:` scheme instead of the more readable git+https: because it's *way* more efficient
+  # preferably, i would rewrite the human-readable https URLs to nix-specific github: URLs with a helper,
+  # but `inputs` is required to be a strict attrset: not an expression.
+  inputs = {
+    # <https://github.com/nixos/nixpkgs/tree/nixos-22.11>
+    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11";
+
+    # <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
+    nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs = {
+      url = "./nixpatches";
+      inputs.nixpkgs.follows = "nixpkgs-unpatched";
+      # TODO: remove this dependency injection: it's from when we used url = path:...
+      inputs.patches.follows = "";
+    };
+    mobile-nixos = {
+      # <https://github.com/nixos/mobile-nixos>
+      url = "github:nixos/mobile-nixos";
+      flake = false;
+    };
+    home-manager = {
+      # <https://github.com/nix-community/home-manager/tree/release-22.05>
+      url = "github:nix-community/home-manager?ref=release-22.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    sops-nix = {
+      # <https://github.com/Mic92/sops-nix>
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    uninsane-dot-org = {
+      url = "git+https://git.uninsane.org/colin/uninsane";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    nixpkgs-stable,
+    nixpkgs-unpatched,
+    mobile-nixos,
+    home-manager,
+    sops-nix,
+    uninsane-dot-org
+  }:
+    let
+      nixpkgsCompiledBy = local: nixpkgs.legacyPackages."${local}";
+
+      evalHost = { name, local, target }:
+        let
+          # XXX: we'd prefer to use `nixosSystem = (nixpkgsCompiledBy target).nixos`
+          # but it doesn't propagate config to the underlying pkgs, meaning it doesn't let you use
+          # non-free packages even after setting nixpkgs.allowUnfree.
+          # XXX: patch using the target -- not local -- otherwise the target will
+          # need to emulate the host in order to rebuild!
+          nixosSystem = import ((nixpkgsCompiledBy target).path + "/nixos/lib/eval-config.nix");
+        in
+          (nixosSystem {
+            # we use pkgs built for and *by* the target, i.e. emulation, by default.
+            # cross compilation only happens on explicit access to `pkgs.cross`
+            system = target;
+            modules = [
+              (import ./hosts/instantiate.nix { localSystem = local; hostName = name; })
+              self.nixosModules.default
+              self.nixosModules.passthru
+              {
+                nixpkgs.overlays = [
+                  self.overlays.default
+                  self.overlays.passthru
+                  self.overlays.pins
+                ];
+              }
+            ];
+          });
+    in {
+      nixosConfigurations = {
+        servo = evalHost { name = "servo"; local = "x86_64-linux"; target = "x86_64-linux"; };
+        desko = evalHost { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; };
+        lappy = evalHost { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; };
+        moby = evalHost { name = "moby"; local = "aarch64-linux"; target = "aarch64-linux"; };
+        # special cross-compiled variant, to speed up deploys from an x86 box to the arm target
+        # note that these *do* produce different store paths, because the closure for the tools used to cross compile
+        # v.s. emulate differ.
+        # so deploying foo-cross and then foo incurs some rebuilding.
+        moby-cross = evalHost { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; };
+        rescue = evalHost { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
+      };
+
+      # unofficial output
+      # this produces a EFI-bootable .img file (GPT with a /boot partition and a system (/ or /nix) partition).
+      # after building this:
+      #   - flash it to a bootable medium (SD card, flash drive, HDD)
+      #   - resize the root partition (use cfdisk)
+      #   - mount the part
+      #      - chown root:nixbld <part>/nix/store
+      #      - chown root:root -R <part>/nix/store/*
+      #      - chown root:root -R <part>/persist  # if using impermanence
+      #      - populate any important things (persist/, home/colin/.ssh, etc)
+      #   - boot
+      #   - if fs wasn't resized automatically, then `sudo btrfs filesystem resize max /`
+      #   - checkout this flake into /etc/nixos AND UPDATE THE FS UUIDS.
+      #   - `nixos-rebuild --flake './#<host>' switch`
+      imgs = builtins.mapAttrs (_: host-dfn: host-dfn.config.system.build.img) self.nixosConfigurations;
+
+      overlays = rec {
+        default = pkgs;
+        pkgs = import ./overlays/pkgs.nix;
+        pins = import ./overlays/pins.nix;  # TODO: move to `nixpatches/` input
+        passthru =
+          let
+            stable = next: prev: {
+              stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}";
+            };
+            mobile = (import "${mobile-nixos}/overlay/overlay.nix");
+            uninsane = uninsane-dot-org.overlay;
+          in
+            next: prev:
+              (stable next prev) // (mobile next prev) // (uninsane next prev);
+      };
+
+      nixosModules = rec {
+        default = sane;
+        sane = import ./modules;
+        passthru = { ... }: {
+          imports = [
+            home-manager.nixosModule
+            sops-nix.nixosModules.sops
+          ];
+        };
+      };
+
+      # this includes both our native packages and all the nixpkgs packages.
+      legacyPackages =
+        let
+          allPkgsFor = sys: (nixpkgsCompiledBy sys).appendOverlays [
+            self.overlays.passthru self.overlays.pkgs
+          ];
+        in {
+          x86_64-linux = allPkgsFor "x86_64-linux";
+          aarch64-linux = allPkgsFor "aarch64-linux";
+        };
+
+      # extract only our own packages from the full set
+      packages = builtins.mapAttrs
+        (_: full: full.sane // { inherit (full) sane uninsane-dot-org; })
+        self.legacyPackages;
+
+      apps."x86_64-linux" =
+        let
+          pkgs = self.legacyPackages."x86_64-linux";
+        in {
+          update-feeds = {
+            type = "app";
+            program = "${pkgs.feeds.passthru.updateScript}";
+          };
+
+          init-feed = {
+            type = "app";
+            program = "${pkgs.feeds.passthru.initFeedScript}";
+          };
+        };
+
+      templates = {
+        python-data = {
+          # initialize with:
+          # - `nix flake init -t '/home/colin/dev/nixos/#python-data'`
+          # then enter with:
+          # - `nix develop`
+          path = ./templates/python-data;
+          description = "python environment for data processing";
+        };
+      };
+
+      # unofficial output; used by inputs.nixpatches
+      nixpatches = import ./nixpatches/list.nix;
+    };
+}
+
--- a/hosts/README.md
+++ b/hosts/README.md
@@ -1,7 +0,0 @@
-## directory structure
- by-name/<hostname>: configuration which is evaluated _only_ for the given hostname
- common/: configuration which applies to all hosts
- modules/: nixpkgs-style modules which may be used by multiple hosts, but configured separately per host.
-    - ideally no module here has effect unless `enable`d
-        - however, `enable` may default to true
-        - and in practice some of these modules surely aren't fully "disableable"
--- a/hosts/by-name/cadey/default.nix
+++ b/hosts/by-name/cadey/default.nix
@@ -1,19 +0,0 @@
-# MAME arcade cabinet
-# Raspberry Pi 400:
-# - quad-core Cortex-A72 @ 1.8 GHz  (ARMv8-A 64; BCM2711)
-# - 4GiB RAM
-{ ... }:
-{
-  imports = [
-    ./fs.nix
-  ];
-
-  sane.hal.rpi-400.enable = true;
-  sane.roles.client = true;  # for WiFi creds
-
-  # TODO: port to `sane.programs` interface
-  services.xserver.desktopManager.kodi.enable = true;
-
-  # /boot space is at a premium, especially with uncompressed kernels. default was 20.
-  # boot.loader.generic-extlinux-compatible.configurationLimit = 10;
-}
--- a/hosts/by-name/cadey/fs.nix
+++ b/hosts/by-name/cadey/fs.nix
@@ -1,17 +0,0 @@
-{ ... }:
-
-{
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/cccccccc-aaaa-dddd-eeee-000020250621";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "defaults"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/2025-0621";
-    fsType = "vfat";
-  };
-}
--- a/hosts/by-name/crappy/default.nix
+++ b/hosts/by-name/crappy/default.nix
@@ -1,33 +0,0 @@
-# Samsung chromebook XE303C12
-# - <https://wiki.postmarketos.org/wiki/Samsung_Chromebook_(google-snow)>
-{ ... }:
-{
-  imports = [
-    ./fs.nix
-  ];
-
-  sane.hal.samsung.enable = true;
-  sane.roles.client = true;
-  # sane.roles.pc = true;
-
-  users.users.colin.initialPassword = "147147";
-  sane.programs.sway.enableFor.user.colin = true;
-
-  sane.programs.calls.enableFor.user.colin = false;
-  sane.programs.consoleMediaUtils.enableFor.user.colin = true;
-  sane.programs.epiphany.enableFor.user.colin = true;
-  sane.programs.geary.enableFor.user.colin = false;
-  # sane.programs.firefox.enableFor.user.colin = true;
-  sane.programs.portfolio-filemanager.enableFor.user.colin = true;
-  sane.programs.signal-desktop.enableFor.user.colin = false;
-  sane.programs.wike.enableFor.user.colin = true;
-
-  sane.programs.dino.config.autostart = false;
-  sane.programs.dissent.config.autostart = false;
-  sane.programs.fractal.config.autostart = false;
-  sane.programs.sway.config.mod = "Mod1";  #< alt key instead of Super
-
-  # sane.programs.guiApps.enableFor.user.colin = false;
-
-  # sane.programs.pcGuiApps.enableFor.user.colin = false;  #< errors!
-}
--- a/hosts/by-name/crappy/fs.nix
+++ b/hosts/by-name/crappy/fs.nix
@@ -1,16 +0,0 @@
-{ ... }:
-{
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/55555555-0303-0c12-86df-eda9e9311526";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "defaults"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/303C-5A37";
-    fsType = "vfat";
-  };
-}
--- a/hosts/by-name/desko/default.nix
+++ b/hosts/by-name/desko/default.nix
@@ -1,57 +0,0 @@
-{ config, lib, ... }:
-{
-  imports = [
-    ./fs.nix
-  ];
-
-  # firewall has to be open to allow clients to use services hosted on this device,
-  # like `ollama`
-  sane.ports.openFirewall = true;
-
-  # sane.programs.devPkgs.enableFor.user.colin = true;
-  # sane.guest.enable = true;
-
-  # don't enable wifi by default: it messes with connectivity.
-  # systemd.services.iwd.enable = false;
-  # networking.wireless.enable = false;
-  # systemd.services.wpa_supplicant.enable = false;
-  # sane.programs.wpa_supplicant.enableFor.user.colin = lib.mkForce false;
-  # sane.programs.wpa_supplicant.enableFor.system = lib.mkForce false;
-  # don't auto-connect to wifi networks
-  # see: <https://networkmanager.dev/docs/api/latest/NetworkManager.conf.html#device-spec>
-  networking.networkmanager.unmanaged = [ "type:wifi" ];
-
-  sops.secrets.colin-passwd.neededForUsers = true;
-
-  sane.roles.build-machine.enable = true;
-  sane.roles.client = true;
-  sane.roles.pc = true;
-  sane.roles.work = true;
-  sane.services.ollama.enable = lib.mkIf (config.sane.maxBuildCost >= 3) true;
-  sane.services.wg-home.enable = true;
-  sane.ovpn.addrV4 = "172.26.55.21";
-  # sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:20c1:a73c";
-  sane.services.rsync-net.enable = true;
-
-  sane.nixcache.remote-builders.desko = false;
-
-  sane.programs.firefox.config.formFactor = "desktop";
-
-  sane.programs.sane-private-unlock-remote.enableFor.user.colin = true;
-  sane.programs.sane-private-unlock-remote.config.hosts = [ "servo" ];
-
-  sane.programs.sway.enableFor.user.colin = true;
-  sane.programs.steam.enableFor.user.colin = true;
-
-  sane.programs.nwg-panel.config = {
-    battery = false;
-    brightness = false;
-  };
-
-  sane.programs.mpv.config.defaultProfile = "high-quality";
-
-  # needed to use libimobiledevice/ifuse, for iphone sync
-  services.usbmuxd.enable = true;
-
-  hardware.amdgpu.opencl.enable = true;  # desktop (AMD's opencl implementation AKA "ROCM"); probably required for ollama
-}
--- a/hosts/by-name/desko/fs.nix
+++ b/hosts/by-name/desko/fs.nix
@@ -1,21 +0,0 @@
-{ ... }:
-
-{
-  # increase /tmp space (defaults to 50% of RAM) for building large nix things.
-  # a cross-compiled kernel, particularly, will easily use 30+GB of tmp
-  fileSystems."/tmp".options = [ "size=128G" ];
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/dddddddd-eeee-5555-cccc-000020250527";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "defaults"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/2025-0527";
-    fsType = "vfat";
-  };
-}
--- a/hosts/by-name/flowy/default.nix
+++ b/hosts/by-name/flowy/default.nix
@@ -1,58 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  imports = [
-    ./fs.nix
-  ];
-
-  sane.roles.client = true;
-  sane.roles.pc = true;
-  sane.roles.work = true;
-  sane.services.wg-home.enable = true;
-  # sane.ovpn.addrV4 = "172.23.119.72";
-
-  # sane.guest.enable = true;
-
-  sane.programs.sane-private-unlock-remote.enableFor.user.colin = true;
-  sane.programs.sane-private-unlock-remote.config.hosts = [ "servo" ];
-
-  sane.programs.firefox.config.formFactor = "laptop";
-  sane.programs.itgmania.enableFor.user.colin = true;
-  sane.programs.sway.enableFor.user.colin = true;
-
-  sops.secrets.colin-passwd.neededForUsers = true;
-
-  sane.services.rsync-net.enable = true;
-
-  # add an entry to boot into Windows, as if it had been launched directly from the BIOS.
-  boot.loader.systemd-boot.rebootForBitlocker = true;
-  boot.loader.systemd-boot.windows.primary.efiDeviceHandle = "HD0b";
-
-  system.activationScripts.makeDefaultBootEntry = {
-    text = let
-      makeDefaultBootEntry = pkgs.writeShellApplication {
-        name = "makeDefaultBootEntry";
-        runtimeInputs = with pkgs; [
-          efibootmgr
-          gnugrep
-        ];
-        text = ''
-          # configure the EFI firmware to boot into NixOS by default.
-          # do this by querying the active boot entry, and just making that be the default.
-          # this is needed on flowy because enabling secure boot / booting into Windows
-          # resets the default boot order; manually reconfiguring that is tiresome.
-          efi=$(efibootmgr)
-          bootCurrent=$(echo "$efi" | grep '^BootCurrent: ')
-          bootCurrent=''${bootCurrent/BootCurrent: /}
-          bootOrder=$(echo "$efi" | grep '^BootOrder: ')
-          bootOrder=''${bootOrder/BootOrder: /}
-          if ! [[ "$bootOrder" =~ ^"$bootCurrent", ]]; then
-            # booted entry was not the default,
-            # so prepend it to the boot order:
-            newBootOrder="$bootCurrent,$bootOrder"
-            (set -x; efibootmgr -o "$newBootOrder")
-          fi
-        '';
-      };
-    in lib.getExe makeDefaultBootEntry;
-  };
-}
--- a/hosts/by-name/flowy/fs.nix
+++ b/hosts/by-name/flowy/fs.nix
@@ -1,17 +0,0 @@
-{ ... }:
-
-{
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/ffffffff-1111-0000-eeee-000020250531";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "defaults"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/2025-0531";
-    fsType = "vfat";
-  };
-}
--- a/hosts/by-name/lappy/default.nix
+++ b/hosts/by-name/lappy/default.nix
@@ -1,37 +0,0 @@
-{ lib, ... }:
-{
-  imports = [
-    ./fs.nix
-  ];
-
-  sane.roles.client = true;
-  sane.roles.pc = true;
-  sane.services.wg-home.enable = true;
-  sane.ovpn.addrV4 = "172.23.119.72";
-  # sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:0332:aa96/128";
-
-  # sane.guest.enable = true;
-
-  sane.programs.sane-private-unlock-remote.enableFor.user.colin = true;
-  sane.programs.sane-private-unlock-remote.config.hosts = [ "servo" ];
-
-  sane.programs.firefox.config.formFactor = "laptop";
-  sane.programs.itgmania.enableFor.user.colin = true;
-  # sane.programs.stepmania.enableFor.user.colin = true;  #< TODO: fix build
-  sane.programs.sway.enableFor.user.colin = true;
-
-  sops.secrets.colin-passwd.neededForUsers = true;
-
-  sane.services.rsync-net.enable = true;
-
-  # starting 2024/09, under default settings (apparently 256 quantum), audio would crackle under load.
-  # 1024 solves *most* crackles, but still noticable under heavier loads.
-  sane.programs.pipewire.config.min-quantum = 2048;
-
-  # limit how many snapshots we keep, due to extremely limited disk space (TODO: remove this override after upgrading lappy hard drive)
-  services.snapper.configs.root.TIMELINE_LIMIT_HOURLY = lib.mkForce 2;
-  services.snapper.configs.root.TIMELINE_LIMIT_DAILY = lib.mkForce 2;
-  services.snapper.configs.root.TIMELINE_LIMIT_WEEKLY = lib.mkForce 0;
-  services.snapper.configs.root.TIMELINE_LIMIT_MONTHLY = lib.mkForce 0;
-  services.snapper.configs.root.TIMELINE_LIMIT_YEARLY = lib.mkForce 0;
-}
--- a/hosts/by-name/lappy/fs.nix
+++ b/hosts/by-name/lappy/fs.nix
@@ -1,17 +0,0 @@
-{ ... }:
-
-{
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/75230e56-2c69-4e41-b03e-68475f119980";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "defaults"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/BD79-D6BB";
-    fsType = "vfat";
-  };
-}
--- a/hosts/by-name/moby/default.nix
+++ b/hosts/by-name/moby/default.nix
@@ -1,67 +0,0 @@
-# Pinephone
-#
-# wikis, resources, ...:
-# - Linux Phone Apps: <https://linuxphoneapps.org/>
-#   - massive mobile-friendly app database
-# - Mobian wiki: <https://wiki.mobian-project.org/doku.php?id=start>
-#   - recommended apps, chatrooms
-
-{ ... }:
-{
-  imports = [
-    ./fs.nix
-  ];
-
-  sane.hal.pine64-pinephone-pro.enable = true;
-  sane.roles.client = true;
-  sane.roles.handheld = true;
-  sane.services.wg-home.enable = true;
-  sane.ovpn.addrV4 = "172.24.87.255";
-  # sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:18cd:a72b";
-
-  # XXX colin: phosh doesn't work well with passwordless login,
-  # so set this more reliable default password should anything go wrong
-  users.users.colin.initialPassword = "147147";
-
-  sops.secrets.colin-passwd.neededForUsers = true;
-
-  sane.services.rsync-net.enable = true;
-
-  sane.programs.sway.enableFor.user.colin = true;
-  sane.programs.sway.config.mod = "Mod1";  #< alt key instead of Super
-
-  # enabled for easier debugging
-  sane.programs.eg25-control.enableFor.user.colin = true;
-  # sane.programs.rtl8723cs-wowlan.enableFor.user.colin = true;
-  # sane.programs.eg25-manager.enableFor.user.colin = true;
-
-  # sane.programs.ntfy-sh.config.autostart = true;
-  sane.programs.dino.config.autostart = true;
-  sane.programs.signal-desktop.config.autostart = false;
-  sane.programs.geary.config.autostart = false;
-
-  sane.programs.pipewire.config = {
-    # tune so Dino doesn't drop audio
-    # there's seemingly two buffers for the mic (see: <https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/FAQ#pipewire-buffering-explained>)
-    # 1. Pipewire buffering out of the driver and into its own member.
-    # 2. Pipewire buffering into Dino.
-    # the latter is fixed at 10ms by Dino, difficult to override via runtime config.
-    # the former defaults low (e.g. 512 samples)
-    # this default configuration causes the mic to regularly drop out entirely for a couple seconds at a time during a call,
-    # presumably because the system can't keep up (pw-top shows incrementing counter in ERR column).
-    # `pw-metadata -n settings 0 clock.force-quantum 1024` reduces to about 1 error per second.
-    # `pw-metadata -n settings 0 clock.force-quantum 2048` reduces to 1 error every < 10s.
-    # pipewire default config includes `clock.power-of-two-quantum = true`
-    min-quantum = 2048;
-    max-quantum = 8192;
-  };
-
-  sane.programs.mpv.config.defaultProfile = "fast";
-
-  # /boot space is at a premium, especially with uncompressed kernels. default was 20.
-  # boot.loader.generic-extlinux-compatible.configurationLimit = 10;
-
-  # TODO: switch to systemd-boot
-  boot.loader.generic-extlinux-compatible.enable = true;
-  boot.loader.systemd-boot.enable = false;
-}
--- a/hosts/by-name/rescue/default.nix
+++ b/hosts/by-name/rescue/default.nix
@@ -1,13 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./fs.nix
-  ];
-
-  sane.persist.enable = false;  # what we mean here is that the image is immutable; `/` is still tmpfs.
-  sane.nixcache.enable = false;  # don't want to be calling out to dead machines that we're *trying* to rescue
-
-  # auto-login at shell
-  services.getty.autologinUser = "colin";
-  # users.users.colin.initialPassword = "colin";
-}
--- a/hosts/by-name/servo/default.nix
+++ b/hosts/by-name/servo/default.nix
@@ -1,40 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./fs.nix
-    ./net
-    ./services
-    ./users
-  ];
-
-  # for administering services
-  sane.programs.clightning-sane.enableFor.user.colin = true;
-  # sane.programs.freshrss.enableFor.user.colin = true;
-  # sane.programs.signaldctl.enableFor.user.colin = true;
-  # sane.programs.matrix-synapse.enableFor.user.colin = true;
-
-  sane.roles.build-machine.enable = true;
-  sane.programs.sane-deadlines.config.showOnLogin = false;  # ~/knowledge doesn't always exist
-  sane.programs.consoleUtils.suggestedPrograms = [
-    "consoleMediaUtils"  # notably, for go2tv / casting
-    "pcConsoleUtils"
-    "sane-scripts.stop-all-servo"
-  ];
-  sane.services.dyn-dns.enable = true;
-  sane.nixcache.remote-builders.desko = false;
-  sane.nixcache.remote-builders.servo = false;
-  sane.services.rsync-net.enable = true;
-
-  # automatically log in at the virtual consoles.
-  # using root here makes sure we always have an escape hatch.
-  # XXX(2024-07-27): this is incompatible if using s6, which needs to auto-login as `colin` to start its user services.
-  services.getty.autologinUser = "root";
-
-  # both transmission and ipfs try to set different net defaults.
-  # we just use the most aggressive of the two here:
-  boot.kernel.sysctl = {
-    "net.core.rmem_max" = 4194304;  # 4MB
-  };
-}
-
--- a/hosts/by-name/servo/fs.nix
+++ b/hosts/by-name/servo/fs.nix
@@ -1,106 +0,0 @@
-{ lib, pkgs, ... }:
-
-{
-  # hostId: not used for anything except zfs guardrail?
-  #   [hex(ord(x)) for x in 'serv']
-  # networking.hostId = "73657276";
-
-  sane.persist.stores."ext" = {
-    origin = "/mnt/pool/persist";
-    storeDescription = "external HDD storage";
-    defaultMethod = "bind";  #< TODO: change to "symlink"?
-  };
-
-  # increase /tmp space (defaults to 50% of RAM) for building large nix things.
-  # even the stock `nixpkgs.linux` consumes > 16 GB of tmp
-  fileSystems."/tmp".options = [ "size=32G" ];
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/55555555-eeee-ffff-bbbb-000020250820";
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "defaults"
-    ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/2025-0820";
-    fsType = "vfat";
-  };
-
-  fileSystems."/mnt/pool" = {
-    # all btrfs devices of the same RAID volume use the same UUID.
-    device = "UUID=40fc6e1d-ba41-44de-bbf3-1aa02c3441df";
-    fsType = "btrfs";
-    options = [
-      # "compress=zstd"  #< not much point in compressing... mostly videos and music; media.
-      "defaults"
-      # `device=...` only needed if `btrfs scan` hasn't yet been run
-      # see: <https://askubuntu.com/a/484374>
-      # i don't know what guarantees NixOS/systemd make about that, so specifying all devices for now
-      # "device=/dev/disk/by-partuuid/14a7d00a-be53-2b4e-96f9-7e2c964674ec"  #< removed 2024-11-24 (for capacity upgrade)
-      "device=/dev/disk/by-partuuid/409a147e-2282-49eb-87a7-c968032ede88"  #< added 2024-11-24
-      # "device=/dev/disk/by-partuuid/6b86cc10-c3cc-ec4d-b20d-b6688f0959a6"  #< removed 2025-06-04 (early drive failure; capacity upgrade)
-      # "device=/dev/disk/by-partuuid/7fd85cac-b6f3-8248-af4e-68e703d11020"  #< removed 2024-11-13 (early drive failure)
-      "device=/dev/disk/by-partuuid/92ebbbfb-022f-427d-84d5-39349d4bc02a"  #< added 2025-05-14
-      "device=/dev/disk/by-partuuid/9e6c06b0-4a39-4d69-813f-1f5992f62ed7"  #< added 2025-06-05
-      "device=/dev/disk/by-partuuid/d9ad5ebc-0fc4-4d89-9fd0-619ce5210f1b"  #< added 2024-11-13
-      # "device=/dev/disk/by-partuuid/ef0e5c7b-fccf-f444-bac4-534424326159"  #< removed 2025-05-14 (early drive failure)
-      "nofail"
-      # "x-systemd.before=local-fs.target"
-      "x-systemd.device-bound=false"  #< don't unmount when `device` disappears (i thought this was necessary, for drive replacement, but it might not be)
-      "x-systemd.device-timeout=60s"
-      "x-systemd.mount-timeout=60s"
-    ];
-  };
-
-  # TODO: move this elsewhere and automate the ACLs!
-  # FIRST TIME SETUP FOR MEDIA DIRECTORY:
-  # - set the group sticky bit: `sudo find /var/media -type d -exec chmod g+s {} +`
-  #   - this ensures new files/dirs inherit the group of their parent dir (instead of the user who creates them)
-  # - ensure everything under /var/media is mounted with `-o acl`, to support acls
-  # - ensure all files are rwx by group: `setfacl --recursive --modify d:g::rwx /var/media`
-  #   - alternatively, `d:g:media:rwx` to grant `media` group even when file has a different owner, but that's a bit complex
-  sane.persist.sys.byStore.ext = [{
-    path = "/var/media";
-    user = "colin";
-    group = "media";
-    mode = "0775";
-  }];
-  sane.fs."/var/media/archive".dir = {};
-  sane.fs."/var/media/archive/temp".dir = {};
-  # this is file.text instead of symlink.text so that it may be read over a remote mount (where consumers might not have any /nix/store/.../README.md path)
-  sane.fs."/var/media/archive/temp/README.md".file.text = ''
-    this directory is for media i wish to remove from my library,
-    but keep for a short time in case i reverse my decision.
-    treat it like a system trash can.
-  '';
-  sane.fs."/var/media/Books".dir = {};
-  sane.fs."/var/media/Books/Audiobooks".dir = {};
-  sane.fs."/var/media/Books/Books".dir = {};
-  sane.fs."/var/media/Books/Visual".dir = {};
-  sane.fs."/var/media/collections".dir = {};
-  sane.fs."/var/media/freeleech".dir = {};
-  sane.fs."/var/media/Music".dir = {};
-  sane.fs."/var/media/Pictures".dir = {};
-  sane.fs."/var/media/Videos".dir = {};
-  sane.fs."/var/media/Videos/Film".dir = {};
-  sane.fs."/var/media/Videos/Shows".dir = {};
-  sane.fs."/var/media/Videos/Talks".dir = {};
-
-  systemd.services.dedupe-media = {
-    description = "transparently de-duplicate /var/media entries by using block-level hardlinks";
-    script = ''
-      ${lib.getExe' pkgs.util-linux "hardlink"} /var/media --reflink=always --ignore-time --verbose
-    '';
-  };
-  systemd.timers.dedupe-media = {
-    wantedBy = [ "multi-user.target" ];
-    timerConfig = {
-      OnStartupSec = "23min";
-      OnUnitActiveSec = "720min";
-    };
-  };
-}
-
--- a/hosts/by-name/servo/net/default.nix
+++ b/hosts/by-name/servo/net/default.nix
@@ -1,60 +0,0 @@
-# debugging:
-# - enable logs (shows handshake attempts)
-#   - `echo module wireguard +p | sane-sudo-redirect /sys/kernel/debug/dynamic_debug/control`
-#   - `sudo dmesg --follow`
-#     patterns: "Sending keepalive packet to peer NN (N.N.N.N:NNNNN)"
-#     patterns: "Sending handshake initiation to peer NN (N.N.N.N:NNNNN)"
-# - when wg-doof and wg-ovpns stop routing traffic, restart with:
-#   - `systemctl restart netns-doof-wg`
-# - handshaking:
-#   - `wg show` should *always* show "latest handshake: N", with N < 2 minutes ago.
-{ lib, ... }:
-let
-  portOpts = with lib; types.submodule {
-    options = {
-      visibleTo.ovpns = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          whether to forward inbound traffic on the OVPN vpn port to the corresponding localhost port.
-        '';
-      };
-      visibleTo.doof = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          whether to forward inbound traffic on the doofnet vpn port to the corresponding localhost port.
-        '';
-      };
-    };
-  };
-in
-{
-  options = with lib; {
-    sane.ports.ports = mkOption {
-      # add the `visibleTo.{doof,ovpns}` options
-      type = types.attrsOf portOpts;
-    };
-  };
-
-  imports = [
-    ./doof.nix
-    ./ovpn.nix
-    ./wg-home.nix
-  ];
-
-  config = {
-    networking.domain = "uninsane.org";
-    systemd.network.networks."50-eth0" = {
-      matchConfig.Name = "eth0";
-      networkConfig.Address = [
-        "205.201.63.12/32"
-        "10.78.79.51/22"
-      ];
-      networkConfig.DNS = [ "10.78.79.1" ];
-    };
-
-    sane.ports.openFirewall = true;
-    sane.ports.openUpnp = true;
-  };
-}
--- a/hosts/by-name/servo/net/doof.nix
+++ b/hosts/by-name/servo/net/doof.nix
@@ -1,27 +0,0 @@
-{ config, ... }:
-{
-  # tun-sea config
-  sane.dns.zones."uninsane.org".inet.A."doof.tunnel" = "205.201.63.12";
-  # sane.dns.zones."uninsane.org".inet.AAAA."doof.tunnel" = "2602:fce8:106::51";  #< TODO: enable IPv6 (i have /128)
-
-  # if the tunnel breaks, restart it manually:
-  # - `systemctl restart netns-doof.service`
-  sane.netns.doof = {
-    veth.initns.ipv4 = "10.0.2.5";
-    veth.netns.ipv4 = "10.0.2.6";
-    routeTable = 12;
-    # wg.port = 51821;
-    wg.privateKeyFile = config.sops.secrets.wg_doof_privkey.path;
-    wg.address.ipv4 = "205.201.63.12";
-    wg.peer.publicKey = "nuESyYEJ3YU0hTZZgAd7iHBz1ytWBVM5PjEL1VEoTkU=";
-    wg.peer.endpoint = "tun-sea.doof.net:53263";
-    # wg.peer.endpoint = "205.201.63.44:53263";
-  };
-
-  # inside doof, forward DNS requests back to the root machine
-  # this is fine: nothing inside the ns performs DNS except for wireguard,
-  # and we're not forwarding external DNS requests here
-  # XXX: ACTUALLY, CAN'T EASILY DO THAT BECAUSE HICKORY-DNS IS ALREADY USING PORT 53
-  # but that's ok, we don't really need DNS *inside* this namespace.
-  # sane.netns.doof.dns.ipv4 = config.sane.netns.doof.veth.netns.ipv4;
-}
--- a/hosts/by-name/servo/net/ovpn.nix
+++ b/hosts/by-name/servo/net/ovpn.nix
@@ -1,20 +0,0 @@
-{ config, ... }:
-{
-  sane.ovpn.addrV4 = "172.23.174.114";  #< this applies to the dynamic VPNs -- NOT the static VPN
-  # sane.ovpn.addrV6 = "fd00:0000:1337:cafe:1111:1111:8df3:14b0";
-
-  # OVPN CONFIG (https://www.ovpn.com):
-  # DOCS: https://nixos.wiki/wiki/WireGuard
-  sane.netns.ovpns = {
-    veth.initns.ipv4 = "10.0.1.5";
-    veth.netns.ipv4 = "10.0.1.6";
-    routeTable = 11;
-    dns.ipv4 = "46.227.67.134";  #< DNS requests inside the namespace are forwarded here
-    # wg.port = 51822;
-    wg.privateKeyFile = config.sops.secrets.wg_ovpns_privkey.path;
-    wg.address.ipv4 = "146.70.100.165";  #< IP address for my end of the VPN tunnel. for OVPN public IPv4, this is also the public IP address.
-    wg.peer.publicKey = "xc9p/lf2uLg6IGDh54E0Pbc6WI/J9caaByhwD4Uiu0Q=";  #< pubkey by which i can authenticate OVPN, varies per OVPN endpoint
-    wg.peer.endpoint = "vpn31.prd.losangeles.ovpn.com:9930";
-    # wg.peer.endpoint = "45.83.89.131:9930";
-  };
-}
--- a/hosts/by-name/servo/net/wg-home.nix
+++ b/hosts/by-name/servo/net/wg-home.nix
@@ -1,14 +0,0 @@
-{ config, ... }:
-{
-  sane.services.wg-home.enable = true;
-  sane.services.wg-home.visibleToWan = true;
-  sane.services.wg-home.forwardToWan = true;
-  sane.services.wg-home.routeThroughServo = false;
-  services.unbound.settings.server.interface = [
-    # provide DNS to my wireguard clients
-    config.sane.hosts.by-name."servo".wg-home.ip
-  ];
-  services.unbound.settings.server.access-control = [
-    "${config.sane.hosts.by-name."servo".wg-home.ip}/24 allow"
-  ];
-}
--- a/hosts/by-name/servo/services/bitmagnet.nix
+++ b/hosts/by-name/servo/services/bitmagnet.nix
@@ -1,70 +0,0 @@
-# bitmagnet is a DHT crawler. it discovers publicly reachable torrents and indexes:
-# - torrent's magnet URI
-# - torrent's name
-# - torrent's file list (the first 100 files, per torrent), including size and "type" (e.g. video)
-# - seeder/leecher counts
-# - torrent's size
-# it provides a web UI to query these, especially a search form.
-# data is stored in postgresql as `bitmagnet` db (`sudo -u bitmagnet psql`)
-# after 30 days of operation:
-# - 12m torrents discovered
-# - 77GB database size  => 6500B per torrent
-{ config, ... }:
-{
-  services.bitmagnet.enable = true;
-  sane.netns.ovpns.services = [ "bitmagnet" ];
-  sane.ports.ports."3334" = {
-    protocol = [ "tcp" "udp" ];
-    # visibleTo.ovpns = true;  #< not needed: it runs in the ovpns namespace
-    description = "colin-bitmagnet";
-  };
-
-  services.bitmagnet.settings = {
-    # dht_crawler.scaling_factor: how rapidly to crawl the DHT.
-    #   influences number of worker threads, buffer sizes, etc.
-    #   default: 10.
-    #   docs claim "diminishing returns" above 10, but seems weakly confident about that.
-    dht_crawler.scaling_factor = 64;
-    # http_server.local_address: `$addr:$port` to `listen` to.
-    # default is `:3333`, which listens on _all_ interfaces.
-    # the http server exposes unprotected admin endpoints though, so restrict to private interfaces:
-    http_server.local_address = "${config.sane.netns.ovpns.veth.netns.ipv4}:3333";
-    # tmdb.enabled: whether to query The Movie DataBase to resolve filename -> movie title.
-    #   default: true.
-    #   docs claim 1 query per second rate limit, unless you supply your own API key.
-    tmdb.enabled = false;
-  };
-
-  # bitmagnet web client
-  # protected by passwd because it exposes some mutation operations:
-  # - queuing "jobs"
-  # - deleting torrent infos (in bulk)
-  # it uses graphql for _everything_, so no easy way to disable just the mutations (and remove the password) AFAICT.
-  services.nginx.virtualHosts."bitmagnet.uninsane.org" = {
-    # basicAuth is cleartext user/pw, so FORCE this to happen over SSL
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://${config.sane.netns.ovpns.veth.netns.ipv4}:3333";
-      recommendedProxySettings = true;
-    };
-    basicAuthFile = config.sops.secrets.bitmagnet_passwd.path;
-  };
-  sops.secrets."bitmagnet_passwd" = {
-    owner = config.users.users.nginx.name;
-    mode = "0400";
-  };
-
-  sane.dns.zones."uninsane.org".inet.CNAME."bitmagnet" = "native";
-
-  systemd.services.bitmagnet = {
-    # hardening (systemd-analyze security bitmagnet). base nixos service is already partially hardened.
-    serviceConfig.CapabilityBoundingSet = "";
-    serviceConfig.SystemCallArchitectures = "native";
-    serviceConfig.PrivateDevices = true;
-    serviceConfig.PrivateUsers = true;
-    serviceConfig.ProtectProc = "invisible";
-    serviceConfig.ProcSubset = "pid";
-    serviceConfig.SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
-  };
-}
--- a/hosts/by-name/servo/services/coturn.nix
+++ b/hosts/by-name/servo/services/coturn.nix
@@ -1,143 +0,0 @@
-# TURN/STUN NAT traversal service
-# commonly used to establish realtime calls with prosody, or possibly matrix/synapse
-#
-# - <https://github.com/coturn/coturn/>
-# - `man turnserver`
-# - config docs: <https://github.com/coturn/coturn/blob/master/examples/etc/turnserver.conf>
-#
-# N.B. during operation it's NORMAL to see "error 401".
-# during session creation:
-# - client sends Allocate request
-# - server replies error 401, providing a realm and nonce
-# - client uses realm + nonce + shared secret to construct an auth key & call Allocate again
-# - server replies Allocate Success Response
-# - source: <https://stackoverflow.com/a/66643135>
-#
-# N.B. this safest implementation routes all traffic THROUGH A VPN
-# - that adds a lot of latency, but in practice turns out to be inconsequential.
-#   i guess ICE allows clients to prefer the other party's lower-latency server, in practice?
-# - still, this is the "safe" implementation because STUN works with IP addresses instead of domain names:
-#   1. client A queries the STUN server to determine its own IP address/port.
-#   2. client A tells client B which IP address/port client A is visible on.
-#   3. client B contacts that IP address/port
-#   this only works so long as the IP address/port which STUN server sees client A on is publicly routable.
-#   that is NOT the case when the STUN server and client A are on the same LAN
-#   even if client A contacts the STUN server via its WAN address with port reflection enabled.
-#   hence, there's no obvious way to put the STUN server on the same LAN as either client and expect the rest to work.
-# - there an old version which *half worked*, which is:
-#   - run the turn server in the root namespace.
-#   - bind the turn server to the veth connecting it to the VPN namespace (so it sends outgoing traffic to the right place).
-#   - NAT the turn port range from VPN into root namespace (so it receives incomming traffic).
-#   - this approach would fail the prosody conversations.im check, but i didn't notice *obvious* call routing errors.
-#
-# debugging:
-# - log messages like 'usage: realm=<turn.uninsane.org>, username=<1715915193>, rp=14, rb=1516, sp=8, sb=684'
-#   - rp = received packets
-#   - rb = received bytes
-#   - sp = sent packets
-#   - sb = sent bytes
-
-{ config, lib, ... }:
-let
-  # TURN port range (inclusive).
-  # default coturn behavior is to use the upper quarter of all ports. i.e. 49152 - 65535.
-  # i believe TURN allocations expire after either 5 or 10 minutes of inactivity.
-  turnPortLow = 49152; # 49152 = 0xc000
-  turnPortHigh = turnPortLow + 256;
-  turnPortRange = lib.range turnPortLow turnPortHigh;
-in
-{
-  # the port definitions are only needed if running in the root net namespace
-  # sane.ports.ports = lib.mkMerge ([
-  #   {
-  #     "3478" = {
-  #       # this is the "control" port.
-  #       # i.e. no client data is forwarded through it, but it's where clients request tunnels.
-  #       protocol = [ "tcp" "udp" ];
-  #       # visibleTo.lan = true;
-  #       # visibleTo.wan = true;
-  #       visibleTo.ovpns = true;  # forward traffic from the VPN to the root NS
-  #       description = "colin-stun-turn";
-  #     };
-  #     "5349" = {
-  #       # the other port 3478 also supports TLS/DTLS, but presumably clients wanting TLS will default 5349
-  #       protocol = [ "tcp" ];
-  #       # visibleTo.lan = true;
-  #       # visibleTo.wan = true;
-  #       visibleTo.ovpns = true;
-  #       description = "colin-stun-turn-over-tls";
-  #     };
-  #   }
-  # ] ++ (builtins.map
-  #   (port: {
-  #     "${builtins.toString port}" = let
-  #       count = port - turnPortLow + 1;
-  #       numPorts = turnPortHigh - turnPortLow + 1;
-  #     in {
-  #       protocol = [ "tcp" "udp" ];
-  #       # visibleTo.lan = true;
-  #       # visibleTo.wan = true;
-  #       visibleTo.ovpns = true;
-  #       description = "colin-turn-${builtins.toString count}-of-${builtins.toString numPorts}";
-  #     };
-  #   })
-  #   turnPortRange
-  # ));
-
-  services.nginx.virtualHosts."turn.uninsane.org" = {
-    # allow ACME to procure a cert via nginx for this domain
-    enableACME = true;
-  };
-  sane.dns.zones."uninsane.org".inet = {
-    # CNAME."turn" = "servo.wan";
-    # CNAME."turn" = "ovpns";
-    # CNAME."turn" = "native";
-    # XXX: SRV records have to point to something with a A/AAAA record; no CNAMEs
-    A."turn" = "%AOVPNS%";
-    # A."turn" = "%AWAN%";
-
-    SRV."_stun._udp" =                        "5 50 3478 turn";
-    SRV."_stun._tcp" =                        "5 50 3478 turn";
-    SRV."_stuns._tcp" =                       "5 50 5349 turn";
-    SRV."_turn._udp" =                        "5 50 3478 turn";
-    SRV."_turn._tcp" =                        "5 50 3478 turn";
-    SRV."_turns._tcp" =                       "5 50 5349 turn";
-  };
-
-  # provide access to certs
-  users.users.turnserver.extraGroups = [ "nginx" ];
-
-  services.coturn.enable = true;
-  services.coturn.realm = "turn.uninsane.org";
-  services.coturn.cert = "/var/lib/acme/turn.uninsane.org/fullchain.pem";
-  services.coturn.pkey = "/var/lib/acme/turn.uninsane.org/key.pem";
-
-  # N.B.: prosody needs to read this shared secret
-  sops.secrets."coturn_shared_secret".owner = "turnserver";
-  sops.secrets."coturn_shared_secret".group = "turnserver";
-  sops.secrets."coturn_shared_secret".mode = "0440";
-
-  #v disable to allow unauthenticated access (or set `services.coturn.no-auth = true`)
-  services.coturn.use-auth-secret = true;
-  services.coturn.static-auth-secret-file = "/run/secrets/coturn_shared_secret";
-  services.coturn.lt-cred-mech = true; #< XXX: use-auth-secret overrides lt-cred-mech
-
-  services.coturn.min-port = turnPortLow;
-  services.coturn.max-port = turnPortHigh;
-  # services.coturn.secure-stun = true;
-  services.coturn.extraConfig = lib.concatStringsSep "\n" [
-    "verbose"
-    # "Verbose"  #< even MORE verbosity than "verbose"  (it's TOO MUCH verbosity really)
-    "no-multicast-peers"  # disables sending to IPv4 broadcast addresses (e.g. 224.0.0.0/3)
-    # "listening-ip=${config.sane.netns.ovpns.veth.initns.ipv4}" "external-ip=${config.sane.netns.ovpns.wg.address.ipv4}"  #< 2024/04/25: works, if running in root namespace
-    "listening-ip=${config.sane.netns.ovpns.wg.address.ipv4}" "external-ip=${config.sane.netns.ovpns.wg.address.ipv4}"
-
-    # old attempts:
-    # "external-ip=${config.sane.netns.ovpns.wg.address.ipv4}/${config.sane.netns.ovpns.veth.initns.ipv4}"
-    # "listening-ip=10.78.79.51"  # can be specified multiple times; omit for *
-    # "external-ip=97.113.128.229/10.78.79.51"
-    # "external-ip=97.113.128.229"
-    # "mobility"  # "mobility with ICE (MICE) specs support" (?)
-  ];
-  systemd.services.coturn.serviceConfig.NetworkNamespacePath = "/run/netns/ovpns";
-}
--- a/hosts/by-name/servo/services/cryptocurrencies/bitcoin.nix
+++ b/hosts/by-name/servo/services/cryptocurrencies/bitcoin.nix
@@ -1,131 +0,0 @@
-# as of 2023/12/02: complete blockchain is 530 GiB (on-disk size may be larger)
-# as of 2025/08/06: on-disk blockchain as reported by `du` is 732 GiB
-#
-# ports:
-# - 8333: for node-to-node communications
-# - 8332: rpc (client-to-node)
-#
-# rpc setup:
-# - generate a password
-#   - use: <https://github.com/bitcoin/bitcoin/blob/master/share/rpcauth/rpcauth.py>
-#     (rpcauth.py is not included in the `'.#bitcoin'` package result)
-#   - `wget https://raw.githubusercontent.com/bitcoin/bitcoin/master/share/rpcauth/rpcauth.py`
-#   - `python ./rpcauth.py colin`
-#   - copy the hash here. it's SHA-256, so safe to be public.
-#   - add "rpcuser=colin" and "rpcpassword=<output>" to secrets/servo/bitcoin.conf  (i.e. ~/.bitcoin/bitcoin.conf)
-#     - bitcoin.conf docs: <https://github.com/bitcoin/bitcoin/blob/master/doc/bitcoin-conf.md>
-# - validate with `bitcoin-cli -netinfo`
-{ config, lib, pkgs, sane-lib, ... }:
-let
-  # bitcoind = config.sane.programs.bitcoind.packageUnwrapped;
-  bitcoind = pkgs.bitcoind;
-  # wrapper to run bitcoind with the tor onion address as externalip (computed at runtime)
-  _bitcoindWithExternalIp = pkgs.writeShellScriptBin "bitcoind" ''
-    set -xeu
-    externalip="$(cat /var/lib/tor/onion/bitcoind/hostname)"
-    exec ${lib.getExe' bitcoind "bitcoind"} "-externalip=$externalip" "$@"
-  '';
-  # the package i provide to services.bitcoind ends up on system PATH, and used by other tools like clightning.
-  # therefore, even though services.bitcoind only needs `bitcoind` binary, provide all the other bitcoin-related binaries (notably `bitcoin-cli`) as well:
-  bitcoindWithExternalIp = pkgs.symlinkJoin {
-    name = "bitcoind-with-external-ip";
-    paths = [ _bitcoindWithExternalIp bitcoind ];
-  };
-in
-{
-  sane.persist.sys.byStore.ext = [
-    { user = "bitcoind-mainnet"; group = "bitcoind-mainnet"; path = "/var/lib/bitcoind-mainnet"; method = "bind"; }
-  ];
-
-  # sane.ports.ports."8333" = {
-  #   # this allows other nodes and clients to download blocks from me.
-  #   protocol = [ "tcp" ];
-  #   visibleTo.wan = true;
-  #   description = "colin-bitcoin";
-  # };
-
-  services.tor.relay.onionServices.bitcoind = {
-    version = 3;
-    map = [{
-      # by default tor will route public tor port P to 127.0.0.1:P.
-      # so if this port is the same as clightning would natively use, then no further config is needed here.
-      # see: <https://2019.www.torproject.org/docs/tor-manual.html.en#HiddenServicePort>
-      port = 8333;
-      # target.port; target.addr;  #< set if tor port != clightning port
-    }];
-    # allow "tor" group (i.e. bitcoind-mainnet) to read /var/lib/tor/onion/bitcoind/hostname
-    settings.HiddenServiceDirGroupReadable = true;
-  };
-
-  services.bitcoind.mainnet = {
-    enable = true;
-    package = bitcoindWithExternalIp;
-    rpc.users.colin = {
-      # see docs at top of file for how to generate this
-      passwordHMAC = "30002c05d82daa210550e17a182db3f3$6071444151281e1aa8a2729f75e3e2d224e9d7cac3974810dab60e7c28ffaae4";
-    };
-    extraConfig = ''
-      # checkblocks: default 6: how many blocks to verify on start
-      checkblocks=3
-      # don't load the wallet, and disable wallet RPC calls
-      disablewallet=1
-      # proxy all outbound traffic through Tor
-      proxy=127.0.0.1:9050
-    '';
-    extraCmdlineOptions = [
-      # `man bitcoind` for options
-      # "-assumevalid=0"  # to perform script validation on all blocks, instead of just the latest checkpoint published by bitcoin-core
-      # "-debug"
-      # "-debug=estimatefee"
-      # "-debug=leveldb"
-      # "-debug=http"
-      # "-debug=net"
-      "-debug=proxy"
-      "-debug=rpc"
-      # "-debug=validation"
-      # "-reindex"  # wipe chainstate, block index, other indices; rebuild from blk*.dat (takes 2.5hrs)
-      # "-reindex-chainstate"  # wipe chainstate; rebuild from blk*.dat
-    ];
-  };
-
-  users.users.bitcoind-mainnet.extraGroups = [ "tor" ];
-
-  systemd.services.bitcoind-mainnet = {
-    after = [ "tor.service" ];
-    requires = [ "tor.service" ];
-    serviceConfig.RestartSec = "30s";  #< default is 0
-
-    # hardening (systemd-analyze security bitcoind-mainnet)
-    serviceConfig.StateDirectory = "bitcoind-mainnet";
-    serviceConfig.LockPersonality = true;
-    serviceConfig.MemoryDenyWriteExecute = "true";
-    serviceConfig.NoNewPrivileges = "true";
-    serviceConfig.PrivateDevices = "true";
-    serviceConfig.PrivateMounts = true;
-    serviceConfig.PrivateTmp = "true";
-    serviceConfig.PrivateUsers = true;
-    serviceConfig.ProcSubset = "pid";
-    serviceConfig.ProtectControlGroups = true;
-    serviceConfig.ProtectHome = true;
-    serviceConfig.ProtectHostname = true;
-    serviceConfig.ProtectKernelLogs = true;
-    serviceConfig.ProtectKernelModules = true;
-    serviceConfig.ProtectKernelTunables = true;
-    serviceConfig.ProtectProc = "invisible";
-    serviceConfig.ProtectSystem = lib.mkForce "strict";
-    serviceConfig.RemoveIPC = true;
-    serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-    serviceConfig.RestrictNamespaces = true;
-    serviceConfig.RestrictSUIDSGID = true;
-    serviceConfig.SystemCallArchitectures = "native";
-    serviceConfig.SystemCallFilter = [ "@system-service" ];
-  };
-
-  sops.secrets."bitcoin.conf" = {
-    mode = "0600";
-    owner = "colin";
-    group = "users";
-  };
-
-  sane.programs.bitcoin-cli.enableFor.user.colin = true;  # for debugging/administration: `bitcoin-cli`
-}
--- a/hosts/by-name/servo/services/cryptocurrencies/clightning.nix
+++ b/hosts/by-name/servo/services/cryptocurrencies/clightning.nix
@@ -1,147 +0,0 @@
-# clightning is an implementation of Bitcoin's Lightning Network.
-# as such, this assumes that `services.bitcoin` is enabled.
-# docs:
-# - tor clightning config: <https://docs.corelightning.org/docs/tor>
-# - `lightning-cli` and subcommands: <https://docs.corelightning.org/reference/lightning-cli>
-# - `man lightningd-config`
-#
-# management/setup/use:
-# - guide: <https://github.com/ElementsProject/lightning>
-#
-# debugging:
-# - `lightning-cli getlog debug`
-# - `lightning-cli listpays`  -> show payments this node sent
-# - `lightning-cli listinvoices`  -> show payments this node received
-#
-# first, acquire peers:
-# - `lightning-cli connect id@host`
-#   where `id` is the node's pubkey, and `host` is perhaps an ip:port tuple, or a hash.onion:port tuple.
-#   for testing, choose any node listed on <https://1ml.com>
-# - `lightning-cli listpeers`
-#   should show the new peer, with `connected: true`
-#
-# then, fund the clightning wallet
-# - `lightning-cli newaddr`
-#
-# then, open channels
-# - `lightning-cli connect ...`
-# - `lightning-cli fundchannel <node_id> <amount_in_satoshis>`
-#
-# who to federate with?
-# - a lot of the larger nodes allow hands-free channel creation
-#   - either inbound or outbound, sometimes paid
-# - find nodes on:
-#   - <https://terminal.lightning.engineering/>
-#   - <https://1ml.com>
-#     - tor nodes: <https://1ml.com/node?order=capacity&iponionservice=true>
-#   - <https://lightningnetwork.plus>
-#   - <https://mempool.space/lightning>
-#   - <https://amboss.space>
-# - a few tor-capable nodes which allow channel creation:
-#   - <https://c-otto.de/>
-#   - <https://cyberdyne.sh/>
-#   - <https://yalls.org/about/>
-#   - <https://coincept.com/>
-# - more resources: <https://www.lopp.net/lightning-information.html>
-#   - node routability: https://hashxp.org/lightning/node/<id>
-# - especially, acquire inbound liquidity via lightningnetwork.plus's swap feature
-#   - most of the opportunities are gated behind a minimum connection or capacity requirement
-#
-# tune payment parameters
-# - `lightning-cli setchannel <id> [feebase] [feeppm] [htlcmin] [htlcmax] [enforcedelay] [ignorefeelimits]`
-#   - e.g. `lightning-cli setchannel all 0 10`
-#   - it's suggested that feebase=0 simplifies routing.
-#
-# teardown:
-# - `lightning-cli withdraw <bc1... dest addr> <amount in satoshis> [feerate]`
-#
-# sanity:
-# - `lightning-cli listfunds`
-#
-# to receive a payment (do as `clightning` user):
-# - `lightning-cli invoice <amount in millisatoshi> <label> <description>`
-#   - specify amount as `any` if undetermined
-#   - then give the resulting bolt11 URI to the payer
-# to send a payment:
-# - `lightning-cli pay <bolt11 URI>`
-#   - or `lightning-cli pay <bolt11 URI> [amount_msat] [label] [riskfactor] [maxfeepercent] ...`
-#   - amount_msat must be "null" if the bolt11 URI specifies a value
-#   - riskfactor defaults to 10
-#   - maxfeepercent defaults to 0.5
-#   - label is a human-friendly label for my records
-
-{ config, pkgs, ... }:
-{
-  sane.persist.sys.byStore.private = [
-    # clightning takes up only a few MB. but then several hundred MB of crash logs that i should probably GC.
-    { user = "clightning"; group = "clightning"; mode = "0710"; path = "/var/lib/clightning"; method = "bind"; }
-  ];
-
-  # see bitcoin.nix for how to generate this
-  services.bitcoind.mainnet.rpc.users.clightning.passwordHMAC =
-    "befcb82d9821049164db5217beb85439$2c31ac7db3124612e43893ae13b9527dbe464ab2d992e814602e7cb07dc28985";
-
-  sane.services.clightning.enable = true;
-  sane.services.clightning.proxy = "127.0.0.1:9050";  # proxy outgoing traffic through tor
-  # sane.services.clightning.publicAddress = "statictor:127.0.0.1:9051";
-  sane.services.clightning.getPublicAddressCmd = "cat /var/lib/tor/onion/clightning/hostname";
-
-  services.tor.relay.onionServices.clightning = {
-    version = 3;
-    map = [{
-      # by default tor will route public tor port P to 127.0.0.1:P.
-      # so if this port is the same as clightning would natively use, then no further config is needed here.
-      # see: <https://2019.www.torproject.org/docs/tor-manual.html.en#HiddenServicePort>
-      port = 9735;
-      # target.port; target.addr;  #< set if tor port != clightning port
-    }];
-    # allow "tor" group (i.e. clightning) to read /var/lib/tor/onion/clightning/hostname
-    settings.HiddenServiceDirGroupReadable = true;
-  };
-
-  # must be in "tor" group to read /var/lib/tor/onion/*/hostname
-  users.users.clightning.extraGroups = [ "tor" ];
-
-  systemd.services.clightning.after = [ "tor.service" ];
-  systemd.services.clightning.requires = [ "tor.service" ];
-
-  # lightning-config contains fields from here:
-  # - <https://docs.corelightning.org/docs/configuration>
-  # secret config includes:
-  # - bitcoin-rpcpassword
-  # - alias=nodename
-  # - rgb=rrggbb
-  # - fee-base=<millisatoshi>
-  # - fee-per-satoshi=<ppm>
-  # - feature configs (i.e. experimental-xyz options)
-  sane.services.clightning.extraConfig = ''
-    # log levels: "io", "trace", "debug", "info", "unusual", "broken"
-    # log-level=info
-    # log-level=info:lightningd
-    # log-level=debug:lightningd
-    log-level=debug
-    # log-level=io
-
-    disable-plugin=cln-xpay
-
-    # let me use `lightning-cli dev-*` subcommands, fucktards.
-    developer
-    # `developer` enables `dev-*` but *disables* the older commands. asshats.
-    allow-deprecated-apis=true
-
-    # peerswap:
-    # - config example: <https://github.com/fort-nix/nix-bitcoin/pull/462/files#diff-b357d832705b8ce8df1f41934d613f79adb77c4cd5cd9e9eb12a163fca3e16c6>
-    # XXX: peerswap crashes clightning on launch. stacktrace is useless.
-    # plugin={lib.getExe' pkgs.peerswap "peerswap"}
-    # peerswap-db-path=/var/lib/clightning/peerswap/swaps
-    # peerswap-policy-path=...
-  '';
-  sane.services.clightning.extraConfigFiles = [ config.sops.secrets."lightning-config".path ];
-  sops.secrets."lightning-config" = {
-    mode = "0640";
-    owner = "clightning";
-    group = "clightning";
-  };
-
-  sane.programs.lightning-cli.enableFor.user.colin = true;  # for debugging/admin:
-}
--- a/hosts/by-name/servo/services/cryptocurrencies/default.nix
+++ b/hosts/by-name/servo/services/cryptocurrencies/default.nix
@@ -1,10 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./bitcoin.nix
-    ./clightning.nix
-    ./i2p.nix
-    ./monero.nix
-    ./tor.nix
-  ];
-}
--- a/hosts/by-name/servo/services/cryptocurrencies/i2p.nix
+++ b/hosts/by-name/servo/services/cryptocurrencies/i2p.nix
@@ -1,5 +0,0 @@
-{ lib, ... }:
-lib.mkIf false  #< 2024/07/27: i don't use it, too much surface-area for me to run it pro-bono (`systemd-analyze security monero`)
-{
-  services.i2p.enable = true;
-}
--- a/hosts/by-name/servo/services/cryptocurrencies/monero.nix
+++ b/hosts/by-name/servo/services/cryptocurrencies/monero.nix
@@ -1,32 +0,0 @@
-# as of 2023/11/26: complete downloaded blockchain should be 200GiB on disk, give or take.
-{ lib, ... }:
-lib.mkIf false  #< 2024/07/27: i don't use it, too much surface-area for me to run it pro-bono (`systemd-analyze security monero`)
-{
-  sane.persist.sys.byStore.ext = [
-    # /var/lib/monero/lmdb is what consumes most of the space
-    { user = "monero"; group = "monero"; path = "/var/lib/monero"; method = "bind"; }
-  ];
-
-  services.monero.enable = true;
-  services.monero.limits.upload = 5000;  # in kB/s
-  services.monero.extraConfig = ''
-    # see: monero doc/ANONYMITY_NETWORKS.md
-    #
-    # "If any anonymity network is enabled, transactions being broadcast that lack a valid 'context'
-    # (i.e. the transaction did not come from a P2P connection) will only be sent to peers on anonymity networks."
-    #
-    # i think this means that setting tx-proxy here ensures any transactions sent locally to my node (via RPC)
-    # will be sent over an anonymity network.
-    tx-proxy=i2p,127.0.0.1:9000
-    tx-proxy=tor,127.0.0.1:9050
-  '';
-
-  # monero ports: <https://monero.stackexchange.com/questions/604/what-ports-does-monero-use-rpc-p2p-etc>
-  # - 18080 = "P2P" monero node <-> monero node connections
-  # - 18081 = "RPC" monero client -> monero node connections
-  sane.ports.ports."18080" = {
-    protocol = [ "tcp" ];
-    visibleTo.wan = true;
-    description = "colin-monero-p2p";
-  };
-}
--- a/hosts/by-name/servo/services/cryptocurrencies/tor.nix
+++ b/hosts/by-name/servo/services/cryptocurrencies/tor.nix
@@ -1,25 +0,0 @@
-# tor settings: <https://2019.www.torproject.org/docs/tor-manual.html.en>
-{ lib, ... }:
-{
-  sane.persist.sys.byStore.ephemeral = [
-    # N.B.: tor hidden service hostnames aren't deterministic, so if you need them
-    # to be preserved across reboots then persist /var/lib/tor/onion in "private" store.
-   { user = "tor"; group = "tor"; mode = "0710"; path = "/var/lib/tor"; method = "bind"; }
-  ];
-
-  # tor: `tor.enable` doesn't start a relay, exit node, proxy, etc. it's minimal.
-  # tor.client.enable configures a torsocks proxy, accessible *only* to localhost.
-  #   at 127.0.0.1:9050
-  services.tor.enable = true;
-  services.tor.client.enable = true;
-
-  # in order for services to read /var/lib/tor/onion/*/hostname, they must be able to traverse /var/lib/tor,
-  # and /var/lib/tor must have g+x.
-  # DataDirectoryGroupReadable causes tor to use g+rx, technically more than we need, but all the files are 600 so it's fine.
-  services.tor.settings.DataDirectoryGroupReadable = true;
-  # StateDirectoryMode defaults to 0700, and thereby prevents the onion hostnames from being group readable
-  systemd.services.tor.serviceConfig.StateDirectoryMode = lib.mkForce "0710";
-  users.users.tor.homeMode = "0710";  # home mode defaults to 0700, causing readability problems, enforced by nixos "users" activation script
-
-  services.tor.settings.SafeLogging = false;  # show actual .onion names in the syslog, else debugging is impossible
-}
--- a/hosts/by-name/servo/services/default.nix
+++ b/hosts/by-name/servo/services/default.nix
@@ -1,36 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./bitmagnet.nix
-    ./coturn.nix
-    ./cryptocurrencies
-    ./email
-    ./ejabberd.nix
-    ./freshrss.nix
-    ./export
-    ./hickory-dns.nix
-    ./gerbera.nix
-    ./gitea.nix
-    ./goaccess.nix
-    ./ipfs.nix
-    ./jackett
-    ./jellyfin
-    ./kiwix-serve.nix
-    ./komga.nix
-    ./lemmy.nix
-    ./matrix
-    ./minidlna.nix
-    ./mumble.nix
-    ./navidrome.nix
-    ./nginx
-    ./nixos-prebuild.nix
-    ./ntfy
-    ./pict-rs.nix
-    ./pleroma.nix
-    ./postgresql
-    ./prosody
-    ./slskd.nix
-    ./transmission
-    ./wikipedia.nix
-  ];
-}
--- a/hosts/by-name/servo/services/ejabberd.nix
+++ b/hosts/by-name/servo/services/ejabberd.nix
@@ -1,470 +0,0 @@
-# docs:
-# - <https://docs.ejabberd.im/admin/configuration/basic>
-# example configs:
-# - <https://github.com/vkleen/machines/blob/138a2586ce185d7cf201d4e1fe898c83c4af52eb/hosts/europium/ejabberd.nix>
-# - <https://github.com/Mic92/stockholm/blob/675ef0088624c9de1cb531f318446316884a9d3d/tv/3modules/ejabberd/default.nix>
-# - <https://github.com/buffet/tararice/blob/master/programs/ejabberd.nix>
-#   - enables STUN and TURN
-#   - only over UDP 3478, not firewall-forwarding any TURN port range
-#   - uses stun_disco module (but with no options)
-# - <https://github.com/leo60228/dotfiles/blob/39b3abba3009bdc31413d4757ca2f882a33eec8b/files/ejabberd.yml>
-# - <https://github.com/Mic92/dotfiles/blob/ddf0f4821f554f7667fc803344657367c55fb9e6/nixos/eve/modules/ejabberd.nix>
-# - <nixpkgs:nixos/tests/xmpp/ejabberd.nix>
-# - 2013: <https://github.com/processone/ejabberd/blob/master/ejabberd.yml.example>
-#
-# compliance tests:
-# - <https://compliance.conversations.im/server/uninsane.org/#xep0352>
-#
-# administration:
-# - `sudo -u ejabberd ejabberdctl help`
-#
-# federation/support matrix:
-# - avatars
-#   - nixnet.services + dino: works in MUCs but not DMs  (as of 2023 H1)
-#   - movim.eu + dino: works in DMs, MUCs untested  (as of 2023/08/29)
-# - calls
-#   - local + dino: audio, video, works in DMs  (as of 2023/08/29)
-#   - movim.eu + dino: audio, video, works in DMs, no matter which side initiates  (as of 2023/08/30)
-#   - +native-cell-number@cheogram.com + dino: audio works in DMs, no matter which side initiates  (as of 2023/09/01)
-#     - can receive calls even if sender isn't in my roster
-#     - this is presumably using JMP.chat's SIP servers, which then convert it to XMPP call
-#
-# bugs:
-# - 2023/09/01: will randomly stop federating. `systemctl restart ejabberd` fixes, but takes 10 minutes.
-{ config, lib, pkgs, ... }:
-
-let
-  # TODO: this range could be larger, but right now that's costly because each element is its own UPnP forward
-  # TURN port range (inclusive)
-  turnPortLow = 49152;
-  turnPortHigh = 49167;
-  turnPortRange = lib.range turnPortLow turnPortHigh;
-in
-# XXX(2023/10/15): disabled in favor of Prosody.
-# everything configured below was fine: used ejabberd for several months.
-lib.mkIf false
-{
-  sane.persist.sys.byStore.private = [
-    { user = "ejabberd"; group = "ejabberd"; path = "/var/lib/ejabberd"; method = "bind"; }
-  ];
-  sane.ports.ports = lib.mkMerge ([
-    {
-      "3478" = {
-        protocol = [ "tcp" "udp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-xmpp-stun-turn";
-      };
-      "5222" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-xmpp-client-to-server";
-      };
-      "5223" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-xmpps-client-to-server";  # XMPP over TLS
-      };
-      "5269" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        description = "colin-xmpp-server-to-server";
-      };
-      "5270" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        description = "colin-xmpps-server-to-server";  # XMPP over TLS
-      };
-      "5280" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-xmpp-bosh";
-      };
-      "5281" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-xmpp-bosh-https";
-      };
-      "5349" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-xmpp-stun-turn-over-tls";
-      };
-      "5443" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-xmpp-web-services";  # file uploads, websockets, admin
-      };
-    }
-  ] ++ (builtins.map
-    (port: {
-      "${builtins.toString port}" = let
-        count = port - turnPortLow + 1;
-        numPorts = turnPortHigh - turnPortLow + 1;
-      in {
-        protocol = [ "tcp" "udp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-xmpp-turn-${builtins.toString count}-of-${builtins.toString numPorts}";
-      };
-    })
-    turnPortRange
-  ));
-
-  # this ejabberd config uses builtin STUN/TURN server, so hack to ensure no other implementation fights for ports
-  services.coturn.enable = false;
-
-  # provide access to certs
-  # TODO: this should just be `acme`. then we also add nginx to the `acme` group.
-  #   why is /var/lib/acme/* owned by `nginx` group??
-  users.users.ejabberd.extraGroups = [ "nginx" ];
-
-  security.acme.certs."uninsane.org".extraDomainNames = [
-    "xmpp.uninsane.org"
-    "muc.xmpp.uninsane.org"
-    "pubsub.xmpp.uninsane.org"
-    "upload.xmpp.uninsane.org"
-    "vjid.xmpp.uninsane.org"
-  ];
-
-  # exists so the XMPP server's cert can obtain altNames for all its resources
-  services.nginx.virtualHosts."xmpp.uninsane.org" = {
-    useACMEHost = "uninsane.org";
-  };
-  services.nginx.virtualHosts."muc.xmpp.uninsane.org" = {
-    useACMEHost = "uninsane.org";
-  };
-  services.nginx.virtualHosts."pubsub.xmpp.uninsane.org" = {
-    useACMEHost = "uninsane.org";
-  };
-  services.nginx.virtualHosts."upload.xmpp.uninsane.org" = {
-    useACMEHost = "uninsane.org";
-  };
-  services.nginx.virtualHosts."vjid.xmpp.uninsane.org" = {
-    useACMEHost = "uninsane.org";
-  };
-
-  sane.dns.zones."uninsane.org".inet = {
-    # XXX: SRV records have to point to something with a A/AAAA record; no CNAMEs
-    A."xmpp" =                "%ANATIVE%";
-    CNAME."muc.xmpp" =        "xmpp";
-    CNAME."pubsub.xmpp" =     "xmpp";
-    CNAME."upload.xmpp" =     "xmpp";
-    CNAME."vjid.xmpp" =       "xmpp";
-
-    # _Service._Proto.Name    TTL Class SRV    Priority Weight Port Target
-    # - <https://xmpp.org/extensions/xep-0368.html>
-    # something's requesting the SRV records for muc.xmpp, so let's include it
-    # nothing seems to request XMPP SRVs for the other records (except @)
-    # lower numerical priority field tells clients to prefer this method
-    SRV."_xmpps-client._tcp.muc.xmpp" =       "3 50 5223 xmpp";
-    SRV."_xmpps-server._tcp.muc.xmpp" =       "3 50 5270 xmpp";
-    SRV."_xmpp-client._tcp.muc.xmpp" =        "5 50 5222 xmpp";
-    SRV."_xmpp-server._tcp.muc.xmpp" =        "5 50 5269 xmpp";
-
-    SRV."_xmpps-client._tcp" =                "3 50 5223 xmpp";
-    SRV."_xmpps-server._tcp" =                "3 50 5270 xmpp";
-    SRV."_xmpp-client._tcp" =                 "5 50 5222 xmpp";
-    SRV."_xmpp-server._tcp" =                 "5 50 5269 xmpp";
-
-    SRV."_stun._udp" =                        "5 50 3478 xmpp";
-    SRV."_stun._tcp" =                        "5 50 3478 xmpp";
-    SRV."_stuns._tcp" =                       "5 50 5349 xmpp";
-    SRV."_turn._udp" =                        "5 50 3478 xmpp";
-    SRV."_turn._tcp" =                        "5 50 3478 xmpp";
-    SRV."_turns._tcp" =                       "5 50 5349 xmpp";
-  };
-
-  # TODO: allocate UIDs/GIDs ?
-  services.ejabberd.enable = true;
-  services.ejabberd.configFile = "/var/lib/ejabberd/ejabberd.yaml";
-  systemd.services.ejabberd.preStart = let
-    config-in = pkgs.writeText "ejabberd.yaml.in" (lib.generators.toYAML {} {
-      hosts = [ "uninsane.org" ];
-      # none | emergency | alert | critical | error | warning | notice | info | debug
-      loglevel = "debug";
-      acme.auto = false;
-      certfiles = [ "/var/lib/acme/uninsane.org/full.pem" ];
-      # ca_file = "${pkgs.cacert.unbundled}/etc/ssl/certs/";
-      # ca_file = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-
-      pam_userinfotype = "jid";
-      acl = {
-        admin.user = [ "colin@uninsane.org" ];
-        local.user_regexp = "";
-        loopback.ip = [ "127.0.0.0/8" "::1/128" ];
-      };
-
-      access_rules = {
-        local.allow = "local";
-        c2s_access.allow = "all";
-        announce.allow = "admin";
-        configure.allow = "admin";
-        muc_create.allow = "local";
-        pubsub_createnode_access.allow = "all";
-        trusted_network.allow = "loopback";
-      };
-
-      # docs: <https://docs.ejabberd.im/admin/configuration/basic/#shaper-rules>
-      shaper_rules = {
-        # setting this to above 1 may break outgoing messages
-        # - maybe some servers rate limit? or just don't understand simultaneous connections?
-        max_s2s_connections = 1;
-        max_user_sessions = 10;
-        max_user_offline_messages = 5000;
-        c2s_shaper.fast = "all";
-        s2s_shaper.med = "all";
-      };
-
-      # docs: <https://docs.ejabberd.im/admin/configuration/basic/#shapers>
-      # this limits the bytes/sec.
-      # for example, burst: 3_000_000 and rate: 100_000 means:
-      # - each client has a BW budget that accumulates 100kB/sec and is capped at 3 MB
-      shaper.fast = 1000000;
-      shaper.med  =  500000;
-      # shaper.fast.rate       =  1000000;
-      # shaper.fast.burst_size = 10000000;
-      # shaper.med.rate        =   500000;
-      # shaper.med.burst_size  =  5000000;
-
-      # see: <https://docs.ejabberd.im/admin/configuration/listen/>
-      # s2s_use_starttls = true;
-      s2s_use_starttls = "optional";
-      # lessens 504: remote-server-timeout errors
-      # see: <https://github.com/processone/ejabberd/issues/3105#issuecomment-562182967>
-      negotiation_timeout = 60;
-
-      listen = [
-        {
-          port = 5222;
-          module = "ejabberd_c2s";
-          shaper = "c2s_shaper";
-          starttls = true;
-          access = "c2s_access";
-        }
-        {
-          port = 5223;
-          module = "ejabberd_c2s";
-          shaper = "c2s_shaper";
-          tls = true;
-          access = "c2s_access";
-        }
-        {
-          port = 5269;
-          module = "ejabberd_s2s_in";
-          shaper = "s2s_shaper";
-        }
-        {
-          port = 5270;
-          module = "ejabberd_s2s_in";
-          shaper = "s2s_shaper";
-          tls = true;
-        }
-        {
-          port = 5443;
-          module = "ejabberd_http";
-          tls = true;
-          request_handlers = {
-            "/admin" = "ejabberd_web_admin";  # TODO: ensure this actually works
-            "/api" = "mod_http_api";  # ejabberd API endpoint (to control server)
-            "/bosh" = "mod_bosh";
-            "/upload" = "mod_http_upload";
-            "/ws" = "ejabberd_http_ws";
-            # "/.well-known/host-meta" = "mod_host_meta";
-            # "/.well-known/host-meta.json" = "mod_host_meta";
-          };
-        }
-        {
-          # STUN+TURN TCP
-          # note that the full port range should be forwarded ("not NAT'd")
-          # `use_turn=true` enables both TURN *and* STUN
-          port = 3478;
-          module = "ejabberd_stun";
-          transport = "tcp";
-          use_turn = true;
-          turn_min_port = turnPortLow;
-          turn_max_port = turnPortHigh;
-          turn_ipv4_address = "%ANATIVE%";
-        }
-        {
-          # STUN+TURN UDP
-          port = 3478;
-          module = "ejabberd_stun";
-          transport = "udp";
-          use_turn = true;
-          turn_min_port = turnPortLow;
-          turn_max_port = turnPortHigh;
-          turn_ipv4_address = "%ANATIVE%";
-        }
-        {
-          # STUN+TURN TLS over TCP
-          port = 5349;
-          module = "ejabberd_stun";
-          transport = "tcp";
-          tls = true;
-          certfile = "/var/lib/acme/uninsane.org/full.pem";
-          use_turn = true;
-          turn_min_port = turnPortLow;
-          turn_max_port = turnPortHigh;
-          turn_ipv4_address = "%ANATIVE%";
-        }
-      ];
-
-      # TODO: enable mod_fail2ban
-      # TODO(low): look into mod_http_fileserver for serving macros?
-      modules = {
-        # mod_adhoc = {};
-        # mod_announce = {
-        #   access = "admin";
-        # };
-        # allows users to set avatars in vCard
-        # - <https://docs.ejabberd.im/admin/configuration/modules/#mod-avatar>
-        mod_avatar = {};
-        mod_caps = {};  # for mod_pubsub
-        mod_carboncopy = {};  # allows multiple clients to receive a user's message
-        # queues messages when recipient is offline, including PEP and presence messages.
-        # compliance test suggests this be enabled
-        mod_client_state = {};
-
-        # mod_conversejs: TODO: enable once on 21.12
-        # allows clients like Dino to discover where to upload files
-        mod_disco.server_info = [
-          {
-            modules = "all";
-            name = "abuse-addresses";
-            urls = [
-              "mailto:admin.xmpp@uninsane.org"
-              "xmpp:colin@uninsane.org"
-            ];
-          }
-          {
-            modules = "all";
-            name = "admin-addresses";
-            urls = [
-              "mailto:admin.xmpp@uninsane.org"
-              "xmpp:colin@uninsane.org"
-            ];
-          }
-        ];
-        mod_http_upload = {
-          host = "upload.xmpp.uninsane.org";
-          hosts = [ "upload.xmpp.uninsane.org" ];
-          put_url = "https://@HOST@:5443/upload";
-          dir_mode = "0750";
-          file_mode = "0750";
-          rm_on_unregister = false;
-        };
-        # allow discoverability of BOSH and websocket endpoints
-        # TODO: enable once on ejabberd 22.05  (presently 21.04)
-        # mod_host_meta = {};
-        mod_jidprep = {};  # probably not needed: lets clients normalize jids
-        mod_last = {};  # allow other users to know when i was last online
-        mod_mam = {
-          # Mnesia is limited to 2GB, better to use an SQL backend
-          # For small servers SQLite is a good fit and is very easy
-          # to configure. Uncomment this when you have SQL configured:
-          # db_type: sql
-          assume_mam_usage = true;
-          default = "always";
-        };
-        mod_muc = {
-          access = [ "allow" ];
-          access_admin = { allow = "admin"; };
-          access_create = "muc_create";
-          access_persistent = "muc_create";
-          access_mam = [ "allow" ];
-          history_size = 100;  # messages to show new participants
-          host = "muc.xmpp.uninsane.org";
-          hosts = [ "muc.xmpp.uninsane.org" ];
-          default_room_options = {
-            anonymous = false;
-            lang = "en";
-            persistent = true;
-            mam = true;
-          };
-        };
-        mod_muc_admin = {};
-        mod_offline = {
-          # store messages for a user when they're offline (TODO: understand multi-client workflow?)
-          access_max_user_messages = "max_user_offline_messages";
-          store_groupchat = true;
-        };
-        mod_ping = {};
-        mod_privacy = {};  # deprecated, but required for `ejabberctl export_piefxis`
-        mod_private = {};  # allow local clients to persist arbitrary data on my server
-        # push notifications to services integrated with e.g. Apple/Android.
-        # default is for a maximum amount of PII to be withheld, since these push notifs
-        # generally traverse 3rd party services. can opt to include message body, etc, though.
-        mod_push = {};
-        # i don't fully understand what this does, but it seems aimed at making push notifs more reliable.
-        mod_push_keepalive = {};
-        mod_roster = {
-          versioning = true;
-        };
-        # docs: <https://docs.ejabberd.im/admin/configuration/modules/#mod-s2s-dialback>
-        # s2s dialback to verify inbound messages
-        # unclear to what degree the XMPP network requires this
-        mod_s2s_dialback = {};
-        mod_shared_roster = {};  # creates groups for @all, @online, and anything manually administered?
-        mod_stream_mgmt = {
-          # resend undelivered messages if the origin client is offline
-          resend_on_timeout = "if_offline";
-        };
-        # fallback for when DNS-based STUN discovery is unsupported.
-        # - see: <https://xmpp.org/extensions/xep-0215.html>
-        # docs: <https://docs.ejabberd.im/admin/configuration/modules/#mod-stun-disco>
-        # people say to just keep this defaulted (i guess ejabberd knows to return its `host` option of uninsane.org?)
-        mod_stun_disco = {};
-        # docs: <https://docs.ejabberd.im/admin/configuration/modules/#mod-vcard>
-        mod_vcard = {
-          allow_return_all = true;  # all users are discoverable (?)
-          host = "vjid.xmpp.uninsane.org";
-          hosts = [ "vjid.xmpp.uninsane.org" ];
-          search = true;
-        };
-        mod_vcard_xupdate = {};  # needed for avatars
-        # docs: <https://docs.ejabberd.im/admin/configuration/modules/#mod-pubsub>
-        mod_pubsub = {
-          #^ needed for avatars
-          access_createnode = "pubsub_createnode_access";
-          host = "pubsub.xmpp.uninsane.org";
-          hosts = [ "pubsub.xmpp.uninsane.org" ];
-          ignore_pep_from_offline = false;
-          last_item_cache = true;
-          plugins = [
-            "pep"
-            "flat"
-          ];
-          force_node_config = {
-            # ensure client bookmarks are private
-            "storage:bookmarks:" = {
-              "access_model" = "whitelist";
-            };
-            "urn:xmpp:avatar:data" = {
-              "access_model" = "open";
-            };
-            "urn:xmpp:avatar:metadata" = {
-              "access_model" = "open";
-            };
-          };
-        };
-        mod_version = {};
-      };
-    });
-  in ''
-    ip=$(cat '${config.sane.services.dyn-dns.ipPath}')
-    # config is 444 (not 644), so we want to write out-of-place and then atomically move
-    # TODO: factor this out into `sane-woop` helper?
-    rm -f /var/lib/ejabberd/ejabberd.yaml.new
-    ${lib.getExe pkgs.gnused} "s/%ANATIVE%/$ip/g" ${config-in} > /var/lib/ejabberd/ejabberd.yaml.new
-    mv /var/lib/ejabberd/ejabberd.yaml{.new,}
-  '';
-
-  sane.services.dyn-dns.restartOnChange = [ "ejabberd.service" ];
-}
--- a/hosts/by-name/servo/services/email/default.nix
+++ b/hosts/by-name/servo/services/email/default.nix
@@ -1,44 +0,0 @@
-# nix configs to reference:
-# - <https://gitlab.com/simple-nixos-mailserver/nixos-mailserver>
-# - <https://github.com/nix-community/nur-combined/-/tree/master/repos/eh5/machines/srv-m/mail-rspamd.nix>
-#   - postfix / dovecot / rspamd / stalwart-jmap / sogo
-#
-# rspamd:
-# - nixos: <https://nixos.wiki/wiki/Rspamd>
-# - guide: <https://rspamd.com/doc/quickstart.html>
-# - non-nixos example: <https://dataswamp.org/~solene/2021-07-13-smtpd-rspamd.html>
-#
-#
-# my rough understanding of the pieces:
-# - postfix handles SMTP protocol with the rest of the world.
-# - dovecot implements IMAP protocol.
-#   - client auth (i.e. validate that user@uninsane.org is who they claim)
-#   - "folders" (INBOX, JUNK) are internal to dovecot?
-#     or where do folders live, on-disk?
-#
-# - non-local clients (i.e. me) interact with BOTH postfix and dovecot, but primarily dovecot:
-#   - mail reading is done via IMAP (so, dovecot)
-#   - mail sending is done via SMTP/submission port (so, postfix)
-#     - but postfix delegates authorization of that outgoing mail to dovecot, on the server side
-#
-# - local clients (i.e. sendmail) interact only with postfix
-#
-# debugging: general connectivity issues
-# - test that inbound port 25 is unblocked:
-#   - `curl https://canyouseeme.org/ --data 'port=25&IP=$MX_IP' | grep 'see your service'`
-#     - and retry with port 465, 587
-#     - i think this API requires the queried IP match the source IP
-#   - if necessary, `systemctl stop postfix` and `sudo nc -l $MX_IP 25`, then try https://canyouseeme.org
-
-{ ... }:
-{
-  imports = [
-    ./dovecot.nix
-    ./postfix.nix
-  ];
-
-
-  #### SPAM FILTERING
-  # services.rspamd.enable = true;
-  # services.rspamd.postfix.enable = true;
-}
--- a/hosts/by-name/servo/services/email/dovecot.nix
+++ b/hosts/by-name/servo/services/email/dovecot.nix
@@ -1,147 +0,0 @@
-# dovecot config options: <https://doc.dovecot.org/configuration_manual/>
-#
-# sieve docs:
-# - sieve language examples: <https://doc.dovecot.org/configuration_manual/sieve/examples/>
-# - sieve protocol/language: <https://proton.me/support/sieve-advanced-custom-filters>
-
-{ config, lib, pkgs, ... }:
-{
-  sane.ports.ports."143" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    visibleTo.lan = true;
-    description = "colin-imap-imap.uninsane.org";
-  };
-  sane.ports.ports."993" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    visibleTo.lan = true;
-    description = "colin-imaps-imap.uninsane.org";
-  };
-
-  # exists only to manage certs for dovecot
-  services.nginx.virtualHosts."imap.uninsane.org" = {
-    enableACME = true;
-  };
-
-  sane.dns.zones."uninsane.org".inet = {
-    CNAME."imap" = "native";
-  };
-
-  sops.secrets."dovecot_passwd" = {
-    owner = config.users.users.dovecot2.name;
-    # TODO: debug why mail can't be sent without this being world-readable
-    mode = "0444";
-  };
-
-  # inspired by https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/
-  services.dovecot2.enable = true;
-  # services.dovecot2.enableLmtp = true;
-  services.dovecot2.sslServerCert = "/var/lib/acme/imap.uninsane.org/fullchain.pem";
-  services.dovecot2.sslServerKey = "/var/lib/acme/imap.uninsane.org/key.pem";
-  services.dovecot2.enablePAM = false;
-
-  # sieve scripts require me to set a user for... idk why?
-  services.dovecot2.mailUser = "colin";
-  services.dovecot2.mailGroup = "users";
-  users.users.colin.isSystemUser = lib.mkForce false;
-
-  services.dovecot2.extraConfig =
-  let
-    passwdFile = config.sops.secrets.dovecot_passwd.path;
-  in
-    ''
-    passdb {
-      driver = passwd-file
-      args = ${passwdFile}
-    }
-    userdb {
-      driver = passwd-file
-      args = ${passwdFile}
-    }
-
-    # allow postfix to query our auth db
-    service auth {
-      unix_listener auth {
-        mode = 0660
-        user = postfix
-        group = postfix
-      }
-    }
-    auth_mechanisms = plain login
-
-    # accept incoming messaging from postfix
-    # service lmtp {
-    #   unix_listener dovecot-lmtp {
-    #     mode = 0600
-    #     user = postfix
-    #     group = postfix
-    #   }
-    # }
-
-    # plugin {
-    #   sieve_plugins = sieve_imapsieve
-    # }
-
-    # mail_debug = yes
-    # auth_debug = yes
-    # verbose_ssl = yes
-  '';
-
-  services.dovecot2.mailboxes = {
-    # special-purpose mailboxes: "All" "Archive" "Drafts" "Flagged" "Junk" "Sent" "Trash"
-    # RFC6154 describes these special mailboxes: https://www.ietf.org/rfc/rfc6154.html
-    # how these boxes are treated is 100% up to the client and server to decide.
-    # client behavior:
-    # iOS
-    #   - Drafts: ?
-    #   - Sent: works
-    #   - Trash: works
-    #   - Junk: works ("mark" -> "move to Junk")
-    # aerc
-    #   - Drafts: works
-    #   - Sent: works
-    #   - Trash: no; deleted messages are actually deleted
-    #       use `:move trash` instead
-    #   - Junk: ?
-    # Sent mailbox: all sent messages are copied to it. unclear if this happens server-side or client-side.
-    Drafts = { specialUse = "Drafts"; auto = "create"; };
-    Sent = { specialUse = "Sent"; auto = "create"; };
-    Trash = { specialUse = "Trash"; auto = "create"; };
-    Junk = { specialUse = "Junk"; auto = "create"; };
-  };
-
-  services.dovecot2.mailPlugins = {
-    perProtocol = {
-      # imap.enable = [
-      #   "imap_sieve"
-      # ];
-      lda.enable = [
-        "sieve"
-      ];
-      # lmtp.enable = [
-      #   "sieve"
-      # ];
-    };
-  };
-  environment.systemPackages = [
-    # XXX(2025-03-16): dovecot loads modules from /run/current-system/sw/lib/dovecot/modules
-    # see: <https://github.com/NixOS/nixpkgs/pull/387642>
-    pkgs.dovecot_pigeonhole  # enables sieve execution (?)
-  ];
-  services.dovecot2.sieve = {
-    extensions = [ "fileinto" ];
-    # if any messages fail to pass (or lack) DKIM, move them to Junk
-    # XXX the key name ("after") is only used to order sieve execution/ordering
-    scripts.after = builtins.toFile "ensuredkim.sieve" ''
-      require "fileinto";
-
-      if not header :contains "Authentication-Results" "dkim=pass" {
-        fileinto "Junk";
-        stop;
-      }
-    '';
-  };
-
-  systemd.services.dovecot.serviceConfig.RestartSec = lib.mkForce "15s";  # nixos defaults this to 1s
-}
--- a/hosts/by-name/servo/services/email/postfix.nix
+++ b/hosts/by-name/servo/services/email/postfix.nix
@@ -1,225 +0,0 @@
-# postfix config options: <https://www.postfix.org/postconf.5.html>
-# config files:
-# - /etc/postfix/main.cf
-# - /etc/postfix/master.cf
-#
-# logs:
-# - postfix logs directly to *syslog*,
-#   so check e.g. ~/.local/share/rsyslog
-
-{ config, lib, pkgs, ... }:
-
-let
-  submissionOptions = {
-    smtpd_tls_security_level = "encrypt";
-    smtpd_sasl_auth_enable = "yes";
-    smtpd_sasl_type = "dovecot";
-    smtpd_sasl_path = "/run/dovecot2/auth";
-    smtpd_sasl_security_options = "noanonymous";
-    smtpd_sasl_local_domain = "uninsane.org";
-    smtpd_client_restrictions = "permit_sasl_authenticated,reject";
-    # reuse the virtual map so that sender mapping matches recipient mapping
-    smtpd_sender_login_maps = "hash:/var/lib/postfix/conf/virtual";
-    smtpd_sender_restrictions = "reject_sender_login_mismatch";
-    smtpd_recipient_restrictions = "reject_non_fqdn_recipient,permit_sasl_authenticated,reject";
-  };
-in
-{
-  sane.persist.sys.byStore.private = [
-    # TODO: mode? could be more granular
-    { user = "opendkim"; group = "opendkim"; path = "/var/lib/opendkim"; method = "bind"; }  #< TODO: migrate to secrets
-    { user = "root"; group = "root"; path = "/var/spool/mail"; method = "bind"; }
-    # *probably* don't need these dirs:
-    # "/var/lib/dhparams"          # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/dhparams.nix
-    # "/var/lib/dovecot"
-    # "/var/lib/postfix"
-  ];
-
-  # XXX(2023/10/20): opening these ports in the firewall has the OPPOSITE effect as intended.
-  # these ports are only routable so long as they AREN'T opened.
-  # probably some cursed interaction with network namespaces introduced after 2023/10/10.
-  # sane.ports.ports."25" = {
-  #   protocol = [ "tcp" ];
-  #   # XXX visibleTo.lan effectively means "open firewall, but don't configure any NAT/forwarding"
-  #   visibleTo.lan = true;
-  #   description = "colin-smtp-mx.uninsane.org";
-  # };
-  # sane.ports.ports."465" = {
-  #   protocol = [ "tcp" ];
-  #   visibleTo.lan = true;
-  #   description = "colin-smtps-mx.uninsane.org";
-  # };
-  # sane.ports.ports."587" = {
-  #   protocol = [ "tcp" ];
-  #   visibleTo.lan = true;
-  #   description = "colin-smtps-submission-mx.uninsane.org";
-  # };
-
-  # exists only to manage certs for Postfix
-  services.nginx.virtualHosts."mx.uninsane.org" = {
-    enableACME = true;
-  };
-
-
-  sane.dns.zones."uninsane.org".inet = {
-    MX."@" = "10 mx.uninsane.org.";
-    A."mx" = "%AOVPNS%"; #< XXX: RFC's specify that the MX record CANNOT BE A CNAME. TODO: use "%AOVPNS%?
-
-    # Sender Policy Framework:
-    #   +mx     => mail passes if it originated from the MX
-    #   +a      => mail passes if it originated from the A address of this domain
-    #   +ip4:.. => mail passes if it originated from this IP
-    #   -all    => mail fails if none of these conditions were met
-    TXT."@" = "v=spf1 a mx -all";
-
-    # DKIM public key:
-    TXT."mx._domainkey" =
-      "v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCkSyMufc2KrRx3j17e/LyB+3eYSBRuEFT8PUka8EDX04QzCwDPdkwgnj3GNDvnB5Ktb05Cf2SJ/S1OLqNsINxJRWtkVfZd/C339KNh9wrukMKRKNELL9HLUw0bczOI4gKKFqyrRE9qm+4csCMAR79Te9FCjGV/jVnrkLdPT0GtFwIDAQAB"
-    ;
-
-    # DMARC fields <https://datatracker.ietf.org/doc/html/rfc7489>:
-    #   p=none|quarantine|reject: what to do with failures
-    #   sp = p but for subdomains
-    #   rua = where to send aggregrate reports
-    #   ruf = where to send individual failure reports
-    #   fo=0|1|d|s  controls WHEN to send failure reports
-    #     (1=on bad alignment; d=on DKIM failure; s=on SPF failure);
-    # Additionally:
-    #   adkim=r|s  (is DKIM relaxed [default] or strict)
-    #   aspf=r|s   (is SPF relaxed [default] or strict)
-    #   pct = sampling ratio for punishing failures (default 100 for 100%)
-    #   rf = report format
-    #   ri = report interval
-    TXT."_dmarc" =
-      "v=DMARC1;p=quarantine;sp=reject;rua=mailto:admin+mail@uninsane.org;ruf=mailto:admin+mail@uninsane.org;fo=1:d:s"
-    ;
-  };
-
-  services.postfix.enable = true;
-  services.postfix.hostname = "mx.uninsane.org";
-  services.postfix.origin = "uninsane.org";
-  services.postfix.destination = [ "localhost" "uninsane.org" ];
-  services.postfix.config.smtpd_tls_chain_files = [
-    "/var/lib/acme/mx.uninsane.org/key.pem"
-    "/var/lib/acme/mx.uninsane.org/fullchain.pem"
-  ];
-
-  # see: `man 5 virtual`
-  services.postfix.virtual = ''
-    notify.matrix@uninsane.org matrix-synapse
-    @uninsane.org colin
-  '';
-
-  services.postfix.config = {
-    # smtpd_milters = local:/run/opendkim/opendkim.sock
-    # milter docs: http://www.postfix.org/MILTER_README.html
-    # mail filters for receiving email and from authorized SMTP clients (i.e. via submission)
-    # smtpd_milters = inet:$IP:8891
-    # opendkim.sock will add a Authentication-Results header, with `dkim=pass|fail|...` value to received messages
-    smtpd_milters = "unix:/run/opendkim/opendkim.sock";
-    # mail filters for sendmail
-    non_smtpd_milters = "$smtpd_milters";
-
-    # what to do when a milter exits unexpectedly:
-    milter_default_action = "accept";
-
-    inet_protocols = "ipv4";
-    smtp_tls_security_level = "may";
-
-    # hand received mail over to dovecot so that it can run sieves & such
-    mailbox_command = ''${pkgs.dovecot}/libexec/dovecot/dovecot-lda -f "$SENDER" -a "$RECIPIENT"'';
-
-    # hand received mail over to dovecot
-    # virtual_alias_maps = [
-    #   "hash:/etc/postfix/virtual"
-    # ];
-    # mydestination = "";
-    # virtual_mailbox_domains = [ "localhost" "uninsane.org" ];
-    # # virtual_mailbox_maps = "hash:/etc/postfix/virtual";
-    # virtual_transport = "lmtp:unix:/run/dovecot2/dovecot-lmtp";
-
-    # anti-spam options: <https://www.postfix.org/SMTPD_ACCESS_README.html>
-    # reject_unknown_sender_domain: causes postfix to `dig <sender> MX` and make sure that exists.
-    # but may cause problems receiving mail from google & others who load-balance?
-    # - <https://unix.stackexchange.com/questions/592131/how-to-reject-email-from-unknown-domains-with-postfix-on-centos>
-    # smtpd_sender_restrictions = reject_unknown_sender_domain
-  };
-
-  # debugging options:
-  # services.postfix.masterConfig = {
-  #   "proxymap".args = [ "-v" ];
-  #   "proxywrite".args = [ "-v" ];
-  #   "relay".args = [ "-v" ];
-  #   "smtp".args = [ "-v" ];
-  #   "smtp_inet".args = [ "-v" ];
-  #   "submission".args = [ "-v" ];
-  #   "submissions".args = [ "-v" ];
-  #   "submissions".chroot = false;
-  #   "submissions".private = false;
-  #   "submissions".privileged = true;
-  # };
-
-  services.postfix.enableSubmission = true;
-  services.postfix.submissionOptions = submissionOptions;
-  services.postfix.enableSubmissions = true;
-  services.postfix.submissionsOptions = submissionOptions;
-
-  systemd.services.postfix.unitConfig.RequiresMountsFor = [
-    "/var/spool/mail"  # spooky errors when postfix is run w/o this: `warning: connect #1 to subsystem private/proxymap: Connection refused`
-    "/var/lib/opendkim"
-  ];
-
-  # run these behind the OVPN static VPN
-  sane.netns.ovpns.services = [ "opendkim" "postfix" ];
-
-
-  #### OPENDKIM
-
-  services.opendkim.enable = true;
-  # services.opendkim.domains = "csl:uninsane.org";
-  services.opendkim.domains = "uninsane.org";
-
-  # we use a custom (inet) socket, because the default perms
-  # of the unix socket don't allow postfix to connect.
-  # this sits on the machine-local 10.0.1 interface because it's the closest
-  # thing to a loopback interface shared by postfix and opendkim netns.
-  # services.opendkim.socket = "inet:8891@185.157.162.190";
-  # services.opendkim.socket = "local:/run/opendkim.sock";
-  # selectors can be used to disambiguate sender machines.
-  # keeping this the same as the hostname seems simplest
-  services.opendkim.selector = "mx";
-
-  systemd.services.opendkim.serviceConfig = {
-    # /run/opendkim/opendkim.sock needs to be rw by postfix
-    UMask = lib.mkForce "0011";
-  };
-
-
-  #### OUTGOING MESSAGE REWRITING:
-  # - `man 5 header_checks`
-  #   - <https://www.postfix.org/header_checks.5.html>
-  # - populates `/var/lib/postfix/conf/header_checks`
-  # XXX(2024-08-06): registration gating via email matches is AWFUL:
-  # 1. bypassed if the service offers localization.
-  # 2. if i try to forward the registration request, it may match the filter again and get sent back to my inbox.
-  # 3. header checks are possibly under-used in the ecosystem, and may break postfix config.
-  # services.postfix.enableHeaderChecks = true;
-  # services.postfix.headerChecks = [
-  #   # intercept gitea registration confirmations and manually screen them
-  #   {
-  #     # headerChecks are somehow ignorant of alias rules: have to redirect to a real user
-  #     action = "REDIRECT colin@uninsane.org";
-  #     pattern = "/^Subject: Please activate your account/";
-  #   }
-  #   # intercept Matrix registration confirmations
-  #   {
-  #     action = "REDIRECT colin@uninsane.org";
-  #     pattern = "/^Subject:.*Validate your email/";
-  #   }
-  #   # XXX postfix only supports performing ONE action per header.
-  #   # {
-  #   #   action = "REPLACE Subject: git application: Please activate your account";
-  #   #   pattern = "/^Subject:.*activate your account/";
-  #   # }
-  # ];
-}
--- a/hosts/by-name/servo/services/export/default.nix
+++ b/hosts/by-name/servo/services/export/default.nix
@@ -1,58 +0,0 @@
-{ config, ... }:
-{
-  imports = [
-    ./nfs.nix
-    ./sftpgo
-  ];
-
-  users.groups.export = {};
-
-  fileSystems."/var/export/media" = {
-    # everything in here could be considered publicly readable (based on the viewer's legal jurisdiction)
-    device = "/var/media";
-    options = [ "rbind" "nofail" ];
-  };
-  # fileSystems."/var/export/playground" = {
-  #   device = config.fileSystems."/mnt/persist/ext".device;
-  #   fsType = "btrfs";
-  #   options = [
-  #     "subvol=export-playground"
-  #     "compress=zstd"
-  #     "defaults"
-  #   ];
-  # };
-  # N.B.: the backing directory should be manually created here **as a btrfs subvolume** and with a quota.
-  # - `sudo btrfs subvolume create /mnt/persist/ext/persist/var/export/playground`
-  # - `sudo btrfs quota enable /mnt/persist/ext/persist/var/export/playground`
-  # - `sudo btrfs quota rescan -sw /mnt/persist/ext/persist/var/export/playground`
-  # to adjust the limits (which apply at the block layer, i.e. post-compression):
-  # - `sudo btrfs qgroup limit 20G /mnt/persist/ext/persist/var/export/playground`
-  # to query the quota/status:
-  # - `sudo btrfs qgroup show -re /var/export/playground`
-  sane.persist.sys.byStore.ext = [
-    { user = "root"; group = "export"; mode = "0775"; path = "/var/export/playground"; method = "bind"; }
-  ];
-
-  sane.fs."/var/export/README.md" = {
-    file.text = ''
-      - media/         read-only:  Videos, Music, Books, etc
-      - playground/    read-write*: use it to share files with other users of this server, inaccessible from the www
-                                    *if you can't write to it, make sure you're connected to the WiFi and not mobile.
-    '';
-  };
-
-  sane.fs."/var/export/playground/README.md" = {
-    file.text = ''
-      this directory is intentionally read+write by anyone with access.
-      - share files
-      - write poetry
-      - be a friendly troll
-    '';
-  };
-
-  sane.fs."/var/export/.public_for_test/test" = {
-    file.text = ''
-      automated tests read this file to probe connectivity
-    '';
-  };
-}
--- a/hosts/by-name/servo/services/export/nfs.nix
+++ b/hosts/by-name/servo/services/export/nfs.nix
@@ -1,135 +0,0 @@
-# docs:
-# - <https://nixos.wiki/wiki/NFS>
-# - <https://wiki.gentoo.org/wiki/Nfs-utils>
-# system files:
-# - /etc/exports
-# system services:
-# - nfs-server.service
-# - nfs-idmapd.service
-# - nfs-mountd.service
-# - nfsdcld.service
-# - rpc-statd.service
-# - rpcbind.service
-#
-# TODO: force files to be 755, or 750.
-# - could maybe be done with some mount option?
-
-{ config, lib, ... }:
-lib.mkIf false  #< TODO: remove nfs altogether! it's not exactly the most secure
-{
-  services.nfs.server.enable = true;
-
-  # see which ports NFS uses with:
-  # - `rpcinfo -p`
-  sane.ports.ports."111" = {
-    protocol = [ "tcp" "udp" ];
-    visibleTo.lan = true;
-    description = "NFS server portmapper";
-  };
-  sane.ports.ports."2049" = {
-    protocol = [ "tcp" "udp" ];
-    visibleTo.lan = true;
-    description = "NFS server";
-  };
-  sane.ports.ports."4000" = {
-    protocol = [ "udp" ];
-    visibleTo.lan = true;
-    description = "NFS server status daemon";
-  };
-  sane.ports.ports."4001" = {
-    protocol = [ "tcp" "udp" ];
-    visibleTo.lan = true;
-    description = "NFS server lock daemon";
-  };
-  sane.ports.ports."4002" = {
-    protocol = [ "tcp" "udp" ];
-    visibleTo.lan = true;
-    description = "NFS server mount daemon";
-  };
-
-  # NFS4 allows these to float, but NFS3 mandates specific ports, so fix them for backwards compat.
-  services.nfs.server.lockdPort = 4001;
-  services.nfs.server.mountdPort = 4002;
-  services.nfs.server.statdPort = 4000;
-
-  services.nfs.extraConfig = ''
-    [nfsd]
-    # XXX: NFS over UDP REQUIRES SPECIAL CONFIG TO AVOID DATA LOSS.
-    # see `man 5 nfs`: "Using NFS over UDP on high-speed links".
-    # it's actually just a general property of UDP over IPv4 (IPv6 fixes it).
-    # both the client and the server should configure a shorter-than-default IPv4 fragment reassembly window to mitigate.
-    # OTOH, tunneling NFS over Wireguard also bypasses this weakness, because a mis-assembled packet would not have a valid signature.
-    udp=y
-
-    [exports]
-    # all export paths are relative to rootdir.
-    # for NFSv4, the export with fsid=0 behaves as `/` publicly,
-    # but NFSv3 implements no such feature.
-    # using `rootdir` instead of relying on `fsid=0` allows consistent export paths regardless of NFS proto version
-    rootdir=/var/export
-  '';
-
-  # format:
-  #   fspoint	visibility(options)
-  # options:
-  # - see: <https://wiki.gentoo.org/wiki/Nfs-utils#Exports>
-  # - see [man 5 exports](https://linux.die.net/man/5/exports)
-  # - insecure:  require clients use src port > 1024
-  # - rw, ro (default)
-  # - async, sync (default)
-  # - no_subtree_check (default), subtree_check: verify not just that files requested by the client live
-  #     in the expected fs, but also that they live under whatever subdirectory of that fs is exported.
-  # - no_root_squash, root_squash (default): map requests from uid 0 to user `nobody`.
-  # - crossmnt:  reveal filesystems that are mounted under this endpoint
-  # - fsid:  must be zero for the root export
-  #   - fsid=root  is alias for fsid=0
-  # - mountpoint[=/path]:  only export the directory if it's a mountpoint. used to avoid exporting failed mounts.
-  # - all_squash: rewrite all client requests such that they come from anonuid/anongid
-  #   - any files a user creates are owned by local anonuid/anongid.
-  #   - users can read any local file which anonuid/anongid would be able to read.
-  #   - users can't chown to/away from anonuid/anongid.
-  #   - users can chmod files they own, to anything (making them unreadable to non-`nfsuser` export users, like FTP).
-  #   - `stat` remains unchanged, returning the real UIDs/GIDs to the client.
-  #     - thus programs which check `uid` or `gid` before trying an operation may incorrectly conclude they can't perform some op.
-  #
-  # 10.0.0.0/8 to export both to LAN (readonly, unencrypted) and wg vpn (read-write, encrypted)
-  services.nfs.server.exports =
-  let
-    fmtExport = { export, baseOpts, extraLanOpts ? [], extraVpnOpts ? [] }:
-      let
-        always = [ "subtree_check" ];
-        lanOpts = always ++ baseOpts ++ extraLanOpts;
-        vpnOpts = always ++ baseOpts ++ extraVpnOpts;
-      in "${export} 10.78.79.0/22(${lib.concatStringsSep "," lanOpts}) 10.0.10.0/24(${lib.concatStringsSep "," vpnOpts})";
-  in lib.concatStringsSep "\n" [
-    (fmtExport {
-      export = "/";
-      baseOpts = [ "crossmnt" "fsid=root" ];
-      extraLanOpts = [ "ro" ];
-      extraVpnOpts = [ "rw" "no_root_squash" ];
-    })
-    (fmtExport {
-      # provide /media as an explicit export. NFSv4 can transparently mount a subdir of an export, but NFSv3 can only mount paths which are exports.
-      export = "/media";
-      baseOpts = [ "crossmnt" ];  # TODO: is crossmnt needed here?
-      extraLanOpts = [ "ro" ];
-      extraVpnOpts = [ "rw" "no_root_squash" ];
-    })
-    (fmtExport {
-      export = "/playground";
-      baseOpts = [
-        "mountpoint"
-        "all_squash"
-        "rw"
-        "anonuid=${builtins.toString config.users.users.nfsuser.uid}"
-        "anongid=${builtins.toString config.users.groups.export.gid}"
-      ];
-    })
-  ];
-
-  users.users.nfsuser = {
-    description = "virtual user for anonymous NFS operations";
-    group = "export";
-    isSystemUser = true;
-  };
-}
--- a/hosts/by-name/servo/services/export/sftpgo/default.nix
+++ b/hosts/by-name/servo/services/export/sftpgo/default.nix
@@ -1,172 +0,0 @@
-# docs:
-# - <https://github.com/drakkan/sftpgo>
-# - config options: <https://github.com/drakkan/sftpgo/blob/main/docs/full-configuration.md>
-# - config defaults: <https://github.com/drakkan/sftpgo/blob/main/sftpgo.json>
-# - nixos options: <repo:nixos/nixpkgs:nixos/modules/services/web-apps/sftpgo.nix>
-# - nixos example: <repo:nixos/nixpkgs:nixos/tests/sftpgo.nix>
-#
-# sftpgo is a FTP server that also supports WebDAV, SFTP, and web clients.
-
-{ config, lib, pkgs, sane-lib, ... }:
-let
-  external_auth_hook = pkgs.static-nix-shell.mkPython3 {
-    pname = "external_auth_hook";
-    srcRoot = ./.;
-    pkgs = [ "python3.pkgs.passlib" ];
-  };
-  # Client initiates a FTP "control connection" on port 21.
-  # - this handles the client -> server commands, and the server -> client status, but not the actual data
-  # - file data, directory listings, etc need to be transferred on an ephemeral "data port".
-  # - 50000-50100 is a common port range for this.
-  #   50000 is used by soulseek.
-  passiveStart = 50050;
-  passiveEnd   = 50070;
-in
-{
-  sane.ports.ports = {
-    "21" = {
-      protocol = [ "tcp" ];
-      visibleTo.lan = true;
-      description = "colin-FTP server";
-    };
-    "990" = {
-      protocol = [ "tcp" ];
-      visibleTo.doof = true;
-      visibleTo.lan = true;
-      description = "colin-FTPS server";
-    };
-  } // (sane-lib.mapToAttrs
-    (port: {
-      name = builtins.toString port;
-      value = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-FTP server data port range";
-      };
-    })
-    (lib.range passiveStart passiveEnd)
-  );
-
-  # use nginx/acme to produce a cert for FTPS
-  services.nginx.virtualHosts."ftp.uninsane.org" = {
-    addSSL = true;
-    enableACME = true;
-  };
-  sane.dns.zones."uninsane.org".inet.CNAME."ftp" = "native";
-
-  services.sftpgo = {
-    enable = true;
-    group = "export";
-
-    package = pkgs.sftpgo.overrideAttrs (upstream: {
-      patches = (upstream.patches or []) ++ [
-        # fix for compatibility with kodi:
-        # ftp LIST operation returns entries over-the-wire like:
-        # - dgrwxrwxr-x 1 ftp ftp            9 Apr  9 15:05 Videos
-        # however not all clients understand all mode bits (like that `g`, indicating SGID / group sticky bit).
-        # instead, only send mode bits which are well-understood.
-        # the full set of bits, from which i filter, is found here: <https://pkg.go.dev/io/fs#FileMode>
-        ./safe_fileinfo.patch
-      ];
-    });
-
-    settings = {
-      ftpd = {
-        bindings = [
-          {
-            # binding this means any wireguard client can connect
-            address = "10.0.10.5";
-            port = 21;
-            debug = true;
-          }
-          {
-            # binding this means any wireguard client can connect
-            address = "10.0.10.5";
-            port = 990;
-            debug = true;
-            tls_mode = 2;  # 2 = "implicit FTPS": client negotiates TLS before any FTP command.
-          }
-          {
-            # binding this means any LAN client can connect (also WAN traffic forwarded from the gateway)
-            address = "10.78.79.51";
-            port = 21;
-            debug = true;
-          }
-          {
-            # binding this means any LAN client can connect (also WAN traffic forwarded from the gateway)
-            address = "10.78.79.51";
-            port = 990;
-            debug = true;
-            tls_mode = 2;  # 2 = "implicit FTPS": client negotiates TLS before any FTP command.
-          }
-          {
-            # binding this means any doof client can connect (TLS only)
-            address = config.sane.netns.doof.veth.initns.ipv4;
-            port = 990;
-            debug = true;
-            tls_mode = 2;  # 2 = "implicit FTPS": client negotiates TLS before any FTP command.
-          }
-          {
-            # binding this means any LAN client can connect via `ftp.uninsane.org` (TLS only)
-            address = config.sane.netns.doof.wg.address.ipv4;
-            port = 990;
-            debug = true;
-            tls_mode = 2;  # 2 = "implicit FTPS": client negotiates TLS before any FTP command.
-          }
-        ];
-
-        # active mode is susceptible to "bounce attacks", without much benefit over passive mode
-        disable_active_mode = true;
-        hash_support = true;
-        passive_port_range = {
-          start = passiveStart;
-          end = passiveEnd;
-        };
-
-        certificate_file = "/var/lib/acme/ftp.uninsane.org/full.pem";
-        certificate_key_file = "/var/lib/acme/ftp.uninsane.org/key.pem";
-
-        banner = ''
-          Welcome, friends, to Colin's FTP server! Also available via NFS on the same host, but LAN-only.
-
-          Read-only access (LAN clients see everything; WAN clients can only see /pub):
-          Username: "anonymous"
-          Password: "anonymous"
-
-          CONFIGURE YOUR CLIENT FOR "PASSIVE" MODE, e.g. `ftp --passive ftp.uninsane.org`.
-          Please let me know if anything's broken or not as it should be. Otherwise, browse and transfer freely :)
-        '';
-
-      };
-      data_provider = {
-        driver = "memory";
-        external_auth_hook = lib.getExe external_auth_hook;
-        # track_quota:
-        # - 0: disable quota tracking
-        # - 1: quota is updated on every upload/delete, even if user has no quota restriction
-        # - 2: quota is updated on every upload/delete, but only if user/folder has a quota restriction  (default, i think)
-        # track_quota = 2;
-      };
-    };
-  };
-
-  users.users.sftpgo.extraGroups = [
-    "export"
-    "media"
-    "nginx"  # to access certs
-  ];
-
-  systemd.services.sftpgo = {
-    after = [ "network-online.target" ];  #< so that it reliably binds to all interfaces/netns's?
-    wants = [ "network-online.target" ];
-    unitConfig.RequiresMountsFor = [
-      "/var/export/media"
-      "/var/export/playground"
-    ];
-    serviceConfig.ReadWritePaths = [ "/var/export" ];
-    serviceConfig.Restart = "always";
-    serviceConfig.RestartSec = "20s";
-    serviceConfig.UMask = lib.mkForce "0002";
-  };
-}
--- a/hosts/by-name/servo/services/export/sftpgo/external_auth_hook
+++ b/hosts/by-name/servo/services/export/sftpgo/external_auth_hook
@@ -1,191 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 -p python3.pkgs.passlib
-# vim: set filetype=python :
-#
-# available environment variables:
-# - SFTPGO_AUTHD_USERNAME
-# - SFTPGO_AUTHD_USER
-# - SFTPGO_AUTHD_IP
-# - SFTPGO_AUTHD_PROTOCOL  = { "DAV", "FTP", "HTTP", "SSH" }
-# - SFTPGO_AUTHD_PASSWORD
-# - SFTPGO_AUTHD_PUBLIC_KEY
-# - SFTPGO_AUTHD_KEYBOARD_INTERACTIVE
-# - SFTPGO_AUTHD_TLS_CERT
-#
-# user permissions:
-# - see <repo:drakkan/sftpgo:internal/dataprovider/user.go>
-# - "*" = grant all permissions
-# - read-only perms:
-#   - "list" = list files and directories
-#   - "download"
-# - rw perms:
-#   - "upload"
-#   - "overwrite" = allow uploads to replace existing files
-#   - "delete" = delete files and directories
-#     - "delete_files"
-#     - "delete_dirs"
-#   - "rename" = rename files and directories
-#     - "rename_files"
-#     - "rename_dirs"
-#   - "create_dirs"
-#   - "create_symlinks"
-#   - "chmod"
-#   - "chown"
-#   - "chtimes" = change atime/mtime (access and modification times)
-#
-# home_dir:
-# - it seems (empirically) that a user can't cd above their home directory.
-#   though i don't have a reference for that in the docs.
-
-import json
-import os
-import passlib.hosts
-
-from hmac import compare_digest
-
-authFail = dict(username="")
-
-PERM_DENY = []
-PERM_LIST = [ "list" ]
-PERM_RO = [ "list", "download" ]
-PERM_RW = [
-  # read-only:
-  "list",
-  "download",
-  # write:
-  "upload",
-  "overwrite",
-  "delete",
-  "rename",
-  "create_dirs",
-  "create_symlinks",
-  # intentionally omitted:
-  # "chmod",
-  # "chown",
-  # "chtimes",
-]
-
-TRUSTED_CREDS = [
-  # /etc/shadow style creds.
-  # mkpasswd -m sha-512
-  # $<method>$<salt>$<hash>
-  "$6$Zq3c2u4ghUH4S6EP$pOuRt13sEKfX31OqPbbd1LuhS21C9MICMc94iRdTAgdAcJ9h95gQH/6Jf6Ie4Obb0oxQtojRJ1Pd/9QHOlFMW.",  #< m. rocket boy
-  "$6$B0NLGNdCL51PNse1$46G.aA1ATWIv5v.jUsKf4F3NS7emV2jB2gkZ3MytZtMvw2pjniHmRl0fywRjKW9TuXTeK9T50v.H0f2BaQ4PT1",  #< v. telephony
-]
-TRUSTED_VIEWING_OR_PLAYGROUND_CREDS = [
-  # "$6$iikDajz5b.YH1.on$tfSzzBEtX8IeDiJJXCasOTxRTd7cFDKXU6dhlWYVhK6xDeJhV2fh6bmm1WIHItjIth9Eh9zNgUB8xibMIWCm/."  # fedi (2024-08-27); music appreciation
-];
-
-def mkAuthOk(username: str, permissions: dict[str, list[str]]) -> dict:
-  return dict(
-    status = 1,
-    username = username,
-    expiration_date = 0,
-    home_dir = "/var/export",
-    # uid/gid 0 means to inherit sftpgo uid.
-    # - i.e. users can't read files which Linux user `sftpgo` can't read
-    # - uploaded files belong to Linux user `sftpgo`
-    # other uid/gid values aren't possible for localfs backend, unless i let sftpgo use `sudo`.
-    uid = 0,
-    gid = 0,
-    # uid = 65534,
-    # gid = 65534,
-    max_sessions = 0,
-    # quota_*: 0 means to not use SFTP's quota system
-    quota_size = 0,
-    quota_files = 0,
-    permissions = permissions,
-    upload_bandwidth = 0,
-    download_bandwidth = 0,
-    filters = dict(
-      allowed_ip = [],
-      denied_ip = [],
-    ),
-    public_keys = [],
-    # other fields:
-    # ? groups
-    # ? virtual_folders
-  )
-
-def isLan(ip: str) -> bool:
-  return ip.startswith("10.78.76.") \
-    or ip.startswith("10.78.77.") \
-    or ip.startswith("10.78.78.") \
-    or ip.startswith("10.78.79.")
-
-def isWireguard(ip: str) -> bool:
-  return ip.startswith("10.0.10.")
-
-def isTrustedCred(password: str, credlist: list[str] = TRUSTED_CREDS) -> bool:
-  for cred in credlist:
-    if passlib.hosts.linux_context.verify(password, cred):
-      return True
-
-  return False
-
-def getAuthResponse(ip: str, username: str, password: str) -> dict:
-  """
-  return a sftpgo auth response either denying the user or approving them
-  with a set of permissions.
-  """
-  if isTrustedCred(password) and username != "colin":
-    # allow r/w access from those with a special token
-    return mkAuthOk(username, permissions = {
-      "/": PERM_RW,
-      "/playground": PERM_RW,
-      "/.public_for_test": PERM_RO,
-      "/media/Music": PERM_RO,  #< i am too picky about Music organization
-    })
-  if isTrustedCred(password, TRUSTED_VIEWING_OR_PLAYGROUND_CREDS) and username != "colin":
-    return mkAuthOk(username, permissions = {
-      # error prone, but... not the worst if i miss something
-      "/": PERM_LIST,
-      "/media/archive": PERM_DENY,
-      "/media/Books": PERM_RO,
-      "/media/collections": PERM_DENY,
-      "/media/games": PERM_RO,
-      "/media/Music": PERM_RO,
-      "/media/Pictures": PERM_RO,
-      "/media/torrents": PERM_DENY,
-      "/media/Videos": PERM_RO,
-      "/playground": PERM_RW,
-      "/.public_for_test": PERM_RO,
-    })
-  if isWireguard(ip):
-    # allow any user from wireguard
-    return mkAuthOk(username, permissions = {
-      "/": PERM_RW,
-      "/playground": PERM_RW,
-      "/.public_for_test": PERM_RO,
-    })
-  if isLan(ip):
-    if username == "anonymous":
-      # allow anonymous users on the LAN
-      return mkAuthOk("anonymous", permissions = {
-        "/": PERM_RO,
-        "/playground": PERM_RW,
-        "/.public_for_test": PERM_RO,
-      })
-  if username == "anonymous":
-    # anonymous users from the www can have even more limited access.
-    # mostly because i need an easy way to test WAN connectivity :-)
-    return mkAuthOk("anonymous", permissions = {
-      # "/": PERM_DENY,
-      "/": PERM_LIST,  #< REQUIRED, even for lftp to list a subdir
-      "/media": PERM_DENY,
-      "/playground": PERM_DENY,
-      "/.public_for_test": PERM_RO,
-      # "/README.md": PERM_RO,  #< does not work
-    })
-
-  return authFail
-
-def main():
-  ip = os.environ.get("SFTPGO_AUTHD_IP", "")
-  username = os.environ.get("SFTPGO_AUTHD_USERNAME", "")
-  password = os.environ.get("SFTPGO_AUTHD_PASSWORD", "")
-  resp = getAuthResponse(ip, username, password)
-  print(json.dumps(resp))
-
-if __name__ == "__main__":
-  main()
--- a/hosts/by-name/servo/services/export/sftpgo/safe_fileinfo.patch
+++ b/hosts/by-name/servo/services/export/sftpgo/safe_fileinfo.patch
@@ -1,32 +0,0 @@
-diff --git a/internal/ftpd/handler.go b/internal/ftpd/handler.go
-index 036c3977..33211261 100644
--- a/internal/ftpd/handler.go
-+++ b/internal/ftpd/handler.go
-@@ -169,7 +169,7 @@ func (c *Connection) Stat(name string) (os.FileInfo, error) {
- 		}
- 		return nil, err
- 	}
-	return fi, nil
-+	return vfs.NewFileInfo(name, fi.IsDir(), fi.Size(), fi.ModTime(), false), nil
- }
-
- // Name returns the name of this connection
-@@ -315,7 +315,17 @@ func (c *Connection) ReadDir(name string) (ftpserver.DirLister, error) {
- 		}, nil
- 	}
-
-	return c.ListDir(name)
-+	lister, err := c.ListDir(name)
-+	if err != nil {
-+		return nil, err
-+	}
-+	return &patternDirLister{
-+		DirLister:      lister,
-+		pattern:        "*",
-+		lastCommand:    c.clientContext.GetLastCommand(),
-+		dirName:        name,
-+		connectionPath: c.clientContext.Path(),
-+	}, nil
- }
-
- // GetHandle implements ClientDriverExtentionFileTransfer
--- a/hosts/by-name/servo/services/gerbera.nix
+++ b/hosts/by-name/servo/services/gerbera.nix
@@ -1,38 +0,0 @@
-# gerbera UPNP/media server
-# accessible from TVs on the LAN
-# unauthenticated admin and playback UI at http://servo:49152/
-#
-# supposedly does transcoding, but i poked at it for 10 minutes and couldn't get that working
-#
-# compatibility:
-# - LG TV: music: all working
-# - LG TV: videos: mixed
-{ lib, ... }:
-lib.mkIf false  #< XXX(2024-11-17): WORKS, but no better than any other service; slow to index and transcoding doesn't work
-{
-  sane.ports.ports."1900" = {
-    protocol = [ "udp" ];
-    visibleTo.lan = true;
-    description = "colin-upnp-for-gerbera";
-  };
-  sane.ports.ports."49152" = {
-    protocol = [ "tcp" "udp" ];  # TODO: is udp required?
-    visibleTo.lan = true;
-    description = "colin-gerbera-http";
-  };
-
-  sane.persist.sys.byStore.plaintext = [
-    # persist the index database, since it takes a good 30 minutes to scan the media collection
-    { user = "mediatomb"; group = "mediatomb"; mode = "0700"; path = "/var/lib/gerbera"; method = "bind"; }
-  ];
-
-  services.mediatomb.enable = true;
-  services.mediatomb.serverName = "servo";
-  services.mediatomb.transcoding = true;
-  services.mediatomb.mediaDirectories = [
-    { path = "/var/media/Music"; recursive = true; hidden-files = false; }
-    { path = "/var/media/Videos/Film"; recursive = true; hidden-files = false; }
-    { path = "/var/media/Videos/Shows"; recursive = true; hidden-files = false; }
-  ];
-  users.users.mediatomb.extraGroups = [ "media" ];
-}
--- a/hosts/by-name/servo/services/gitea.nix
+++ b/hosts/by-name/servo/services/gitea.nix
@@ -1,201 +0,0 @@
-# config options: <https://docs.gitea.io/en-us/administration/config-cheat-sheet/>
-# TODO: service shouldn't run as `git` user, but as `gitea`
-{ config, pkgs, lib, ... }:
-
-{
-  sane.persist.sys.byStore.private = [
-    { user = "git"; group = "gitea"; mode = "0750"; path = "/var/lib/gitea"; method = "bind"; }
-  ];
-
-  sane.programs.gitea.enableFor.user.colin = true;  # for admin, and monitoring
-
-  services.gitea.enable = true;
-  services.gitea.user = "git";  # default is 'gitea'
-  services.gitea.appName = "Perfectly Sane Git";
-  # services.gitea.disableRegistration = true;
-
-  services.gitea.database.createDatabase = false;  # can only createDatabase if user ("git") == dbname ("gitea")
-  services.gitea.database.type = "postgres";
-  services.gitea.database.user = "git";
-  # createDatabase=false means manually specify the connection; see: <https://github.com/NixOS/nixpkgs/pull/268849>
-  services.gitea.database.name = "gitea";
-  services.gitea.database.socket = "/run/postgresql";  #< would have been set if createDatabase = true
-
-  services.postgresql.enable = true;
-  services.postgresql.ensureDatabases = [ "gitea" ];
-  services.postgresql.ensureUsers = [{
-    name = "git";
-    # ensureDBOwnership = true;  # not possible if db name ("gitea") != db username ("git"); one-time manual setup required to grant user ownership of the relevant db
-  }];
-
-  # gitea doesn't create the git user
-  users.users.git = {
-    description = "Gitea Service";
-    home = "/var/lib/gitea";
-    useDefaultShell = true;
-    group = "gitea";
-    isSystemUser = true;
-    # sendmail access (not 100% sure if this is necessary)
-    extraGroups = [ "postdrop" ];
-  };
-
-  services.gitea.settings = {
-    # options: "Trace", "Debug", "Info", "Warn", "Error", "Critical"
-    log.LEVEL = "Warn";
-    server = {
-      # options: "home", "explore", "organizations", "login" or URL fragment (or full URL)
-      LANDING_PAGE = "explore";
-      DOMAIN = "git.uninsane.org";
-      ROOT_URL = "https://git.uninsane.org/";
-    };
-    service = {
-      # timeout for email approval. 5760 = 4 days. 10080 = 7 days
-      ACTIVE_CODE_LIVE_MINUTES = 10080;
-      # REGISTER_EMAIL_CONFIRM = false;
-      # REGISTER_EMAIL_CONFIRM = true;  #< override REGISTER_MANUAL_CONFIRM
-      REGISTER_MANUAL_CONFIRM = true;
-      # not sure what this notifies *on*...
-      ENABLE_NOTIFY_MAIL = true;
-      # defaults to image-based captcha.
-      # also supports recaptcha (with custom URLs) or hCaptcha.
-      ENABLE_CAPTCHA = true;
-      NOREPLY_ADDRESS = "noreply.anonymous.git@uninsane.org";
-      EMAIL_DOMAIN_BLOCKLIST = lib.concatStringsSep ", " [
-        "*.claychoen.top"
-        "*.gemmasmith.co.uk"
-        "*.jenniferlawrence.uk"
-        "*.sarahconnor.co.uk"
-        "*.marymarshall.co.uk"
-      ];
-    };
-    session = {
-      COOKIE_SECURE = true;
-      # keep me logged in for 30 days
-      SESSION_LIFE_TIME = 60 * 60 * 24 * 30;
-    };
-    repository = {
-      DEFAULT_BRANCH = "master";
-      ENABLE_PUSH_CREATE_USER = true;
-      ENABLE_PUSH_CREATE_ORG = true;
-    };
-    other = {
-      SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
-    };
-    ui = {
-      # options: "gitea-auto" (adapt to system theme), "gitea-dark", "gitea-light"
-      # DEFAULT_THEME = "gitea-auto";
-      # cache frontend assets if true
-      # USE_SERVICE_WORKER = true;
-    };
-    #"ui.meta" = ... to customize html author/description/etc
-    mailer = {
-      # alternative is to use nixos-level config:
-      # services.gitea.mailerPasswordFile = ...
-      ENABLED = true;
-      FROM = "notify.git@uninsane.org";
-      PROTOCOL = "sendmail";
-      SENDMAIL_PATH = lib.getExe' pkgs.postfix "sendmail";
-      SENDMAIL_ARGS = "--";  # most "sendmail" programs take options, "--" will prevent an email address being interpreted as an option.
-    };
-    time = {
-      # options: ANSIC, UnixDate, RubyDate, RFC822, RFC822Z, RFC850, RFC1123, RFC1123Z, RFC3339, RFC3339Nano, Kitchen, Stamp, StampMilli, StampMicro, StampNano
-      # docs: https://pkg.go.dev/time#pkg-constants
-      FORMAT = "RFC3339";
-    };
-  };
-
-  systemd.services.gitea.wants = [ "postgresql.service" ];
-  systemd.services.gitea.serviceConfig = {
-    # nix default is AF_UNIX AF_INET AF_INET6.
-    # we need more protos for sendmail to work. i thought it only needed +AF_LOCAL, but that didn't work.
-    RestrictAddressFamilies = lib.mkForce "~";
-    # add maildrop to allow sendmail to work
-    ReadWritePaths = [
-      "/var/lib/postfix/queue/maildrop"
-    ];
-    # rate limit the restarts to prevent systemd from disabling it
-    RestartSec = 5;
-    RestartMaxDelaySec = 30;
-    StartLimitBurst = 120;
-    RestartSteps = 5;
-  };
-
-  # services.openssh.settings.UsePAM = true;  #< required for `git` user to authenticate
-
-  services.anubis.instances."git.uninsane.org" = {
-    settings.TARGET = "http://127.0.0.1:3000";
-    # allow IM clients/etc to show embeds/previews, else they just show "please verify you aren't a bot..."
-    botPolicy.openGraph.enabled = true;
-  };
-
-  # hosted git (web view and for `git <cmd>` use
-  # TODO: enable publog?
-  services.nginx.virtualHosts."git.uninsane.org" = let
-    # XXX(2025-07-24): gitea's still being crawled, even with robots.txt.
-    # the load is less than when Anthropic first started, but it's still pretty high (like 600%).
-    # place behind anubis to prevent AI crawlers from hogging my CPU (gitea is slow to render pages).
-    proxyPassHeavy = "http://unix:${config.services.anubis.instances."git.uninsane.org".settings.BIND}";
-    # but anubis breaks embeds, so only protect the expensive repos.
-    proxyPassLight = "http://127.0.0.1:3000";
-    proxyTo = proxy: root: {
-      proxyPass = proxy;
-      recommendedProxySettings = true;
-    };
-  in {
-    forceSSL = true;  # gitea complains if served over a different protocol than its config file says
-    enableACME = true;
-    # inherit kTLS;
-    extraConfig = ''
-      client_max_body_size 100m;
-    '';
-
-    locations."/" = {
-      proxyPass = proxyPassLight;
-      recommendedProxySettings = true;
-    };
-    # selectively proxy the heavyweight items through anubis.
-    # a typical interaction is:
-    # nginx:/colin/linux -> anubis:/colin/linux -> browser is served a loading page
-    # -> nginx:.within.website/x/cmd/anubis/api/pass-challenge?response=... -> anubis:.within.website/x/cmd/anubis/api/pass-challenge?response=... -> browser is forwarded to /colin/linux
-    # -> nginx:/colin/linux -> anubis:/colin/linux -> gitea:/colin/linux -> browser is served the actual content
-    locations."/.within.website/" = proxyTo proxyPassHeavy;
-    locations."/colin/linux" = proxyTo proxyPassHeavy;
-    locations."/colin/nixpkgs" = proxyTo proxyPassHeavy;
-    locations."/colin/opencellid-mirror" = proxyTo proxyPassHeavy;
-    locations."/colin/podcastindex-db-mirror" = proxyTo proxyPassHeavy;
-
-    # fuck you @anthropic
-    # locations."= /robots.txt".extraConfig = ''
-    #   return 200 "User-agent: *\nDisallow: /\n";
-    # '';
-    # gitea serves all `raw` files as content-type: plain, but i'd like to serve them as their actual content type.
-    # or at least, enough to make specific pages viewable (serving unoriginal content as arbitrary content type is dangerous).
-    locations."~ ^/colin/phone-case-cq/raw/.*.html" = {
-      proxyPass = proxyPassLight;
-      recommendedProxySettings = true;
-      extraConfig = ''
-        proxy_hide_header Content-Type;
-        default_type text/html;
-        add_header Content-Type text/html;
-      '';
-    };
-    locations."~ ^/colin/phone-case-cq/raw/.*.js" = {
-      proxyPass = proxyPassLight;
-      recommendedProxySettings = true;
-      extraConfig = ''
-        proxy_hide_header Content-Type;
-        default_type text/html;
-        add_header Content-Type text/javascript;
-      '';
-    };
-  };
-
-  sane.dns.zones."uninsane.org".inet.CNAME."git" = "native";
-
-  sane.ports.ports."22" = {
-    protocol = [ "tcp" ];
-    visibleTo.lan = true;
-    visibleTo.doof = true;
-    description = "colin-git@git.uninsane.org";
-  };
-}
--- a/hosts/by-name/servo/services/hickory-dns.nix
+++ b/hosts/by-name/servo/services/hickory-dns.nix
@@ -1,149 +0,0 @@
-# TODO: split this file apart into smaller files to make it easier to understand
-{ config, lib, ... }:
-
-let
-  dyn-dns = config.sane.services.dyn-dns;
-  nativeAddrs = lib.mapAttrs (_name: builtins.head) config.sane.dns.zones."uninsane.org".inet.A;
-in
-{
-  sane.ports.ports."53" = {
-    protocol = [ "udp" "tcp" ];
-    visibleTo.lan = true;
-    # visibleTo.wan = true;
-    visibleTo.ovpns = true;
-    visibleTo.doof = true;
-    description = "colin-dns-hosting";
-  };
-
-  sane.dns.zones."uninsane.org".TTL = 900;
-
-  # SOA record structure: <https://en.wikipedia.org/wiki/SOA_record#Structure>
-  # SOA MNAME RNAME (... rest)
-  # MNAME = Master name server for this zone. this is where update requests should be sent.
-  # RNAME = admin contact (encoded email address)
-  # Serial = YYYYMMDDNN, where N is incremented every time this file changes, to trigger secondary NS to re-fetch it.
-  # Refresh = how frequently secondary NS should query master
-  # Retry = how long secondary NS should wait until re-querying master after a failure (must be < Refresh)
-  # Expire = how long secondary NS should continue to reply to queries after master fails (> Refresh + Retry)
-  sane.dns.zones."uninsane.org".inet = {
-    SOA."@" = ''
-      ns1.uninsane.org. admin-dns.uninsane.org. (
-                                      2023092101 ; Serial
-                                      4h         ; Refresh
-                                      30m        ; Retry
-                                      7d         ; Expire
-                                      5m)        ; Negative response TTL
-    '';
-    TXT."rev" = "2023092101";
-
-    CNAME."native" = "%CNAMENATIVE%";
-    A."@" =      "%ANATIVE%";
-    A."servo.wan" = "%AWAN%";
-    A."servo.doof" = "%ADOOF%";
-    A."servo.lan" = config.sane.hosts.by-name."servo".lan-ip;
-    A."servo.hn" = config.sane.hosts.by-name."servo".wg-home.ip;
-
-    # XXX NS records must also not be CNAME
-    # it's best that we keep this identical, or a superset of, what org. lists as our NS.
-    # so, org. can specify ns2/ns3 as being to the VPN, with no mention of ns1. we provide ns1 here.
-    A."ns1" =    "%ANATIVE%";
-    A."ns2" =    "%ADOOF%";
-    A."ovpns" =  "%AOVPNS%";
-    NS."@" = [
-      "ns1.uninsane.org."
-      "ns2.uninsane.org."
-    ];
-  };
-
-  services.hickory-dns.settings.zones = builtins.attrNames config.sane.dns.zones;
-
-  networking.nat.enable = true;  #< TODO: try removing this?
-  # networking.nat.extraCommands = ''
-  #   # redirect incoming DNS requests from LAN addresses
-  #   #   to the LAN-specialized DNS service
-  #   # N.B.: use the `nixos-*` chains instead of e.g. PREROUTING
-  #   #   because they get cleanly reset across activations or `systemctl restart firewall`
-  #   #   instead of accumulating cruft
-  #   iptables -t nat -A nixos-nat-pre -p udp --dport 53 \
-  #     -m iprange --src-range 10.78.76.0-10.78.79.255 \
-  #     -j DNAT --to-destination :1053
-  #   iptables -t nat -A nixos-nat-pre -p tcp --dport 53 \
-  #     -m iprange --src-range 10.78.76.0-10.78.79.255 \
-  #     -j DNAT --to-destination :1053
-  # '';
-  # sane.ports.ports."1053" = {
-  #   # because the NAT above redirects in nixos-nat-pre, LAN requests behave as though they arrived on the external interface at the redirected port.
-  #   # TODO: try nixos-nat-post instead?
-  #   # TODO: or, don't NAT from port 53 -> port 1053, but rather nat from LAN addr to a loopback addr.
-  #   # - this is complicated in that loopback is a different interface than eth0, so rewriting the destination address would cause the packets to just be dropped by the interface
-  #   protocol = [ "udp" "tcp" ];
-  #   visibleTo.lan = true;
-  #   description = "colin-redirected-dns-for-lan-namespace";
-  # };
-
-
-  sane.services.hickory-dns.enable = true;
-  sane.services.hickory-dns.instances = let
-    mkSubstitutions = flavor: {
-      "%ADOOF%" = config.sane.netns.doof.wg.address.ipv4;
-      "%ANATIVE%" = nativeAddrs."servo.${flavor}";
-      "%AOVPNS%" = config.sane.netns.ovpns.wg.address.ipv4;
-      "%AWAN%" = "$(cat '${dyn-dns.ipPath}')";
-      "%CNAMENATIVE%" = "servo.${flavor}";
-    };
-  in
-  {
-    doof = {
-      substitutions = mkSubstitutions "doof";
-      listenAddrsIpv4 = [
-        config.sane.netns.doof.veth.initns.ipv4
-        config.sane.netns.doof.wg.address.ipv4
-        nativeAddrs."servo.lan"
-        # config.sane.netns.ovpns.veth.initns.ipv4
-      ];
-    };
-    # hn = {
-    #   substitutions = mkSubstitutions "hn";
-    #   listenAddrsIpv4 = [ nativeAddrs."servo.hn" ];
-    #   enableRecursiveResolver = true;  #< allow wireguard clients to use this as their DNS resolver
-    #   # extraConfig = {
-    #   #   zones = [
-    #   #     {
-    #   #       # forward the root zone to the local DNS resolver
-    #   #       # to allow wireguard clients to use this as their DNS resolver
-    #   #       zone = ".";
-    #   #       zone_type = "Forward";
-    #   #       stores = {
-    #   #         type = "forward";
-    #   #         name_servers = [
-    #   #           {
-    #   #             socket_addr = "127.0.0.53:53";
-    #   #             protocol = "udp";
-    #   #             trust_nx_responses = true;
-    #   #           }
-    #   #         ];
-    #   #       };
-    #   #     }
-    #   #   ];
-    #   # };
-    # };
-    # lan = {
-    #   substitutions = mkSubstitutions "lan";
-    #   listenAddrsIpv4 = [ nativeAddrs."servo.lan" ];
-    #   # port = 1053;
-    # };
-    # wan = {
-    #   substitutions = mkSubstitutions "wan";
-    #   listenAddrsIpv4 = [
-    #     nativeAddrs."servo.lan"
-    #   ];
-    # };
-  };
-
-  systemd.services.hickory-dns-doof.after = [
-    # service will fail to bind the veth, otherwise
-    "netns-doof-veth.service"
-  ];
-
-  sane.services.dyn-dns.restartOnChange = lib.map (c: "${c.service}.service") (builtins.attrValues config.sane.services.hickory-dns.instances);
-}
--- a/hosts/by-name/servo/services/jackett/default.nix
+++ b/hosts/by-name/servo/services/jackett/default.nix
@@ -1,69 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.services.jackett;
-in
-{
-  sane.persist.sys.byStore.private = [
-    # TODO: mode? we only need this to save Indexer creds ==> migrate to config?
-    { user = "jackett"; group = "jackett"; path = "/var/lib/jackett"; method = "bind"; }
-  ];
-  services.jackett.enable = true;
-
-  # run this behind the OVPN static VPN
-  sane.netns.ovpns.services = [ "jackett" ];
-  systemd.services.jackett = {
-    serviceConfig.ExecStartPre = [
-      # abort if public IP is not as expected
-      "${lib.getExe pkgs.sane-scripts.ip-check} --no-upnp --expect ${config.sane.netns.ovpns.wg.address.ipv4}"
-    ];
-    # patch in `--ListenPublic` so that it's reachable from the netns veth.
-    # this also makes it reachable from the VPN pub address. oh well.
-    serviceConfig.ExecStart = lib.mkForce "${lib.getExe' cfg.package "Jackett"} --ListenPublic --NoUpdates --DataFolder '${cfg.dataDir}'";
-    serviceConfig.RestartSec = "30s";
-
-    # hardening (systemd-analyze security jackett)
-    # TODO: upstream into nixpkgs
-    serviceConfig.StateDirectory = "jackett";
-    serviceConfig.LockPersonality = true;
-    serviceConfig.NoNewPrivileges = true;
-    # serviceConfig.MemoryDenyWriteExecute = true;  #< Failed to create CoreCLR, HRESULT: 0x80004005
-    serviceConfig.PrivateDevices = true;
-    serviceConfig.PrivateMounts = true;
-    serviceConfig.PrivateTmp = true;
-    serviceConfig.PrivateUsers = true;
-    serviceConfig.ProcSubset = "pid";
-    serviceConfig.ProtectClock = true;
-    serviceConfig.ProtectControlGroups = true;
-    serviceConfig.ProtectHome = true;
-    serviceConfig.ProtectHostname = true;
-    serviceConfig.ProtectKernelLogs = true;
-    serviceConfig.ProtectKernelModules = true;
-    serviceConfig.ProtectKernelTunables = true;
-    serviceConfig.ProtectProc = "invisible";
-    serviceConfig.ProtectSystem = "strict";
-    serviceConfig.RemoveIPC = true;
-    serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-    serviceConfig.RestrictNamespaces = true;
-    serviceConfig.RestrictSUIDSGID = true;
-    serviceConfig.SystemCallArchitectures = "native";
-    serviceConfig.SystemCallFilter = [ "@system-service" "~@privileged" ];
-  };
-
-  # jackett torrent search
-  services.nginx.virtualHosts."jackett.uninsane.org" = {
-    forceSSL = true;
-    enableACME = true;
-    # inherit kTLS;
-    locations."/" = {
-      proxyPass = "http://${config.sane.netns.ovpns.veth.netns.ipv4}:9117";
-      recommendedProxySettings = true;
-    };
-    locations."= /robots.txt".extraConfig = ''
-      return 200 "User-agent: *\nDisallow: /\n";
-    '';
-  };
-
-  sane.dns.zones."uninsane.org".inet.CNAME."jackett" = "native";
-}
-
--- a/hosts/by-name/servo/services/jellyfin/default.nix
+++ b/hosts/by-name/servo/services/jellyfin/default.nix
@@ -1,173 +0,0 @@
-# configuration options (today only a *subset* of the config is done in nix)
-# - jellyfin-web can be statically configured (result/share/jellyfin-web/config.json)
-#   - <https://jellyfin.org/docs/general/clients/web-config>
-#   - configure server list, plugins, "menuLinks", colors
-#
-# - jellfyin server is configured in /var/lib/jellfin/
-#   - root/default/<LibraryType>/
-#     - <LibraryName>.mblink: contains the directory name where this library lives
-#     - options.xml: contains preferences which were defined in the web UI during import
-#       - e.g. `EnablePhotos`, `EnableChapterImageExtraction`, etc.
-#   - config/encoding.xml: transcoder settings
-#   - config/system.xml: misc preferences like log file duration, audiobook resume settings, etc.
-#   - data/jellyfin.db: maybe account definitions? internal state?
-#
-# N.B.: default install DOES NOT SUPPORT DLNA out of the box.
-#       one must install it as a "plugin", which can be done through the UI.
-{ config, lib, ... }:
-
-# lib.mkIf false  #< XXX(2024-11-17): disabled because it hasn't been working for months; web UI hangs on load, TVs see no files
-{
-  config = lib.mkIf (config.sane.maxBuildCost >= 2) {
-    # https://jellyfin.org/docs/general/networking/index.html
-    sane.ports.ports."1900" = {
-      protocol = [ "udp" ];
-      visibleTo.lan = true;
-      description = "colin-upnp-for-jellyfin";
-    };
-    sane.ports.ports."7359" = {
-      protocol = [ "udp" ];
-      visibleTo.lan = true;
-      description = "colin-jellyfin-specific-client-discovery";
-      # ^ not sure if this is necessary: copied this port from nixos jellyfin.openFirewall
-    };
-    # not sure if 8096/8920 get used either:
-    sane.ports.ports."8096" = {
-      protocol = [ "tcp" ];
-      visibleTo.lan = true;
-      description = "colin-jellyfin-http-lan";
-    };
-    sane.ports.ports."8920" = {
-      protocol = [ "tcp" ];
-      visibleTo.lan = true;
-      description = "colin-jellyfin-https-lan";
-    };
-
-    sane.persist.sys.byStore.plaintext = [
-      { user = "jellyfin"; group = "jellyfin"; mode = "0700"; path = "/var/lib/jellyfin/data"; method = "bind"; }
-      { user = "jellyfin"; group = "jellyfin"; mode = "0700"; path = "/var/lib/jellyfin/metadata"; method = "bind"; }
-      # TODO: ship plugins statically, via nix. that'll be less fragile
-      { user = "jellyfin"; group = "jellyfin"; mode = "0700"; path = "/var/lib/jellyfin/plugins/DLNA_5.0.0.0"; method = "bind"; }
-      { user = "jellyfin"; group = "jellyfin"; mode = "0700"; path = "/var/lib/jellyfin/root"; method = "bind"; }
-    ];
-    sane.persist.sys.byStore.ephemeral = [
-      { user = "jellyfin"; group = "jellyfin"; mode = "0700"; path = "/var/lib/jellyfin/log"; method = "bind"; }
-      { user = "jellyfin"; group = "jellyfin"; mode = "0700"; path = "/var/lib/jellyfin/transcodes"; method = "bind"; }
-    ];
-
-    services.jellyfin.enable = true;
-    users.users.jellyfin.extraGroups = [ "media" ];
-
-    sane.fs."/var/lib/jellyfin".dir.acl = {
-      user = "jellyfin";
-      group = "jellyfin";
-      mode = "0700";
-    };
-
-    # `"Jellyfin.Plugin.Dlna": "Debug"` logging: <https://jellyfin.org/docs/general/networking/dlna>
-    # TODO: switch Dlna back to 'Information' once satisfied with stability
-    sane.fs."/var/lib/jellyfin/config/logging.json".symlink.text = ''
-      {
-        "Serilog": {
-          "MinimumLevel": {
-            "Default": "Information",
-            "Override": {
-              "Microsoft": "Warning",
-              "System": "Warning",
-              "Jellyfin.Plugin.Dlna": "Debug"
-            }
-          },
-          "WriteTo": [
-            {
-              "Name": "Console",
-              "Args": {
-                "outputTemplate": "[{Timestamp:HH:mm:ss}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message:lj}{NewLine}{Exception}"
-              }
-            }
-          ],
-          "Enrich": [ "FromLogContext", "WithThreadId" ]
-        }
-      }
-    '';
-
-    sane.fs."/var/lib/jellyfin/config/network.xml".file.text = ''
-      <?xml version="1.0" encoding="utf-8"?>
-      <NetworkConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-        <BaseUrl />
-        <EnableHttps>false</EnableHttps>
-        <RequireHttps>false</RequireHttps>
-        <InternalHttpPort>8096</InternalHttpPort>
-        <InternalHttpsPort>8920</InternalHttpsPort>
-        <PublicHttpPort>8096</PublicHttpPort>
-        <PublicHttpsPort>8920</PublicHttpsPort>
-        <AutoDiscovery>true</AutoDiscovery>
-        <EnableUPnP>false</EnableUPnP>
-        <EnableIPv4>true</EnableIPv4>
-        <EnableIPv6>false</EnableIPv6>
-        <EnableRemoteAccess>true</EnableRemoteAccess>
-        <LocalNetworkSubnets>
-          <string>10.78.76.0/22</string>
-        </LocalNetworkSubnets>
-        <KnownProxies>
-          <string>127.0.0.1</string>
-          <string>localhost</string>
-          <string>10.78.79.1</string>
-        </KnownProxies>
-        <IgnoreVirtualInterfaces>false</IgnoreVirtualInterfaces>
-        <VirtualInterfaceNames />
-        <EnablePublishedServerUriByRequest>false</EnablePublishedServerUriByRequest>
-        <PublishedServerUriBySubnet />
-        <RemoteIPFilter />
-        <IsRemoteIPFilterBlacklist>false</IsRemoteIPFilterBlacklist>
-      </NetworkConfiguration>
-    '';
-
-    # guest user id is `5ad194d60dca41de84b332950ffc4308`
-    sane.fs."/var/lib/jellyfin/plugins/configurations/Jellyfin.Plugin.Dlna.xml".file.text = ''
-      <?xml version="1.0" encoding="utf-8"?>
-      <DlnaPluginConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-        <EnablePlayTo>true</EnablePlayTo>
-        <ClientDiscoveryIntervalSeconds>60</ClientDiscoveryIntervalSeconds>
-        <BlastAliveMessages>true</BlastAliveMessages>
-        <AliveMessageIntervalSeconds>180</AliveMessageIntervalSeconds>
-        <SendOnlyMatchedHost>true</SendOnlyMatchedHost>
-        <DefaultUserId>5ad194d6-0dca-41de-84b3-32950ffc4308</DefaultUserId>
-      </DlnaPluginConfiguration>
-    '';
-
-    # fix LG TV to play more files.
-    # there are certain files for which it only supports Direct Play (not even "Direct Stream" -- but "Direct Play").
-    # this isn't a 100% fix: patching the profile allows e.g. Azumanga Daioh to play,
-    # but A Place Further Than the Universe still fails as before.
-    #
-    # profile is based on upstream: <https://github.com/jellyfin/jellyfin-plugin-dlna>
-    sane.fs."/var/lib/jellyfin/plugins/DLNA_5.0.0.0/profiles/LG Smart TV.xml".symlink.target = ./dlna/user/LG_Smart_TV.xml;
-    # XXX(2024-11-17): old method, but the file referenced seems not to be used and setting just it causes failures:
-    # > [DBG] Jellyfin.Plugin.Dlna.ContentDirectory.ContentDirectoryService: Not eligible for DirectPlay due to unsupported subtitles
-    # sane.fs."/var/lib/jellyfin/plugins/configurations/dlna/user/LG Smart TV.xml".symlink.target = ./dlna/user/LG_Smart_TV.xml;
-
-    systemd.services.jellyfin.unitConfig.RequiresMountsFor = [
-      "/var/media"
-    ];
-
-    # Jellyfin multimedia server
-    # this is mostly taken from the official jellfin.org docs
-    services.nginx.virtualHosts."jelly.uninsane.org" = {
-      forceSSL = true;
-      enableACME = true;
-      # inherit kTLS;
-
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:8096";
-        proxyWebsockets = true;
-        recommendedProxySettings = true;
-        # extraConfig = ''
-        #   # Disable buffering when the nginx proxy gets very resource heavy upon streaming
-        #   proxy_buffering off;
-        # '';
-      };
-    };
-
-    sane.dns.zones."uninsane.org".inet.CNAME."jelly" = "native";
-  };
-}
--- a/hosts/by-name/servo/services/jellyfin/dlna/user/LG_Smart_TV.xml
+++ b/hosts/by-name/servo/services/jellyfin/dlna/user/LG_Smart_TV.xml
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Name>LG Smart TV</Name>
-  <Identification>
-    <ModelName>LG TV</ModelName>
-    <Headers />
-  </Identification>
-  <Manufacturer>Jellyfin</Manufacturer>
-  <ManufacturerUrl>https://github.com/jellyfin/jellyfin</ManufacturerUrl>
-  <ModelName>Jellyfin Server</ModelName>
-  <ModelDescription>UPnP/AV 1.0 Compliant Media Server</ModelDescription>
-  <ModelNumber>01</ModelNumber>
-  <ModelUrl>https://github.com/jellyfin/jellyfin</ModelUrl>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
-  <EnableSingleAlbumArtLimit>false</EnableSingleAlbumArtLimit>
-  <EnableSingleSubtitleLimit>false</EnableSingleSubtitleLimit>
-  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
-  <AlbumArtPn>JPEG_SM</AlbumArtPn>
-  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
-  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
-  <MaxIconWidth>48</MaxIconWidth>
-  <MaxIconHeight>48</MaxIconHeight>
-  <MaxStreamingBitrate>140000000</MaxStreamingBitrate>
-  <MaxStaticBitrate>140000000</MaxStaticBitrate>
-  <MusicStreamingTranscodingBitrate>192000</MusicStreamingTranscodingBitrate>
-  <MaxStaticMusicBitrate xsi:nil="true" />
-  <ProtocolInfo>http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma:*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*:image/jpeg:*,http-get:*:image/png:*,http-get:*:image/gif:*,http-get:*:image/tiff:*</ProtocolInfo>
-  <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
-  <RequiresPlainVideoItems>false</RequiresPlainVideoItems>
-  <RequiresPlainFolders>false</RequiresPlainFolders>
-  <EnableMSMediaReceiverRegistrar>false</EnableMSMediaReceiverRegistrar>
-  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <XmlRootAttributes />
-  <DirectPlayProfiles>
-    <DirectPlayProfile container="ts,mpegts,avi,mkv,m2ts" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264,hevc" type="Video" />
-    <DirectPlayProfile container="mp4,m4v" audioCodec="aac,ac3,eac3,mp3,dca,dts" videoCodec="h264,mpeg4,hevc" type="Video" />
-    <DirectPlayProfile container="mp3" type="Audio" />
-    <DirectPlayProfile container="jpeg" type="Photo" />
-    <DirectPlayProfile container="" audioCodec="" videoCodec="" type="Video" />
-  </DirectPlayProfiles>
-  <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-  </TranscodingProfiles>
-  <ContainerProfiles>
-    <ContainerProfile type="Photo">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-      </Conditions>
-    </ContainerProfile>
-  </ContainerProfiles>
-  <CodecProfiles>
-    <CodecProfile type="Video" codec="mpeg4">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="Video" codec="h264">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
-        <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-    <CodecProfile type="VideoAudio" codec="ac3,eac3,aac,mp3">
-      <Conditions>
-        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" />
-      </Conditions>
-      <ApplyConditions />
-    </CodecProfile>
-  </CodecProfiles>
-  <ResponseProfiles>
-    <ResponseProfile container="m4v" type="Video" mimeType="video/mp4">
-      <Conditions />
-    </ResponseProfile>
-    <ResponseProfile container="ts,mpegts" type="Video" mimeType="video/mpeg">
-      <Conditions />
-    </ResponseProfile>
-  </ResponseProfiles>
-  <SubtitleProfiles>
-    <SubtitleProfile format="srt" method="Embed" />
-    <SubtitleProfile format="srt" method="External" />
-  </SubtitleProfiles>
-</Profile>
--- a/hosts/by-name/servo/services/kiwix-serve.nix
+++ b/hosts/by-name/servo/services/kiwix-serve.nix
@@ -1,42 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  config = lib.mkIf (config.sane.maxBuildCost >= 3) {
-    sane.services.kiwix-serve = {
-      enable = true;
-      port = 8013;
-      zimPaths = with pkgs.zimPackages; [
-        alpinelinux_en_all_maxi.zimPath
-        archlinux_en_all_maxi.zimPath
-        bitcoin_en_all_maxi.zimPath
-        devdocs_en_nix.zimPath
-        gentoo_en_all_maxi.zimPath
-        # khanacademy_en_all.zimPath  #< TODO: enable
-        openstreetmap-wiki_en_all_maxi.zimPath
-        psychonautwiki_en_all_maxi.zimPath
-        rationalwiki_en_all_maxi.zimPath
-        # wikipedia_en_100.zimPath
-        wikipedia_en_all_maxi.zimPath
-        # wikipedia_en_all_mini.zimPath
-        zimgit-food-preparation_en.zimPath
-        zimgit-medicine_en.zimPath
-        zimgit-post-disaster_en.zimPath
-        zimgit-water_en.zimPath
-      ];
-    };
-
-    services.nginx.virtualHosts."w.uninsane.org" = {
-      forceSSL = true;
-      enableACME = true;
-      # inherit kTLS;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:8013";
-        recommendedProxySettings = true;
-      };
-      locations."= /robots.txt".extraConfig = ''
-        return 200 "User-agent: *\nDisallow: /\n";
-      '';
-    };
-
-    sane.dns.zones."uninsane.org".inet.CNAME."w" = "native";
-  };
-}
--- a/hosts/by-name/servo/services/komga.nix
+++ b/hosts/by-name/servo/services/komga.nix
@@ -1,27 +0,0 @@
-{ config, lib, ... }:
-let
-  svc-cfg = config.services.komga;
-  inherit (svc-cfg) user group port stateDir;
-in
-lib.mkIf false  #< 2024/09/30: disabled because i haven't used this for several months
-{
-  sane.persist.sys.byStore.plaintext = [
-    { inherit user group; mode = "0700"; path = stateDir; method = "bind"; }
-  ];
-
-  services.komga.enable = true;
-  services.komga.port = 11319;  # chosen at random
-
-  services.nginx.virtualHosts."komga.uninsane.org" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:${builtins.toString port}";
-      recommendedProxySettings = true;
-    };
-    locations."= /robots.txt".extraConfig = ''
-      return 200 "User-agent: *\nDisallow: /\n";
-    '';
-  };
-  sane.dns.zones."uninsane.org".inet.CNAME."komga" = "native";
-}
--- a/hosts/by-name/servo/services/lemmy.nix
+++ b/hosts/by-name/servo/services/lemmy.nix
@@ -1,179 +0,0 @@
-# docs:
-# - <repo:LemmyNet/lemmy:docker/federation/nginx.conf>
-# - <repo:LemmyNet/lemmy:docker/nginx.conf>
-# - <repo:LemmyNet/lemmy-ansible:templates/nginx.conf>
-
-{ config, lib, pkgs, ... }:
-let
-  uiPort = 1234;  # default ui port is 1234
-  backendPort = 8536; # default backend port is 8536
-  #^ i guess the "backend" port is used for federation?
-  pict-rs = pkgs.pict-rs;
-  # pict-rs configuration is applied in this order:
-  # - via toml
-  # - via env vars (overrides everything above)
-  # - via CLI flags (overrides everything above)
-  # some of the CLI flags have defaults, making it the only actual way to configure certain things even when docs claim otherwise.
-  # CLI args: <https://git.asonix.dog/asonix/pict-rs#user-content-running>
-  # TOML args: <https://git.asonix.dog/asonix/pict-rs/src/branch/main/pict-rs.toml>
-  toml = pkgs.formats.toml { };
-  tomlConfig = toml.generate "pict-rs.toml" pictrsConfig;
-  pictrsConfig = {
-    media.process_timeout = 120;
-    media.video.allow_audio = true;
-    media.video.max_frame_count = 30 * 60 * 60;
-  };
-in {
-  config = lib.mkIf (config.sane.maxBuildCost >= 2) {
-    services.lemmy = {
-      enable = true;
-      settings.hostname = "lemmy.uninsane.org";
-      # federation.debug forces outbound federation queries to be run synchronously
-      # N.B.: this option might not be read for 0.17.0+? <https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions>
-      # settings.federation.debug = true;
-      settings.port = backendPort;
-      ui.port = uiPort;
-      database.createLocally = true;
-      nginx.enable = true;
-    };
-
-    systemd.services.lemmy.environment = {
-      RUST_BACKTRACE = "full";
-      RUST_LOG = "error";
-      # RUST_LOG = "warn";
-      # RUST_LOG = "debug";
-      # RUST_LOG = "trace";
-      # upstream defaults LEMMY_DATABASE_URL = "postgres:///lemmy?host=/run/postgresql";
-      # - Postgres complains that we didn't specify a user
-      # lemmy formats the url as:
-      # - postgres://{user}:{password}@{host}:{port}/{database}
-      # SO suggests (https://stackoverflow.com/questions/3582552/what-is-the-format-for-the-postgresql-connection-string-url):
-      # - postgresql://[user[:password]@][netloc][:port][/dbname][?param1=value1&...]
-      # LEMMY_DATABASE_URL = "postgres://lemmy@/run/postgresql";  # connection to server on socket "/run/postgresql/.s.PGSQL.5432" failed: FATAL:  database "run/postgresql" does not exist
-      # LEMMY_DATABASE_URL = "postgres://lemmy?host=/run/postgresql";  # no PostgreSQL user name specified in startup packet
-      # LEMMY_DATABASE_URL = lib.mkForce "postgres://lemmy@?host=/run/postgresql";  # WORKS
-      LEMMY_DATABASE_URL = lib.mkForce "postgres://lemmy@/lemmy?host=/run/postgresql";
-    };
-    users.groups.lemmy = {};
-    users.users.lemmy = {
-      group = "lemmy";
-      isSystemUser = true;
-    };
-
-    services.nginx.virtualHosts."lemmy.uninsane.org" = {
-      forceSSL = true;
-      enableACME = true;
-    };
-
-    sane.dns.zones."uninsane.org".inet.CNAME."lemmy" = "native";
-
-    systemd.services.lemmy = {
-      # fix to use a normal user so we can configure perms correctly
-      # XXX(2024-07-28): this hasn't been rigorously tested:
-      # possible that i've set something too strict and won't notice right away
-      serviceConfig.DynamicUser = lib.mkForce false;
-      serviceConfig.User = "lemmy";
-      serviceConfig.Group = "lemmy";
-
-      # switch postgres from Requires -> Wants, so that postgres may restart without taking lemmy down with it.
-      requires = lib.mkForce [];
-      wants = [ "postgresql.service" ];
-
-      # hardening (systemd-analyze security lemmy)
-      # a handful of these are specified in upstream nixpkgs, but mostly not
-      serviceConfig.LockPersonality = true;
-      serviceConfig.NoNewPrivileges = true;
-      serviceConfig.MemoryDenyWriteExecute = true;
-      serviceConfig.PrivateDevices = true;
-      serviceConfig.PrivateMounts = true;
-      serviceConfig.PrivateTmp = true;
-      serviceConfig.PrivateUsers = true;
-      serviceConfig.ProcSubset = "pid";
-
-      serviceConfig.ProtectClock = true;
-      serviceConfig.ProtectControlGroups = true;
-      serviceConfig.ProtectHome = true;
-      serviceConfig.ProtectHostname = true;
-      serviceConfig.ProtectKernelLogs = true;
-      serviceConfig.ProtectKernelModules = true;
-      serviceConfig.ProtectKernelTunables = true;
-      serviceConfig.ProtectProc = "invisible";
-      serviceConfig.ProtectSystem = "strict";
-      serviceConfig.RemoveIPC = true;
-      serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-
-      serviceConfig.RestrictNamespaces = true;
-      serviceConfig.RestrictSUIDSGID = true;
-      serviceConfig.SystemCallArchitectures = "native";
-      serviceConfig.SystemCallFilter = [ "@system-service" ];
-    };
-
-    systemd.services.lemmy-ui = {
-      # hardening (systemd-analyze security lemmy-ui)
-      # TODO: upstream into nixpkgs
-      serviceConfig.LockPersonality = true;
-      serviceConfig.NoNewPrivileges = true;
-      # serviceConfig.MemoryDenyWriteExecute = true;  #< it uses v8, JIT
-      serviceConfig.PrivateDevices = true;
-      serviceConfig.PrivateMounts = true;
-      serviceConfig.PrivateTmp = true;
-      serviceConfig.PrivateUsers = true;
-      serviceConfig.ProcSubset = "pid";
-
-      serviceConfig.ProtectClock = true;
-      serviceConfig.ProtectControlGroups = true;
-      serviceConfig.ProtectHome = true;
-      serviceConfig.ProtectHostname = true;
-      serviceConfig.ProtectKernelLogs = true;
-      serviceConfig.ProtectKernelModules = true;
-      serviceConfig.ProtectKernelTunables = true;
-      serviceConfig.ProtectProc = "invisible";
-      serviceConfig.ProtectSystem = "strict";
-      serviceConfig.RemoveIPC = true;
-      serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-
-      serviceConfig.RestrictNamespaces = true;
-      serviceConfig.RestrictSUIDSGID = true;
-      serviceConfig.SystemCallArchitectures = "native";
-      serviceConfig.SystemCallFilter = [ "@system-service" "@pkey" "@sandbox" ];
-    };
-
-    #v DO NOT REMOVE: defaults to 0.3, instead of latest, so always need to explicitly set this.
-    services.pict-rs.package = pict-rs;
-
-    systemd.services.pict-rs = {
-      serviceConfig.ExecStart = lib.mkForce (lib.concatStringsSep " " [
-        (lib.getExe pict-rs)
-        "--config-file"
-        tomlConfig
-        "run"
-      ]);
-
-      # hardening (systemd-analyze security pict-rs)
-      # TODO: upstream into nixpkgs
-      serviceConfig.LockPersonality = true;
-      serviceConfig.NoNewPrivileges = true;
-      serviceConfig.MemoryDenyWriteExecute = true;
-      serviceConfig.PrivateDevices = true;
-      serviceConfig.PrivateMounts = true;
-      serviceConfig.PrivateTmp = true;
-      serviceConfig.PrivateUsers = true;
-      serviceConfig.ProcSubset = "pid";
-      serviceConfig.ProtectClock = true;
-      serviceConfig.ProtectControlGroups = true;
-      serviceConfig.ProtectHome = true;
-      serviceConfig.ProtectHostname = true;
-      serviceConfig.ProtectKernelLogs = true;
-      serviceConfig.ProtectKernelModules = true;
-      serviceConfig.ProtectKernelTunables = true;
-      serviceConfig.ProtectProc = "invisible";
-      serviceConfig.ProtectSystem = "strict";
-      serviceConfig.RemoveIPC = true;
-      serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-      serviceConfig.RestrictNamespaces = true;
-      serviceConfig.RestrictSUIDSGID = true;
-      serviceConfig.SystemCallArchitectures = "native";
-      serviceConfig.SystemCallFilter = [ "@system-service" ];
-    };
-  };
-}
--- a/hosts/by-name/servo/services/matrix/default.nix
+++ b/hosts/by-name/servo/services/matrix/default.nix
@@ -1,175 +0,0 @@
-# docs: <https://nixos.wiki/wiki/Matrix>
-# docs: <https://nixos.org/manual/nixos/stable/index.html#module-services-matrix-synapse>
-# example config: <https://github.com/element-hq/synapse/blob/develop/docs/sample_config.yaml>
-#
-# ENABLING PUSH NOTIFICATIONS (with UnifiedPush/ntfy):
-# - Matrix "pushers" API spec: <https://spec.matrix.org/latest/client-server-api/#post_matrixclientv3pushersset>
-# - first, view notification settings:
-#   - obtain your client's auth token. e.g. Element -> profile -> help/about -> access token.
-#   - `curl --header 'Authorization: Bearer <your_access_token>' localhost:8008/_matrix/client/v3/pushers | jq .`
-# - enable a new notification destination:
-#   - `curl --header "Authorization: Bearer <your_access_token>" --data '{ "app_display_name": "<topic>", "app_id": "ntfy.uninsane.org", "data": { "url": "https://ntfy.uninsane.org/_matrix/push/v1/notify", "format": "event_id_only" }, "device_display_name": "<topic>", "kind": "http", "lang": "en-US", "profile_tag": "", "pushkey": "<topic>" }' localhost:8008/_matrix/client/v3/pushers/set`
-# - delete a notification destination by setting `kind` to `null` (otherwise, request is identical to above)
-#
-{ config, lib, pkgs, ... }:
-let
-  ntfy = config.services.ntfy-sh.enable;
-in
-{
-  imports = [
-    ./discord-puppet.nix
-    ./irc.nix
-    ./signal.nix
-  ];
-
-  sane.persist.sys.byStore.private = [
-    { user = "matrix-synapse"; group = "matrix-synapse"; path = "/var/lib/matrix-synapse"; method = "bind"; }
-  ];
-  services.matrix-synapse.enable = true;
-  services.matrix-synapse.log.root.level = "ERROR";  # accepts "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL" (?)
-  services.matrix-synapse.settings = {
-    server_name = "uninsane.org";
-
-    # services.matrix-synapse.enable_registration_captcha = true;
-    # services.matrix-synapse.enable_registration_without_verification = true;
-    # enable_registration = true;
-    # services.matrix-synapse.registration_shared_secret = "<shared key goes here>";
-
-    # default for listeners is port = 8448, tls = true, x_forwarded = false.
-    # we change this because the server is situated behind nginx.
-    listeners = [
-      {
-        port = 8008;
-        bind_addresses = [ "127.0.0.1" ];
-        type = "http";
-        tls = false;
-        x_forwarded = true;
-        resources = [
-          {
-            names = [ "client" "federation" ];
-            compress = false;
-          }
-        ];
-      }
-    ];
-
-    ip_range_whitelist = [
-      # to communicate with ntfy.uninsane.org push notifs.
-      # TODO: move this to some non-shared loopback device: we don't want Matrix spouting http requests to *anything* on this machine
-      "10.78.79.51"
-    ];
-
-    x_forwarded = true;  # because we proxy matrix behind nginx
-    max_upload_size = "100M";  # default is "50M"
-
-    admin_contact = "admin.matrix@uninsane.org";
-    registrations_require_3pid = [ "email" ];
-  };
-
-  services.matrix-synapse.extraConfigFiles = [
-    config.sops.secrets."matrix_synapse_secrets.yaml".path
-  ];
-
-  # tune restart settings to ensure systemd doesn't disable it, and we don't overwhelm postgres
-  systemd.services.matrix-synapse.serviceConfig.RestartSec = 5;
-  systemd.services.matrix-synapse.serviceConfig.RestartMaxDelaySec = 20;
-  systemd.services.matrix-synapse.serviceConfig.StartLimitBurst = 120;
-  systemd.services.matrix-synapse.serviceConfig.RestartSteps = 3;
-  # switch postgres from Requires -> Wants, so that postgres may restart without taking matrix down with it.
-  systemd.services.matrix-synapse.requires = lib.mkForce [];
-  systemd.services.matrix-synapse.wants = [ "postgresql.service" ];
-
-  systemd.services.matrix-synapse.postStart = lib.optionalString ntfy ''
-    ACCESS_TOKEN=$(${lib.getExe' pkgs.coreutils "cat"} ${config.sops.secrets.matrix_access_token.path})
-    TOPIC=$(${lib.getExe' pkgs.coreutils "cat"} ${config.sops.secrets.ntfy-sh-topic.path})
-
-    echo "ensuring ntfy push gateway"
-    ${lib.getExe pkgs.curl} \
-      --header "Authorization: Bearer $ACCESS_TOKEN" \
-      --data "{ \"app_display_name\": \"ntfy-adapter\", \"app_id\": \"ntfy.uninsane.org\", \"data\": { \"url\": \"https://ntfy.uninsane.org/_matrix/push/v1/notify\", \"format\": \"event_id_only\" }, \"device_display_name\": \"ntfy-adapter\", \"kind\": \"http\", \"lang\": \"en-US\", \"profile_tag\": \"\", \"pushkey\": \"$TOPIC\" }" \
-      localhost:8008/_matrix/client/v3/pushers/set
-
-    echo "registered push gateways:"
-    ${lib.getExe pkgs.curl} \
-      --header "Authorization: Bearer $ACCESS_TOKEN" \
-      localhost:8008/_matrix/client/v3/pushers \
-      | ${lib.getExe pkgs.jq} .
-  '';
-
-
-  # new users may be registered on the CLI:
-  #   register_new_matrix_user -c /nix/store/8n6kcka37jhmi4qpd2r03aj71pkyh21s-homeserver.yaml http://localhost:8008
-  #
-  # or provide an registration token then can use to register through the client.
-  #   docs: https://github.com/matrix-org/synapse/blob/develop/docs/usage/administration/admin_api/registration_tokens.md
-  # first, grab your own user's access token (Help & About section in Element). then:
-  #   curl --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens
-  # create a token with unlimited uses:
-  #   curl -d '{}' --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens/new
-  # create a token with limited uses:
-  #   curl -d '{ "uses_allowed": 1 }' --header "Authorization: Bearer <my_token>" localhost:8008/_synapse/admin/v1/registration_tokens/new
-
-  # matrix chat server
-  # TODO: was `publog`
-  services.nginx.virtualHosts."matrix.uninsane.org" = {
-    addSSL = true;
-    enableACME = true;
-    # inherit kTLS;
-
-    # TODO colin: replace this with something helpful to the viewer
-    # locations."/".extraConfig = ''
-    #   return 404;
-    # '';
-
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:8008";
-      recommendedProxySettings = true;
-      extraConfig = ''
-        # allow uploading large files (matrix enforces a separate limit, downstream)
-        client_max_body_size  512m;
-      '';
-    };
-    # redirect browsers to the web client.
-    # i don't think native matrix clients ever fetch the root.
-    # ideally this would be put behind some user-agent test though.
-    locations."= /" = {
-      return = "301 https://web.matrix.uninsane.org";
-    };
-
-    # locations."/_matrix" = {
-    #   proxyPass = "http://127.0.0.1:8008";
-    # };
-  };
-
-  # matrix web client
-  # docs: https://nixos.org/manual/nixos/stable/index.html#module-services-matrix-element-web
-  services.nginx.virtualHosts."web.matrix.uninsane.org" = {
-    forceSSL = true;
-    enableACME = true;
-    # inherit kTLS;
-
-    root = pkgs.element-web.override {
-      conf = {
-        default_server_config."m.homeserver" = {
-          "base_url" = "https://matrix.uninsane.org";
-          "server_name" = "uninsane.org";
-        };
-      };
-    };
-  };
-
-  sane.dns.zones."uninsane.org".inet = {
-    CNAME."matrix" = "native";
-    CNAME."web.matrix" = "native";
-  };
-
-
-  sops.secrets."matrix_synapse_secrets.yaml" = {
-    owner = config.users.users.matrix-synapse.name;
-  };
-  sops.secrets."matrix_access_token" = {
-    owner = config.users.users.matrix-synapse.name;
-  };
-  # provide access to ntfy-sh-topic secret
-  users.users.matrix-synapse.extraGroups = lib.optionals ntfy [ "ntfy-sh" ];
-}
--- a/hosts/by-name/servo/services/matrix/irc-no-reveal-bridge.patch
+++ b/hosts/by-name/servo/services/matrix/irc-no-reveal-bridge.patch
@@ -1,13 +0,0 @@
-diff --git a/src/irc/ConnectionInstance.ts b/src/irc/ConnectionInstance.ts
-index 688036ca..3373fa27 100644
--- a/src/irc/ConnectionInstance.ts
-+++ b/src/irc/ConnectionInstance.ts
-@@ -149,7 +149,7 @@ export class ConnectionInstance {
-         if (this.dead) {
-             return Promise.resolve();
-         }
-        ircReason = ircReason || reason;
-+        ircReason = "bye"; // don't reveal through the IRC quit message that we're a bridge
-         log.info(
-             "disconnect()ing %s@%s - %s", this.nick, this.domain, reason
-         );
--- a/hosts/by-name/servo/services/matrix/irc-no-reveal-mxid.patch
+++ b/hosts/by-name/servo/services/matrix/irc-no-reveal-mxid.patch
@@ -1,50 +0,0 @@
-diff --git a/config.schema.yml b/config.schema.yml
-index 2e71c8d6..42ba8ba1 100644
--- a/config.schema.yml
-+++ b/config.schema.yml
-@@ -433,7 +433,7 @@ properties:
-                                     type: "boolean"
-                                 realnameFormat:
-                                     type: "string"
-                                    enum: ["mxid","reverse-mxid"]
-+                                    enum: ["mxid","reverse-mxid","localpart"]
-                                 ipv6:
-                                     type: "object"
-                                     properties:
-diff --git a/src/irc/IdentGenerator.ts b/src/irc/IdentGenerator.ts
-index 7a2b5cf1..50f7815a 100644
--- a/src/irc/IdentGenerator.ts
-+++ b/src/irc/IdentGenerator.ts
-@@ -74,6 +74,9 @@ export class IdentGenerator {
-         else if (server.getRealNameFormat() === "reverse-mxid") {
-             realname = IdentGenerator.sanitiseRealname(IdentGenerator.switchAroundMxid(matrixUser));
-         }
-+        else if (server.getRealNameFormat() == "localpart") {
-+            realname = IdentGenerator.sanitiseRealname(matrixUser.localpart);
-+        }
-         else {
-             throw Error('Invalid value for realNameFormat');
-         }
-diff --git a/src/irc/IrcServer.ts b/src/irc/IrcServer.ts
-index 2af73ab4..895b9783 100644
--- a/src/irc/IrcServer.ts
-+++ b/src/irc/IrcServer.ts
-@@ -101,7 +101,7 @@ export interface IrcServerConfig {
-         };
-         lineLimit: number;
-         userModes?: string;
-        realnameFormat?: "mxid"|"reverse-mxid";
-+        realnameFormat?: "mxid"|"reverse-mxid"|"localpart";
-         pingTimeoutMs: number;
-         pingRateMs: number;
-         kickOn: {
-@@ -289,7 +289,7 @@ export class IrcServer {
-         return this.config.ircClients.userModes || "";
-     }
- 
-    public getRealNameFormat(): "mxid"|"reverse-mxid" {
-+    public getRealNameFormat(): "mxid"|"reverse-mxid"|"localpart" {
-         return this.config.ircClients.realnameFormat || "mxid";
-     }
- 
-
--- a/hosts/by-name/servo/services/matrix/irc.nix
+++ b/hosts/by-name/servo/services/matrix/irc.nix
@@ -1,194 +0,0 @@
-# config docs:
-# - <https://github.com/matrix-org/matrix-appservice-irc/blob/develop/config.sample.yaml>
-{ lib, ... }:
-
-let
-  ircServer = { name, additionalAddresses ? [], ssl ? true, sasl ? true, port ? if ssl then 6697 else 6667 }: let
-    lowerName = lib.toLower name;
-  in {
-    # XXX sasl: appservice doesn't support NickServ identification (only SASL, or PASS if sasl = false)
-    inherit additionalAddresses name port sasl ssl;
-    botConfig = {
-      # bot has no presence in IRC channel; only real Matrix users
-      enabled = false;
-      # this is the IRC username/nickname *of the bot* (not visible in channels): not of the end-user.
-      # the irc username/nick of a mapped Matrix user is determined further down in `ircClients` section.
-      # if `enabled` is false, then this name probably never shows up on the IRC side (?)
-      nick = "uninsane";
-      username = "uninsane";
-      joinChannelsIfNoUsers = false;
-    };
-    dynamicChannels = {
-      enabled = true;
-      aliasTemplate = "#irc_${lowerName}_$CHANNEL";
-      published = false;  # false => irc rooms aren't listed in homeserver public rooms list
-      federate = false;  # false => Matrix users from other homeservers can't join IRC channels
-    };
-    ircClients = {
-      nickTemplate = "$LOCALPARTsane";  # @colin:uninsane.org (Matrix) -> colinsane (IRC)
-      realnameFormat = "reverse-mxid";  # @colin:uninsane.org (Matrix) -> org.uninsane:colin (IRC)
-      # realnameFormat = "localpart";  # @colin:uninsane.org (Matrix) -> colin (IRC)  -- but requires the mxid patch below
-      # by default, Matrix will convert messages greater than (3) lines into a pastebin-like URL to send to IRC.
-      lineLimit = 20;
-      # Rizon in particular allows only 4 connections from one IP before a 30min ban.
-      # that's effectively reduced to 2 during a netsplit, or maybe during a restart.
-      #   - https://wiki.rizon.net/index.php?title=Connection/Session_Limit_Exemptions
-      # especially, misconfigurations elsewhere in this config may cause hundreds of connections
-      # so this is a safeguard.
-      maxClients = 2;
-      # don't have the bridge disconnect me from IRC when idle.
-      idleTimeout = 0;
-      concurrentReconnectLimit = 2;
-      reconnectIntervalMs = 60000;
-      kickOn = {
-        # remove Matrix user from room when...
-        channelJoinFailure = false;
-        ircConnectionFailure = false;
-        userQuit = true;
-      };
-    };
-    matrixClients = {
-      userTemplate = "@irc_${lowerName}_$NICK";  # the :uninsane.org part is appended automatically
-    };
-
-    # this will let this user message the appservice with `!join #<IRCChannel>` and the rest "Just Works"
-    "@colin:uninsane.org" = "admin";
-
-    membershipLists = {
-      enabled = true;
-      global = {
-        ircToMatrix = {
-          initial = true;
-          incremental = true;
-          requireMatrixJoined = false;
-        };
-        matrixToIrc = {
-          initial = true;
-          incremental = true;
-        };
-      };
-      ignoreIdleUsersOnStartup = {
-        enabled = false;  # false => always bridge users, even if idle
-      };
-    };
-    # sync room description?
-    bridgeInfoState = {
-      enabled = true;
-      initial = true;
-    };
-
-    # for per-user IRC password:
-    # - invite @irc_${lowerName}_NickServ:uninsane.org to a DM and type `help`  => register
-    # - invite the matrix-appservice-irc user to a DM and type `!help`   => add PW to database
-    # to validate that i'm authenticated on the IRC network, DM @irc_${lowerName}_NickServ:uninsane.org:
-    # - send: `STATUS colinsane`
-    # - response should be `3`: "user recognized as owner via password identification"
-    # passwordEncryptionKeyPath = "/path/to/privkey";  # appservice will generate its own if unspecified
-  };
-in
-{
-
-  nixpkgs.overlays = [
-    (next: prev: {
-      matrix-appservice-irc = prev.matrix-appservice-irc.overrideAttrs (super: {
-        patches = super.patches or [] ++ [
-          ./irc-no-reveal-bridge.patch
-          # ./irc-no-reveal-mxid.patch
-        ];
-      });
-    })
-  ];
-
-  sane.persist.sys.byStore.private = [
-    # TODO: mode?
-    { user = "matrix-appservice-irc"; group = "matrix-appservice-irc"; path = "/var/lib/matrix-appservice-irc"; method = "bind"; }
-  ];
-
-  # XXX: matrix-appservice-irc PreStart tries to chgrp the registration.yml to matrix-synapse,
-  # which requires matrix-appservice-irc to be of that group
-  users.users.matrix-appservice-irc.extraGroups = [ "matrix-synapse" ];
-  # weird race conditions around registration.yml mean we want matrix-synapse to be of matrix-appservice-irc group too.
-  users.users.matrix-synapse.extraGroups = [ "matrix-appservice-irc" ];
-
-  services.matrix-synapse.settings.app_service_config_files = [
-    "/var/lib/matrix-appservice-irc/registration.yml"  # auto-created by irc appservice
-  ];
-
-  services.matrix-appservice-irc.enable = true;
-  services.matrix-appservice-irc.registrationUrl = "http://127.0.0.1:8009";
-  services.matrix-appservice-irc.settings = {
-    homeserver = {
-      url = "http://127.0.0.1:8008";
-      dropMatrixMessagesAfterSecs = 300;
-      domain = "uninsane.org";
-      enablePresence = true;
-      bindPort = 9999;
-      bindHost = "127.0.0.1";
-    };
-
-    ircService = {
-      logging.level = "warn";  # "error", "warn", "info", "debug"
-      mediaProxy.publicUrl = "https://irc.matrix.uninsane.org/media";
-      servers = {
-        "irc.esper.net" = ircServer {
-          name = "esper";
-          sasl = false;
-          # notable channels:
-          # - #merveilles
-        };
-        "irc.libera.chat" = ircServer {
-          name = "libera";
-          sasl = false;
-          # notable channels:
-          # - #hare
-          # - #mnt-reform
-        };
-        "irc.myanonamouse.net" = ircServer {
-          name = "MyAnonamouse";
-          additionalAddresses = [ "irc2.myanonamouse.net" ];
-          sasl = false;
-        };
-        "irc.oftc.net" = ircServer {
-          name = "oftc";
-          sasl = false;
-          # notable channels:
-          # - #sxmo
-          # - #sxmo-offtopic
-          # supposedly also available at <irc://37lnq2veifl4kar7.onion:6667/> (unofficial)
-        };
-        "irc.rizon.net" = ircServer { name = "Rizon"; };
-        # "irc.sdf.org" = ircServer {
-        #   # XXX(2024-11-06): seems it can't connect. "matrix-appservice-irc: WARN:Provisioner Provisioner only handles text 'yes'/'y' (from BASHy2-EU on irc.sdf.org)"
-        #   # use instead? <https://lemmy.sdf.org/c/sdfpubnix>
-        #   name = "sdf";
-        #   # sasl = false;
-        #   # notable channels (see: <https://sdf.org/?tutorials/irc-channels>)
-        #   # - #sdf
-        # };
-        "wigle.net" = ircServer {
-          name = "WiGLE";
-          ssl = false;
-        };
-      };
-    };
-  };
-
-  systemd.services.matrix-appservice-irc.serviceConfig = {
-    # XXX 2023/06/20: nixos specifies this + @aio and @memlock as forbidden
-    # the service actively uses at least one of these, and both of them are fairly innocuous
-    SystemCallFilter = lib.mkForce "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @setuid @swap";
-  };
-
-  services.nginx.virtualHosts."irc.matrix.uninsane.org" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/media" = {
-      proxyPass = "http://127.0.0.1:11111";
-      recommendedProxySettings = true;
-    };
-  };
-
-  sane.dns.zones."uninsane.org".inet = {
-    CNAME."irc.matrix" = "native";
-  };
-}
--- a/hosts/by-name/servo/services/matrix/signal.nix
+++ b/hosts/by-name/servo/services/matrix/signal.nix
@@ -1,39 +0,0 @@
-# config options:
-# - <https://github.com/mautrix/signal/blob/master/mautrix_signal/example-config.yaml>
-{ config, lib, pkgs, ... }:
-
-lib.mkIf false  # disabled 2024/01/11: i don't use it, and pkgs.mautrix-signal had some API changes
-{
-  sane.persist.sys.byStore.private = [
-    { user = "mautrix-signal"; group = "mautrix-signal"; path = "/var/lib/mautrix-signal"; method = "bind"; }
-    { user = "signald"; group = "signald"; path = "/var/lib/signald"; method = "bind"; }
-  ];
-
-  # allow synapse to read the registration file
-  users.users.matrix-synapse.extraGroups = [ "mautrix-signal" ];
-
-  services.signald.enable = true;
-  services.mautrix-signal.enable = true;
-  services.mautrix-signal.environmentFile =
-    config.sops.secrets.mautrix_signal_env.path;
-
-  services.mautrix-signal.settings.signal.socket_path = "/run/signald/signald.sock";
-  services.mautrix-signal.settings.homeserver.domain = "uninsane.org";
-  services.mautrix-signal.settings.bridge.permissions."@colin:uninsane.org" = "admin";
-  services.matrix-synapse.settings.app_service_config_files = [
-    # auto-created by mautrix-signal service
-    "/var/lib/mautrix-signal/signal-registration.yaml"
-  ];
-
-  systemd.services.mautrix-signal.serviceConfig = {
-    # allow communication to signald
-    SupplementaryGroups = [ "signald" ];
-    ReadWritePaths = [ "/run/signald" ];
-  };
-
-  sops.secrets."mautrix_signal_env" = {
-    mode = "0440";
-    owner = config.users.users.mautrix-signal.name;
-    group = config.users.users.matrix-synapse.name;
-  };
-}
--- a/hosts/by-name/servo/services/minidlna.nix
+++ b/hosts/by-name/servo/services/minidlna.nix
@@ -1,39 +0,0 @@
-# - `man 5 minidlna.conf`
-# - `man 8 minidlnad`
-#
-# this is an extremely simple (but limited) DLNA server:
-# - no web UI
-# - no runtime configuration -- just statically configure media directories instead
-# - no transcoding
-# compatibility:
-# - LG TV: music: all working
-# - LG TV: videos: mixed. i can't see the pattern; HEVC works; H.264 sometimes works.
-{ lib, ... }:
-lib.mkIf false  #< XXX(2024-11-17): WORKS, but i'm trying gerbera instead for hopefully better transcoding
-{
-  sane.ports.ports."1900" = {
-    protocol = [ "udp" ];
-    visibleTo.lan = true;
-    description = "colin-upnp-for-minidlna";
-  };
-  sane.ports.ports."8200" = {
-    protocol = [ "tcp" ];
-    visibleTo.lan = true;
-    description = "colin-minidlna-http";
-  };
-
-  services.minidlna.enable = true;
-
-  services.minidlna.settings = {
-    media_dir = [
-      # A/V/P to restrict a directory to audio/video/pictures
-      "A,/var/media/Music"
-      "V,/var/media/Videos/Film"
-      # "V,/var/media/Videos/Milkbags"
-      "V,/var/media/Videos/Shows"
-    ];
-    notify_interval = 60;
-  };
-
-  users.users.minidlna.extraGroups = [ "media" ];
-}
--- a/hosts/by-name/servo/services/mumble.nix
+++ b/hosts/by-name/servo/services/mumble.nix
@@ -1,66 +0,0 @@
-# murmur is the server component of mumble.
-# - docs: <https://www.mumble.info/documentation/>
-# - config docs: <https://www.mumble.info/documentation/administration/config-file/>
-#
-# default port is 64738 (UDP and TCP)
-#
-# FIRST-RUN:
-# - login from mumble client as `SuperUser`, password taken from `journalctl -u murmur`.
-# - login from another machine and right click on self -> 'Register'
-# - as SuperUser, right click on server root -> edit
-#   - Groups tab: select "admin", then add the other registered user to the group.
-# - log out as SuperUser and manage the server using that other user now.
-#
-# USAGE:
-# - 'auth' group = any user who has registered a cert with the server.
-{ ... }:
-{
-  sane.persist.sys.byStore.private = [
-    { user = "murmur"; group = "murmur"; mode = "0700"; path = "/var/lib/murmur"; method = "bind"; }
-  ];
-
-  services.murmur.enable = true;
-  services.murmur.welcometext = "welcome to Colin's mumble voice chat server";
-  # max bandwidth (bps) **per user**. i believe this affects both voice and uploads?
-  # mumble defaults to 558000, but nixos service defaults to 72000.
-  services.murmur.bandwidth = 558000;
-  services.murmur.imgMsgLength = 8 * 1024 * 1024;
-
-  services.murmur.sslCert = "/var/lib/acme/mumble.uninsane.org/fullchain.pem";
-  services.murmur.sslKey = "/var/lib/acme/mumble.uninsane.org/key.pem";
-  services.murmur.sslCa = "/etc/ssl/certs/ca-bundle.crt";
-
-  # allow clients on the LAN to discover this server
-  services.murmur.bonjour = true;
-
-  # mumble has a public server listing.
-  # my server doesn't associate with that registry (unless i specify registerPassword).
-  # however these settings appear to affect how the server presents itself to clients, regardless of registration.
-  services.murmur.registerName = "mumble.uninsane.org";
-  services.murmur.registerUrl = "https://mumble.uninsane.org";
-  services.murmur.registerHostname = "mumble.uninsane.org";
-
-  # defaultchannel=ID makes it so that unauthenticated users are placed in some specific channel when they join
-  services.murmur.extraConfig = ''
-    defaultchannel=2
-  '';
-
-  users.users.murmur.extraGroups = [
-    "nginx"  # provide access to certs
-  ];
-  services.nginx.virtualHosts."mumble.uninsane.org" = {
-    # allow ACME to procure a cert via nginx for this domain
-    enableACME = true;
-  };
-
-  sane.dns.zones."uninsane.org".inet = {
-    CNAME."mumble" = "native";
-  };
-
-  sane.ports.ports."64738" = {
-    protocol = [ "tcp" "udp" ];
-    visibleTo.lan = true;
-    visibleTo.doof = true;
-    description = "colin-mumble";
-  };
-}
--- a/hosts/by-name/servo/services/navidrome.nix
+++ b/hosts/by-name/servo/services/navidrome.nix
@@ -1,44 +0,0 @@
-{ lib, ... }:
-
-lib.mkIf false  #< i don't actively use navidrome
-{
-  sane.persist.sys.byStore.plaintext = [
-    { user = "navidrome"; group = "navidrome"; path = "/var/lib/navidrome"; method = "bind"; }
-  ];
-  services.navidrome.enable = true;
-  services.navidrome.settings = {
-    # docs: https://www.navidrome.org/docs/usage/configuration-options/
-    Address = "127.0.0.1";
-    Port = 4533;
-    MusicFolder = "/var/media/Music";
-    CovertArtPriority = "*.jpg, *.JPG, *.png, *.PNG, embedded";
-    AutoImportPlaylists = false;
-    ScanSchedule = "@every 1h";
-  };
-
-  systemd.services.navidrome.serviceConfig = {
-    # fix to use a normal user so we can configure perms correctly
-    DynamicUser = lib.mkForce false;
-    User = "navidrome";
-    Group = "navidrome";
-  };
-
-  users.groups.navidrome = {};
-
-  users.users.navidrome = {
-    group = "navidrome";
-    isSystemUser = true;
-  };
-
-  services.nginx.virtualHosts."music.uninsane.org" = {
-    forceSSL = true;
-    enableACME = true;
-    # inherit kTLS;
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:4533";
-      recommendedProxySettings = true;
-    };
-  };
-
-  sane.dns.zones."uninsane.org".inet.CNAME."music" = "native";
-}
--- a/hosts/by-name/servo/services/nginx/default.nix
+++ b/hosts/by-name/servo/services/nginx/default.nix
@@ -1,111 +0,0 @@
-# docs: <https://nixos.wiki/wiki/Nginx>
-# docs: <https://nginx.org/en/docs/>
-{ lib, pkgs, ... }:
-{
-  imports = [
-    ./uninsane.org.nix
-    ./waka.laka.osaka
-  ];
-
-  sane.ports.ports."80" = {
-    protocol = [ "tcp" ];
-    visibleTo.lan = true;
-    visibleTo.ovpns = true;  # so that letsencrypt can procure a cert for the mx record
-    visibleTo.doof = true;
-    description = "colin-http-uninsane.org";
-  };
-  sane.ports.ports."443" = {
-    protocol = [ "tcp" ];
-    visibleTo.lan = true;
-    visibleTo.doof = true;
-    description = "colin-https-uninsane.org";
-  };
-
-  services.nginx.enable = true;
-
-  users.users.nginx.extraGroups = [ "anubis" ];
-  # nginxStable is one release behind nginxMainline.
-  # nginx itself recommends running mainline; nixos defaults to stable.
-  # services.nginx.package = pkgs.nginxMainline;
-  # XXX(2024-07-31): nixos defaults to zlib-ng -- supposedly more performant, but spams log with
-  # "gzip filter failed to use preallocated memory: ..."
-  # XXX(2025-07-24): "gzip filter" spam is gone => use default nginx package
-  # services.nginx.package = pkgs.nginxMainline.override { zlib = pkgs.zlib; };
-  services.nginx.appendConfig = ''
-    # use 1 process per core.
-    # may want to increase worker_connections too, but `ulimit -n` must be increased first.
-    worker_processes auto;
-  '';
-
-  # this is the standard `combined` log format, with the addition of $host
-  # so that we have the virtualHost in the log.
-  # KEEP IN SYNC WITH GOACCESS
-  # goaccess calls this VCOMBINED:
-  # - <https://gist.github.com/jyap808/10570005>
-  services.nginx.commonHttpConfig = ''
-    log_format vcombined '$host:$server_port $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referrer" "$http_user_agent"';
-    access_log /var/log/nginx/private.log vcombined;
-  '';
-  # enables gzip and sets gzip_comp_level = 5
-  services.nginx.recommendedGzipSettings = true;
-  # enables zstd and sets zstd_comp_level = 9
-  # services.nginx.recommendedZstdSettings = true;  #< XXX(2025-07-18): nginx zstd integration is unmaintained in NixOS
-  # enables OCSP stapling (so clients don't need contact the OCSP server -- i do instead)
-  # - doesn't seem to, actually: <https://www.ssllabs.com/ssltest/analyze.html?d=uninsane.org>
-  # caches TLS sessions for 10m
-  services.nginx.recommendedTlsSettings = true;
-  # enables sendfile, tcp_nopush, tcp_nodelay, keepalive_timeout 65
-  services.nginx.recommendedOptimisation = true;
-
-
-  # serve any site not otherwise declared, if it's static.
-  # because we define it dynamically, SSL isn't trivial. support only http
-  # documented <https://nginx.org/en/docs/http/ngx_http_core_module.html#server_name>
-  services.nginx.virtualHosts."~^(?<domain>.+)$" = {
-    default = true;
-    addSSL = true;
-    enableACME = false;
-    sslCertificate = "/var/www/certs/wildcard/cert.pem";
-    sslCertificateKey = "/var/www/certs/wildcard/key.pem";
-    # sslCertificate = "/var/lib/acme/.minica/cert.pem";
-    # sslCertificateKey = "/var/lib/acme/.minica/key.pem";
-    # serverName = null;
-    locations."/" = {
-      # somehow this doesn't escape -- i get error 400 if i:
-      # curl 'http://..' --resolve '..:80:127.0.0.1'
-      root = "/var/www/sites/$domain";
-      # tryFiles = "$domain/$uri $domain/$uri/ =404";
-    };
-  };
-
-  security.acme.acceptTerms = true;
-  security.acme.defaults.email = "admin.acme@uninsane.org";
-
-  sane.persist.sys.byStore.plaintext = [
-    { user = "acme"; group = "acme"; path = "/var/lib/acme"; method = "bind"; }
-  ];
-  sane.persist.sys.byStore.private = [
-    { user = "colin"; group = "users"; path = "/var/www/sites"; method = "bind"; }
-  ];
-  sane.persist.sys.byStore.ephemeral = [
-    # logs *could* be persisted to private storage, but then there's the issue of
-    # "what if servo boots, isn't unlocked, and the whole / tmpfs is consumed by logs"
-    { user = "nginx"; group = "nginx"; path = "/var/log/nginx"; method = "bind"; }
-  ];
-
-  # create a self-signed SSL certificate for use with literally any domain.
-  # browsers will reject this, but proxies and local testing tools can be configured
-  # to accept it.
-  system.activationScripts.generate-x509-self-signed.text = ''
-    mkdir -p /var/www/certs/wildcard
-    test -f /var/www/certs/wildcard/key.pem || ${lib.getExe pkgs.openssl} \
-      req -x509 -newkey rsa:4096 \
-      -keyout /var/www/certs/wildcard/key.pem \
-      -out /var/www/certs/wildcard/cert.pem \
-      -sha256 -nodes -days 3650 \
-      -addext 'subjectAltName=DNS:*' \
-      -subj '/CN=self-signed'
-    chmod 640 /var/www/certs/wildcard/{key,cert}.pem
-    chown root:nginx /var/www/certs/wildcard /var/www/certs/wildcard/{key,cert}.pem
-  '';
-}
--- a/hosts/by-name/servo/services/nginx/uninsane.org.nix
+++ b/hosts/by-name/servo/services/nginx/uninsane.org.nix
@@ -1,132 +0,0 @@
-{ pkgs, ... }:
-{
-  # alternative way to link stuff into the share:
-  # sane.fs."/var/www/sites/uninsane.org/share/Ubunchu".mount.bind = "/var/media/Books/Visual/HiroshiSeo/Ubunchu";
-  # sane.fs."/var/media/Books/Visual/HiroshiSeo/Ubunchu".dir = {};
-  services.nginx.virtualHosts."uninsane.org" = {
-    # a lot of places hardcode https://uninsane.org,
-    # and then when we mix http + non-https, we get CORS violations
-    # and things don't look right. so force SSL.
-    forceSSL = true;
-    enableACME = true;
-
-    # extraConfig = ''
-    #   # "public" log so requests show up in goaccess metrics
-    #   access_log /var/log/nginx/public.log vcombined;
-    # '';
-
-    locations."/" = {
-      root = "${pkgs.uninsane-dot-org}/share/uninsane-dot-org";
-      tryFiles = "$uri $uri/ @fallback";
-    };
-
-    # unversioned files
-    locations."@fallback" = {
-      root = "/var/www/sites/uninsane.org";
-      extraConfig = ''
-        # instruct Google to not index these pages.
-        # see: <https://developers.google.com/search/docs/crawling-indexing/robots-meta-tag#xrobotstag>
-        add_header X-Robots-Tag 'none, noindex, nofollow';
-
-        # best-effort attempt to block archive.org from archiving these pages.
-        # reply with 403: Forbidden
-        # User Agent is *probably* "archive.org_bot"; maybe used to be "ia_archiver"
-        # source: <https://archive.org/details/archive.org_bot>
-        # additional UAs: <https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker>
-        #
-        # validate with: `curl -H 'User-Agent: "bot;archive.org_bot;like: something else"' -v https://uninsane.org/dne`
-        if ($http_user_agent ~* "(?:\b)archive.org_bot(?:\b)") {
-          return 403;
-        }
-        if ($http_user_agent ~* "(?:\b)archive.org(?:\b)") {
-          return 403;
-        }
-        if ($http_user_agent ~* "(?:\b)ia_archiver(?:\b)") {
-          return 403;
-        }
-      '';
-    };
-
-    # uninsane.org/share/foo => /var/www/sites/uninsane.org/share/foo.
-    # special-cased to enable directory listings
-    locations."/share" = {
-      root = "/var/www/sites/uninsane.org";
-      extraConfig = ''
-        # autoindex => render directory listings
-        autoindex on;
-        # don't follow any symlinks when serving files
-        # otherwise it allows a directory escape
-        disable_symlinks on;
-      '';
-    };
-    locations."/share/Milkbags/" = {
-      alias = "/var/media/Videos/Milkbags/";
-      extraConfig = ''
-        # autoindex => render directory listings
-        autoindex on;
-        # don't follow any symlinks when serving files
-        # otherwise it allows a directory escape
-        disable_symlinks on;
-      '';
-    };
-    locations."/share/Ubunchu/" = {
-      alias = "/var/media/Books/Visual/HiroshiSeo/Ubunchu/";
-      extraConfig = ''
-        # autoindex => render directory listings
-        autoindex on;
-        # don't follow any symlinks when serving files
-        # otherwise it allows a directory escape
-        disable_symlinks on;
-      '';
-    };
-
-    # allow matrix users to discover that @user:uninsane.org is reachable via matrix.uninsane.org
-    locations."= /.well-known/matrix/server".extraConfig =
-      let
-        # use 443 instead of the default 8448 port to unite
-        # the client-server and server-server port for simplicity
-        server = { "m.server" = "matrix.uninsane.org:443"; };
-      in ''
-        add_header Content-Type application/json;
-        return 200 '${builtins.toJSON server}';
-      '';
-    locations."= /.well-known/matrix/client".extraConfig =
-      let
-        client = {
-          "m.homeserver" =  { "base_url" = "https://matrix.uninsane.org"; };
-          "m.identity_server" =  { "base_url" = "https://vector.im"; };
-        };
-      # ACAO required to allow element-web on any URL to request this json file
-      in ''
-        add_header Content-Type application/json;
-        add_header Access-Control-Allow-Origin *;
-        return 200 '${builtins.toJSON client}';
-      '';
-
-    # static URLs might not be aware of .well-known (e.g. registration confirmation URLs),
-    # so hack around that.
-    locations."/_matrix".extraConfig = "return 301 https://matrix.uninsane.org$request_uri;";
-    locations."/_synapse".extraConfig = "return 301 https://matrix.uninsane.org$request_uri;";
-
-    # allow ActivityPub clients to discover how to reach @user@uninsane.org
-    # see: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3361/
-    # not sure this makes sense while i run multiple AP services (pleroma, lemmy)
-    # locations."/.well-known/nodeinfo" = {
-    #   proxyPass = "http://127.0.0.1:4000";
-    #   extraConfig = pleromaExtraConfig;
-    # };
-
-    # redirect common feed URIs to the canonical feed
-    locations."= /atom".extraConfig = "return 301 /atom.xml;";
-    locations."= /feed".extraConfig = "return 301 /atom.xml;";
-    locations."= /feed.xml".extraConfig = "return 301 /atom.xml;";
-    locations."= /rss".extraConfig = "return 301 /atom.xml;";
-    locations."= /rss.xml".extraConfig = "return 301 /atom.xml;";
-    locations."= /blog/atom".extraConfig = "return 301 /atom.xml;";
-    locations."= /blog/atom.xml".extraConfig = "return 301 /atom.xml;";
-    locations."= /blog/feed".extraConfig = "return 301 /atom.xml;";
-    locations."= /blog/feed.xml".extraConfig = "return 301 /atom.xml;";
-    locations."= /blog/rss".extraConfig = "return 301 /atom.xml;";
-    locations."= /blog/rss.xml".extraConfig = "return 301 /atom.xml;";
-  };
-}
--- a/hosts/by-name/servo/services/nginx/waka.laka.osaka/default.nix
+++ b/hosts/by-name/servo/services/nginx/waka.laka.osaka/default.nix
@@ -1,35 +0,0 @@
-{ config, pkgs, ... }:
-let
-  wakaLakaOsaka = pkgs.linkFarm "waka-laka-osaka" {
-    "index.html" = ./index.html;
-    "waka.laka.for.osaka.mp4" = pkgs.fetchurl {
-      # saved from: <https://www.youtube.com/watch?v=ehB_7bBKprY>
-      url = "https://uninsane.org/share/Milkbags/PG_Plays_Video_Games-Waka_Laka_For_Osaka_4K.mp4";
-      hash = "sha256-UW0qR4btX4pZ1bJp4Oxk20m3mvQGj9HweLKO27JBTFs=";
-    };
-  };
-in
-{
-  services.nginx.virtualHosts."laka.osaka" = {
-    addSSL = true;
-    enableACME = true;
-    locations."/" = {
-      # redirect everything to waka.laka.osaka
-      return = "301 https://waka.laka.osaka$request_uri";
-    };
-  };
-  services.nginx.virtualHosts."waka.laka.osaka" = {
-    addSSL = true;
-    enableACME = true;
-    locations."/" = {
-      root = wakaLakaOsaka;
-    };
-  };
-
-  sane.dns.zones."laka.osaka".inet = {
-    SOA."@" = config.sane.dns.zones."uninsane.org".inet.SOA."@";
-    A."@" = config.sane.dns.zones."uninsane.org".inet.A."@";
-    NS."@" = config.sane.dns.zones."uninsane.org".inet.NS."@";
-    CNAME."waka" = "native.uninsane.org.";
-  };
-}
--- a/hosts/by-name/servo/services/nginx/waka.laka.osaka/index.html
+++ b/hosts/by-name/servo/services/nginx/waka.laka.osaka/index.html
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width initial-scale=1" />
-  <meta name="description" content="Waka Laka (for Osaka)" />
-  <title>Waka Laka (for Osaka)</title>
-  <style>
-    html,body {
-      width: 100%;
-      height: 100%;
-      max-width: 100%;
-      max-height: 100%;
-    }
-    * {
-      margin: 0px;
-      padding: 0px;
-      border: 0px;
-    }
-    .bg-image {
-      width: 100%;
-      height: 100%;
-      min-width: 100%;
-      min-height: 100%;
-      position: fixed;
-      background-repeat: no-repeat;
-      background-position: 50% 50%;
-      background-size: contain;
-    }
-    body {
-      background-color: #000000;
-    }
-  </style>
-</head>
-<body>
-  <!-- TODO: how to autoplay video _without_ it being muted? -->
-  <video class="bg-image" id="waka-video" width="1440" height="1080"
-         autoplay loop muted
-         onclick="document.getElementById('waka-video').muted = !document.getElementById('waka-video').muted;"
-  >
-    <!-- from https://www.youtube.com/watch?v=ehB_7bBKprY -->
-    <!-- original and more info at https://www.aquilinestudios.org/wakalaka.html -->
-    <source src="waka.laka.for.osaka.mp4" type="video/mp4">
-  </video>
-</body>
-</html>
--- a/hosts/by-name/servo/services/nixos-prebuild.nix
+++ b/hosts/by-name/servo/services/nixos-prebuild.nix
@@ -1,26 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs false  # disabled until i can be sure it's not gonna OOM my server in the middle of the night
-{
-  systemd.services.nixos-prebuild = {
-    description = "build a nixos image with all updated deps";
-    path = with pkgs; [ coreutils git nix ];
-    script = ''
-      working=$(mktemp -d nixos-prebuild.XXXXXX --tmpdir)
-      pushd "$working"
-      git clone https://git.uninsane.org/colin/nix-files.git \
-        && cd nix-files \
-        && nix flake update \
-        || true
-      RC=$(nix run "$working/nix-files#check" -- -j1 --cores 5 --builders "")
-      popd
-      rm -rf "$working"
-      exit "$RC"
-    '';
-  };
-
-  systemd.timers.nixos-prebuild = {
-    wantedBy = [ "multi-user.target" ];
-    timerConfig.OnCalendar = "11,23:00:00";
-  };
-}
--- a/hosts/by-name/servo/services/ntfy/default.nix
+++ b/hosts/by-name/servo/services/ntfy/default.nix
@@ -1,14 +0,0 @@
-# ntfy: UnifiedPush notification delivery system
-# - used to get push notifications out of Matrix and onto a Phone (iOS, Android, or a custom client)
-{ config, lib, ... }:
-{
-  imports = [
-    ./ntfy-waiter.nix
-    ./ntfy-sh.nix
-  ];
-  sops.secrets."ntfy-sh-topic" = lib.mkIf config.services.ntfy-sh.enable {
-    mode = "0440";
-    owner = config.users.users.ntfy-sh.name;
-    group = config.users.users.ntfy-sh.name;
-  };
-}
--- a/hosts/by-name/servo/services/ntfy/ntfy-sh.nix
+++ b/hosts/by-name/servo/services/ntfy/ntfy-sh.nix
@@ -1,93 +0,0 @@
-# ntfy: UnifiedPush notification delivery system
-# - used to get push notifications out of Matrix and onto a Phone (iOS, Android, or a custom client)
-#
-# config options:
-# - <https://docs.ntfy.sh/config/#config-options>
-#
-# usage:
-# - ntfy sub https://ntfy.uninsane.org/TOPIC
-# - ntfy pub https://ntfy.uninsane.org/TOPIC "my message"
-# in production, TOPIC is a shared secret between the publisher (Matrix homeserver) and the subscriber (phone)
-#
-# administering:
-# - sudo -u ntfy-sh ntfy access
-#
-# debugging:
-# - make sure that the keepalives are good:
-#   - on the subscriber machine, run `lsof -i4` to find the port being used
-#   - `sudo tcpdump tcp port <p>`
-#     - shouldn't be too spammy
-#
-# matrix integration:
-# - the user must manually point synapse to the ntfy endpoint:
-#   - `curl --header "Authorization: <your_token>" --data '{ "app_display_name": "sane-nix moby", "app_id": "ntfy.uninsane.org", "data": { "url": "https://ntfy.uninsane.org/_matrix/push/v1/notify", "format": "event_id_only" }, "device_display_name": "sane-nix moby", "kind": "http", "lang": "en-US", "profile_tag": "", "pushkey": "https://ntfy.uninsane.org/TOPIC" }' localhost:8008/_matrix/client/v3/pushers/set`
-#     where the token is grabbed from Element's help&about page when logged in
-#   - to remove, send this `curl` with `"kind": null`
-{ config, lib, pkgs, ... }:
-let
-  # subscribers need a non-443 public port to listen on as a way to easily differentiate this traffic
-  # at the IP layer, to enable e.g. wake-on-lan.
-  altPort = 2587;
-in
-lib.mkIf false  #< 2024/09/30: disabled because i haven't used it in several months
-{
-  sane.persist.sys.byStore.private = [
-    # not 100% necessary to persist this, but ntfy does keep a 12hr (by default) cache
-    # for pushing notifications to users who become offline.
-    # ACLs also live here.
-    { user = "ntfy-sh"; group ="ntfy-sh"; path = "/var/lib/ntfy-sh"; method = "bind"; }
-  ];
-
-  services.ntfy-sh.enable = true;
-  services.ntfy-sh.settings = {
-    base-url = "https://ntfy.uninsane.org";
-    behind-proxy = true;  # not sure if needed
-    # keepalive interval is a ntfy-specific keepalive thing, where it sends actual data down the wire.
-    # it's not simple TCP keepalive.
-    # defaults to 45s.
-    # note that the client may still do its own TCP-level keepalives, typically every 30s
-    keepalive-interval = "15m";
-    log-level = "info";  # trace, debug, info (default), warn, error
-    auth-default-access = "deny-all";
-  };
-  systemd.services.ntfy-sh.serviceConfig.DynamicUser = lib.mkForce false;
-  systemd.services.ntfy-sh.preStart = ''
-    # make this specific topic read-write by world
-    # it would be better to use the token system, but that's extra complexity for e.g.
-    # how do i plumb a secret into the Matrix notification pusher
-    #
-    # note that this will fail upon first run, i.e. before ntfy has created its db.
-    # just restart the service.
-    topic=$(cat ${config.sops.secrets.ntfy-sh-topic.path})
-    ${lib.getExe' pkgs.ntfy-sh "ntfy"} access everyone "$topic" read-write
-  '';
-
-
-  services.nginx.virtualHosts."ntfy.uninsane.org" = {
-    forceSSL = true;
-    enableACME = true;
-    listen = [
-      { addr = "0.0.0.0"; port = altPort; ssl = true; }
-      { addr = "0.0.0.0"; port = 443;  ssl = true; }
-      { addr = "0.0.0.0"; port = 80;   ssl = false; }
-    ];
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:2586";
-      proxyWebsockets = true;  #< support websocket upgrades. without that, `ntfy sub` hangs silently
-      recommendedProxySettings = true; #< adds headers so ntfy logs include the real IP
-      extraConfig = ''
-        # absurdly long timeout (86400s=24h) so that we never hang up on clients.
-        # make sure the client is smart enough to detect a broken proxy though!
-        proxy_read_timeout 86400s;
-      '';
-    };
-  };
-  sane.dns.zones."uninsane.org".inet.CNAME."ntfy" = "native";
-
-  sane.ports.ports."${builtins.toString altPort}" = {
-    protocol = [ "tcp" ];
-    visibleTo.lan = true;
-    visibleTo.doof = true;
-    description = "colin-ntfy.uninsane.org";
-  };
-}
--- a/hosts/by-name/servo/services/ntfy/ntfy-waiter
+++ b/hosts/by-name/servo/services/ntfy/ntfy-waiter
@@ -1,151 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p ntfy-sh -p python3
-
-import argparse
-import logging
-import os
-import socket
-import subprocess
-import sys
-import threading
-import time
-
-logger = logging.getLogger(__name__)
-
-LISTEN_QUEUE = 3
-WAKE_MESSAGE = b'notification\n'
-
-class Client:
-    def __init__(self, sock, addr_info, live_after: float):
-        self.live_after = live_after
-        self.sock = sock
-        self.addr_info = addr_info
-
-    def __cmp__(self, other: 'Client'):
-        return cmp(self.addr_info, other.addr_info)
-
-    def try_notify(self, message: bytes) -> bool:
-        """
-        returns true if we send a packet to notify client.
-        fals otherwise (e.g. the socket is dead).
-        """
-        ttl = self.live_after - time.time()
-        if ttl > 0:
-            logger.debug(f"sleeping {ttl:.2f}s until client {self.addr_info} is ready to receive notification")
-            time.sleep(ttl)
-
-        try:
-            self.sock.sendall(message)
-        except Exception as e:
-            logger.warning(f"failed to notify client {self.addr_info} {e}")
-            return False
-        else:
-            logger.info(f"successfully notified {self.addr_info}: {message}")
-            return True
-
-class Adapter:
-    def __init__(self, host: str, port: int, silence: int, topic: str):
-        self.host = host
-        self.port = port
-        self.silence = silence
-        self.topic = topic
-        self.clients = set()
-
-    def log_clients(self):
-        clients_str = '\n'.join(f'  {c.addr_info}' for c in self.clients)
-        logger.debug(f"clients alive ({len(self.clients)}):\n{clients_str}")
-
-    def add_client(self, client: Client):
-        # it's a little bit risky to keep more than one client at the same IP address,
-        # because it's possible a notification comes in and we ring the old connection,
-        # even when the new connection says "don't ring yet".
-        for c in set(self.clients):
-            if c.addr_info[0] == client.addr_info[0]:
-                logger.info(f"purging old client before adding new one at same address: {c.addr_info} -> {client.addr_info}")
-                self.clients.remove(c)
-
-        logger.info(f"accepted client at {client.addr_info}")
-        self.clients.add(client)
-
-    def listener_loop(self):
-        logger.info(f"listening for connections on {self.host}:{self.port}")
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        s.bind((self.host, self.port))
-        s.listen(LISTEN_QUEUE)
-        while True:
-            conn, addr_info = s.accept()
-            self.add_client(Client(conn, addr_info, live_after = time.time() + self.silence))
-
-    def notify_clients(self, message: bytes = WAKE_MESSAGE):
-        # notify every client, and drop any which have disconnected.
-        # note that we notify based on age (oldest -> youngest)
-        # because notifying young clients might entail sleeping until they're ready.
-        clients = sorted(self.clients, key=lambda c: (c.live_after, c.addr_info))
-
-        dead_clients = [
-            c for c in clients if not c.try_notify(message)
-        ]
-        for c in dead_clients:
-            self.clients.remove(c)
-
-        self.log_clients()
-
-    def notify_loop(self):
-        logger.info("waiting for notification events")
-        ntfy_proc = subprocess.Popen(
-            [
-                "ntfy",
-                "sub",
-                f"https://ntfy.uninsane.org/{self.topic}"
-            ],
-            stdout=subprocess.PIPE
-        )
-        for line in iter(ntfy_proc.stdout.readline, b''):
-            logger.debug(f"received notification: {line}")
-            self.notify_clients()
-
-def get_topic() -> str:
-    return open('/run/secrets/ntfy-sh-topic', 'rt').read().strip()
-
-def run_forever(callable):
-    try:
-        callable()
-    except Exception as e:
-        logger.error(f"{callable} failed: {e}")
-    else:
-        logger.error(f"{callable} unexpectedly returned")
-    # sys.exit(1)
-    os._exit(1)  # sometimes `sys.exit()` doesn't actually exit...
-
-def main():
-    logging.basicConfig()
-    logging.getLogger().setLevel(logging.DEBUG)
-
-    parser = argparse.ArgumentParser(description="accept connections and notify the other end upon ntfy activity, with a guaranteed amount of silence")
-    parser.add_argument('--verbose', action='store_true')
-    parser.add_argument('--host', type=str, default='')
-    parser.add_argument('--port', type=int)
-    parser.add_argument('--silence', type=int, help="number of seconds to remain silent upon accepting a connection")
-
-    args = parser.parse_args()
-
-    if args.verbose:
-        logging.getLogger().setLevel(logging.DEBUG)
-    else:
-        logging.getLogger().setLevel(logging.INFO)
-
-    adapter = Adapter(args.host, args.port, args.silence, get_topic())
-
-    listener_loop = threading.Thread(target=run_forever, name="listener_loop", args=(adapter.listener_loop,))
-    notify_loop = threading.Thread(target=run_forever, name="notify_loop", args=(adapter.notify_loop,))
-
-    # TODO: this method of exiting seems to sometimes leave the listener behind (?)
-    # preventing anyone else from re-binding the port.
-    listener_loop.start()
-    notify_loop.start()
-    listener_loop.join()
-    notify_loop.join()
-
-
-if __name__ == '__main__':
-    main()
--- a/hosts/by-name/servo/services/ntfy/ntfy-waiter.nix
+++ b/hosts/by-name/servo/services/ntfy/ntfy-waiter.nix
@@ -1,72 +0,0 @@
-# service which adapts ntfy-sh into something suitable specifically for the Pinephone's
-# wake-on-lan (WoL) feature.
-# notably, it provides a mechanism by which the caller can be confident of an interval in which
-# zero traffic will occur on the TCP connection, thus allowing it to enter sleep w/o fear of hitting
-# race conditions in the Pinephone WoL feature.
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.sane.ntfy-waiter;
-  portLow = 5550;
-  portHigh = 5559;
-  portRange = lib.range portLow portHigh;
-  numPorts = portHigh - portLow + 1;
-  mkService = port: let
-    silence = port - portLow;
-    flags = lib.optional cfg.verbose "--verbose";
-    cli = [
-      (lib.getExe cfg.package)
-      "--port"
-      "${builtins.toString port}"
-      "--silence"
-      "${builtins.toString silence}"
-    ] ++ flags;
-  in {
-    "ntfy-waiter-${builtins.toString silence}" = {
-      # TODO: run not as root (e.g. as ntfy-sh)
-      description = "wait for notification, with ${builtins.toString silence} seconds of guaranteed silence";
-      serviceConfig = {
-        Type = "simple";
-        Restart = "always";
-        RestartSec = "5s";
-        ExecStart = lib.concatStringsSep " " cli;
-      };
-      after = [ "network.target" ];
-      wantedBy = [ "ntfy-sh.service" ];
-    };
-  };
-in
-{
-  options = with lib; {
-    sane.ntfy-waiter.enable = mkOption {
-      type = types.bool;
-      default = config.services.ntfy-sh.enable;
-    };
-    sane.ntfy-waiter.verbose = mkOption {
-      type = types.bool;
-      default = true;
-    };
-    sane.ntfy-waiter.package = mkOption {
-      type = types.package;
-      default = pkgs.static-nix-shell.mkPython3 {
-        pname = "ntfy-waiter";
-        srcRoot = ./.;
-        pkgs = [ "ntfy-sh" ];
-      };
-      description = ''
-        exposed to provide an attr-path by which one may build the package for manual testing.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    sane.ports.ports = lib.mkMerge (lib.forEach portRange (port: {
-      "${builtins.toString port}" = {
-        protocol = [ "tcp" ];
-        visibleTo.doof = true;
-        visibleTo.lan = true;
-        description = "colin-notification-waiter-${builtins.toString (port - portLow + 1)}-of-${builtins.toString numPorts}";
-      };
-    }));
-    systemd.services = lib.mkMerge (builtins.map mkService portRange);
-  };
-}
--- a/hosts/by-name/servo/services/pict-rs.nix
+++ b/hosts/by-name/servo/services/pict-rs.nix
@@ -1,23 +0,0 @@
-# pict-rs is an image database/store used by Lemmy.
-# i don't explicitly activate it here -- just adjust its defaults to be a bit friendlier
-{ config, lib, ... }:
-let
-  cfg = config.services.pict-rs;
-in
-{
-  sane.persist.sys.byStore.plaintext = lib.mkIf cfg.enable [
-    { user = "pict-rs"; group = "pict-rs"; path = cfg.dataDir; method = "bind"; }
-  ];
-
-  systemd.services.pict-rs.serviceConfig = {
-    # fix to use a normal user so we can configure perms correctly
-    DynamicUser = lib.mkForce false;
-    User = "pict-rs";
-    Group = "pict-rs";
-  };
-  users.groups.pict-rs = {};
-  users.users.pict-rs = {
-    group = "pict-rs";
-    isSystemUser = true;
-  };
-}
--- a/hosts/by-name/servo/services/pleroma.nix
+++ b/hosts/by-name/servo/services/pleroma.nix
@@ -1,222 +0,0 @@
-# docs:
-# - <https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/pleroma.nix>
-# - <https://docs.pleroma.social/backend/configuration/cheatsheet/>
-# example config:
-# - <https://git.pleroma.social/pleroma/pleroma/-/blob/develop/config/config.exs>
-#
-# to run it in a oci-container: <https://github.com/barrucadu/nixfiles/blob/master/services/pleroma.nix>
-#
-# admin frontend: <https://fed.uninsane.org/pleroma/admin>
-{ config, lib, pkgs, ... }:
-
-let
-  logLevel = "warning";
-  # logLevel = "debug";
-in
-{
-  config = lib.mkIf (config.sane.maxBuildCost >= 2) {
-    sane.persist.sys.byStore.private = [
-      # contains media i've uploaded to the server
-      { user = "pleroma"; group = "pleroma"; path = "/var/lib/pleroma"; method = "bind"; }
-    ];
-    services.pleroma.enable = true;
-    services.pleroma.secretConfigFile = config.sops.secrets.pleroma_secrets.path;
-    services.pleroma.configs = [
-      ''
-      import Config
-
-      config :pleroma, Pleroma.Web.Endpoint,
-        url: [host: "fed.uninsane.org", scheme: "https", port: 443],
-        http: [ip: {127, 0, 0, 1}, port: 4040]
-      #   secret_key_base: "{secrets.pleroma.secret_key_base}",
-      #   signing_salt: "{secrets.pleroma.signing_salt}"
-
-      config :pleroma, :instance,
-        name: "Perfectly Sane",
-        description: "Single-user Pleroma instance",
-        email: "admin.pleroma@uninsane.org",
-        notify_email: "notify.pleroma@uninsane.org",
-        limit: 5000,
-        registrations_open: true,
-        account_approval_required: true,
-        max_pinned_statuses: 5,
-        external_user_synchronization: true
-
-      # docs: https://hexdocs.pm/swoosh/Swoosh.Adapters.Sendmail.html
-      # test mail config with sudo -u pleroma ./bin/pleroma_ctl email test --to someone@somewhere.net
-      config :pleroma, Pleroma.Emails.Mailer,
-        enabled: true,
-        adapter: Swoosh.Adapters.Sendmail,
-        cmd_path: "${lib.getExe' pkgs.postfix "sendmail"}"
-
-      config :pleroma, Pleroma.User,
-        restricted_nicknames: [ "admin", "uninsane", "root" ]
-
-      config :pleroma, :media_proxy,
-        enabled: false,
-        redirect_on_failure: true
-        #base_url: "https://cache.pleroma.social"
-
-      # see for reference:
-      # - `force_custom_plan`: <https://docs.pleroma.social/backend/configuration/postgresql/#disable-generic-query-plans>
-      config :pleroma, Pleroma.Repo,
-        adapter: Ecto.Adapters.Postgres,
-        username: "pleroma",
-        database: "pleroma",
-        hostname: "localhost",
-        pool_size: 10,
-        prepare: :named,
-        parameters: [
-            plan_cache_mode: "force_custom_plan"
-        ]
-      # XXX: prepare: :named is needed only for PG <= 12
-      #   prepare: :named,
-      #   password: "{secrets.pleroma.db_password}",
-
-      # Configure web push notifications
-      config :web_push_encryption, :vapid_details,
-        subject: "mailto:notify.pleroma@uninsane.org"
-      #   public_key: "{secrets.pleroma.vapid_public_key}",
-      #   private_key: "{secrets.pleroma.vapid_private_key}"
-
-      # config :joken, default_signer: "{secrets.pleroma.joken_default_signer}"
-
-      config :pleroma, :database, rum_enabled: false
-      config :pleroma, :instance, static_dir: "/var/lib/pleroma/instance/static"
-      config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
-      config :pleroma, configurable_from_database: false
-
-      # strip metadata from uploaded images
-      config :pleroma, Pleroma.Upload, filters: [Pleroma.Upload.Filter.Exiftool.StripLocation]
-
-      # fix log spam: <https://git.pleroma.social/pleroma/pleroma/-/issues/1659>
-      # specifically, remove LAN addresses from `reserved`
-      config :pleroma, Pleroma.Web.Plugs.RemoteIp,
-        enabled: true,
-        reserved: ["127.0.0.0/8", "::1/128", "fc00::/7", "172.16.0.0/12"]
-
-      # TODO: GET /api/pleroma/captcha is broken
-      # there was a nixpkgs PR to fix this around 2022/10 though.
-      config :pleroma, Pleroma.Captcha,
-        enabled: false,
-        method: Pleroma.Captcha.Native
-
-
-      # (enabled by colin)
-      # Enable Strict-Transport-Security once SSL is working:
-      config :pleroma, :http_security,
-        sts: true
-
-      # docs: https://docs.pleroma.social/backend/configuration/cheatsheet/#logger
-      config :logger,
-        backends: [{ExSyslogger, :ex_syslogger}]
-
-      config :logger, :ex_syslogger,
-        level: :${logLevel}
-
-      # policies => list of message rewriting facilities to be enabled
-      # transparence => whether to publish these rules in node_info (and /about)
-      config :pleroma, :mrf,
-        policies: [Pleroma.Web.ActivityPub.MRF.SimplePolicy],
-        transparency: true
-
-      # reject => { host, reason }
-      config :pleroma, :mrf_simple,
-        reject: [ {"threads.net", "megacorp"}, {"*.threads.net", "megacorp"} ]
-        # reject: [ [host: "threads.net", reason: "megacorp"], [host: "*.threads.net", reason: "megacorp"] ]
-
-      # XXX colin: not sure if this actually _does_ anything
-      # better to steal emoji from other instances?
-      # - <https://docs.pleroma.social/backend/configuration/cheatsheet/#mrf_steal_emoji>
-      config :pleroma, :emoji,
-        shortcode_globs: ["/emoji/**/*.png"],
-        groups: [
-          "Cirno": "/emoji/cirno/*.png",
-          "Kirby": "/emoji/kirby/*.png",
-          "Bun": "/emoji/bun/*.png",
-          "Yuru Camp": "/emoji/yuru_camp/*.png",
-        ]
-      ''
-    ];
-
-    systemd.services.pleroma.path = [
-      # something inside pleroma invokes `sh` w/o specifying it by path, so this is needed to allow pleroma to start
-      pkgs.bash
-      # used by Pleroma to strip geo tags from uploads
-      pkgs.exiftool
-      # config.sane.programs.exiftool.package  #< XXX(2024-10-20): breaks image uploading
-      # i saw some errors when pleroma was shutting down about it not being able to find `awk`. probably not critical
-      # config.sane.programs.gawk.package
-      # needed for email operations like password reset
-      pkgs.postfix
-    ];
-
-    systemd.services.pleroma = {
-      # postgres can be slow to service early requests, preventing pleroma from starting on the first try
-      serviceConfig.Restart = "on-failure";
-      serviceConfig.RestartSec = "10s";
-
-      # hardening (systemd-analyze security pleroma)
-      # XXX(2024-07-28): this hasn't been rigorously tested:
-      # possible that i've set something too strict and won't notice right away
-      # make sure to test:
-      # - image/media uploading
-      serviceConfig.CapabilityBoundingSet = lib.mkForce [ "" "" ];  # nixos default is `~CAP_SYS_ADMIN`
-      serviceConfig.LockPersonality = true;
-      serviceConfig.NoNewPrivileges = true;
-      serviceConfig.MemoryDenyWriteExecute = true;
-      serviceConfig.PrivateDevices = lib.mkForce true;  #< dunno why nixpkgs has this set false; it seems to work as true
-      serviceConfig.PrivateMounts = true;
-      serviceConfig.PrivateTmp = true;
-      serviceConfig.PrivateUsers = true;
-
-      serviceConfig.ProtectProc = "invisible";
-      serviceConfig.ProcSubset = "all";  #< needs /proc/sys/kernel/overflowuid for bwrap
-
-      serviceConfig.ProtectClock = true;
-      serviceConfig.ProtectControlGroups = true;
-      serviceConfig.ProtectHome = true;
-      serviceConfig.ProtectKernelModules = true;
-      serviceConfig.ProtectSystem = lib.mkForce "strict";
-      serviceConfig.RemoveIPC = true;
-      serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
-
-      serviceConfig.RestrictSUIDSGID = true;
-      serviceConfig.SystemCallArchitectures = "native";
-      serviceConfig.SystemCallFilter = [ "@system-service" "@mount" "@sandbox" ];  #< "sandbox" might not actually be necessary
-
-      serviceConfig.ProtectHostname = false;  #< else brap can't mount /proc
-      serviceConfig.ProtectKernelLogs = false;  #< else breaks exiftool  ("bwrap: Can't mount proc on /newroot/proc: Operation not permitted")
-      serviceConfig.ProtectKernelTunables = false;  #< else breaks exiftool
-      serviceConfig.RestrictNamespaces = false;  # media uploads require bwrap
-    };
-
-    # this is required to allow pleroma to send email.
-    # raw `sendmail` works, but i think pleroma's passing it some funny flags or something, idk.
-    # hack to fix that.
-    users.users.pleroma.extraGroups = [ "postdrop" ];
-
-    # Pleroma server and web interface
-    # TODO: enable publog?
-    services.nginx.virtualHosts."fed.uninsane.org" = {
-      forceSSL = true;  # pleroma redirects to https anyway
-      enableACME = true;
-      # inherit kTLS;
-      locations."/" = {
-        proxyPass = "http://127.0.0.1:4040";
-        recommendedProxySettings = true;
-        # documented: https://git.pleroma.social/pleroma/pleroma/-/blob/develop/installation/pleroma.nginx
-        extraConfig = ''
-          # client_max_body_size defines the maximum upload size
-          client_max_body_size 16m;
-        '';
-      };
-    };
-
-    sane.dns.zones."uninsane.org".inet.CNAME."fed" = "native";
-
-    sops.secrets."pleroma_secrets" = {
-      owner = config.users.users.pleroma.name;
-    };
-  };
-}
--- a/hosts/by-name/servo/services/postgresql/default.nix
+++ b/hosts/by-name/servo/services/postgresql/default.nix
@@ -1,102 +0,0 @@
-{ lib, pkgs, ... }:
-
-let
-  GiB = n: MiB 1024*n;
-  MiB = n: KiB 1024*n;
-  KiB = n: 1024*n;
-in
-{
-  sane.persist.sys.byStore.private = [
-    { user = "postgres"; group = "postgres"; mode = "0750"; path = "/var/lib/postgresql"; method = "bind"; }
-    { user = "postgres"; group = "postgres"; mode = "0750"; path = "/var/backup/postgresql"; method = "bind"; }
-  ];
-  services.postgresql.enable = true;
-
-  # HOW TO UPDATE:
-  # postgres version updates are manual and require intervention.
-  # - `sane-stop-all-servo`
-  # - `systemctl start postgresql`
-  # - as `sudo su postgres`:
-  #   - `cd /var/log/postgresql`
-  #   - `pg_dumpall > state.sql`
-  #   - `echo placeholder > <new_version>`  # to prevent state from being created earlier than we want
-  # - then, atomically:
-  #   - update the `services.postgresql.package` here
-  #   - `dataDir` is atomically updated to match package; don't touch
-  #   - `nixos-rebuild --flake . switch ; sane-stop-all-servo`
-  # - `sudo rm -rf /var/lib/postgresql/<new_version>`
-  # - `systemctl start postgresql`
-  # - as `sudo su postgres`:
-  #   - `cd /var/lib/postgreql`
-  #   - `psql -f state.sql`
-  #     (for a compressed dump: `gunzip --stdout state.sql.gz | psql`)
-  # - restart dependent services (maybe test one at a time)
-
-  services.postgresql.package = pkgs.postgresql_16;
-
-
-  # XXX colin: for a proper deploy, we'd want to include something for Pleroma here too.
-  # services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''
-  #   CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD '<password goes here>';
-  #   CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
-  #     TEMPLATE template0
-  #     ENCODING = "UTF8"
-  #     LC_COLLATE = "C"
-  #     LC_CTYPE = "C";
-  # '';
-
-  services.postgresql.settings = {
-    # perf tuning
-    # - for recommended values see: <https://pgtune.leopard.in.ua/>
-    # - for official docs (sparse), see: <https://www.postgresql.org/docs/11/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE>
-    # DB Version: 16
-    # OS Type: linux
-    # DB Type: web
-    # vvv artificially constrained because the server's resources are shared across maaany services
-    # Total Memory (RAM): 12 GB
-    # CPUs num: 12
-    # Data Storage: ssd
-    max_connections = 200;
-    shared_buffers = "3GB";
-    effective_cache_size = "9GB";
-    maintenance_work_mem = "768MB";
-    checkpoint_completion_target = 0.9;
-    wal_buffers = "16MB";
-    default_statistics_target = 100;
-    random_page_cost = 1.1;
-    effective_io_concurrency = 200;
-    work_mem = "3932kB";
-    min_wal_size = "1GB";
-    max_wal_size = "4GB";
-    max_worker_processes = 12;
-    max_parallel_workers_per_gather = 4;
-    max_parallel_workers = 12;
-    max_parallel_maintenance_workers = 4;
-
-    # DEBUG OPTIONS:
-    log_min_messages = "DEBUG1";
-  };
-
-  # regulate the restarts, so that systemd never disables it
-  systemd.services.postgresql.serviceConfig.Restart = lib.mkForce "on-failure";
-  systemd.services.postgresql.serviceConfig.RestartSec = 2;
-  systemd.services.postgresql.serviceConfig.RestartMaxDelaySec = 10;
-  systemd.services.postgresql.serviceConfig.RestartSteps = 4;
-  systemd.services.postgresql.serviceConfig.StartLimitBurst = 120;
-  # systemd.services.postgresql.serviceConfig.TimeoutStartSec = "14400s";  #< 14400 = 4 hours; recoveries are long
-
-  # daily backups to /var/backup
-  services.postgresqlBackup.enable = true;
-
-  # common admin operations:
-  #   sudo systemctl start postgresql
-  #   sudo -u postgres psql
-  #   > \l   # lists all databases
-  #   > \du  # lists all roles
-  #   > \c pleroma  # connects to database by name
-  #   > \d   # shows all tables
-  #   > \q   # exits psql
-  # dump/restore (-F t = tar):
-  #   sudo -u postgres pg_dump -F t pleroma > /backup/pleroma-db.tar
-  #   sudo -u postgres -g postgres pg_restore -d pleroma /backup/pleroma-db.tar
-}
--- a/hosts/by-name/servo/services/postgresql/recollate.sh
+++ b/hosts/by-name/servo/services/postgresql/recollate.sh
@@ -1,81 +0,0 @@
-#!/bin/sh
-# source: <https://gist.githubusercontent.com/troykelly/616df024050dd50744dde4a9579e152e/raw/fe84e53cedf0caa6903604894454629a15867439/reindex_and_refresh_collation.sh>
-#
-# run this whenever postgres complains like:
-# > WARNING:  database "gitea" has a collation version mismatch
-# > DETAIL:  The database was created using collation version 2.39, but the operating system provides version 2.40.
-# > HINT:  Rebuild all objects in this database that use the default collation and run ALTER DATABASE gitea REFRESH COLLATION VERSION, or build PostgreSQL with the right library version.
-#
-# this script checks which databases are in need of a collation update,
-# and re-collates them as appropriate.
-# invoking this script should have low perf impact in the non-upgrade case,
-# so safe to do this as a cron job.
-#
-# invoke as postgres user
-
-log_info() {
-  >&2 echo "$@"
-}
-
-list_databases() {
-  log_info "Retrieving list of databases from the PostgreSQL server..."
-  psql --dbname="postgres" -Atc \
-    "SELECT datname FROM pg_database WHERE datistemplate = false"
-}
-
-refresh_collation_version() {
-  local db=$1
-  log_info "Refreshing collation version for database: $db..."
-  psql --dbname="$db" -c \
-    "ALTER DATABASE \"$db\" REFRESH COLLATION VERSION;"
-}
-
-check_collation_mismatches() {
-  local error=
-  log_info "Checking for collation mismatches in all databases..."
-  # Loop through each database and check for mismatching collations in table columns.
-  while IFS= read -r db; do
-    if [ -n "$db" ]; then
-      log_info "Checking database: $db for collation mismatches..."
-      local mismatches=$(psql --dbname="$db" -Atc \
-        "SELECT 'Mismatch in table ' || table_name || ' column ' || column_name || ' with collation ' || collation_name
-         FROM information_schema.columns
-         WHERE collation_name IS NOT NULL AND collation_name <> 'default' AND table_schema = 'public'
-         EXCEPT
-         SELECT 'No mismatch - default collation of ' || datcollate || ' used.'
-         FROM pg_database WHERE datname = '$db';"
-      )
-      if [ -z "$mismatches" ]; then
-        log_info "No collation mismatches found in database: $db"
-      else
-        # Print an informational message to stderr.
-        log_info "Collation mismatches found in database: $db:"
-        log_info "$mismatches"
-        error=1
-      fi
-    fi
-  done
-
-  if [ -n "$error" ]; then
-    exit 1
-  fi
-}
-
-log_info "Starting the reindexing and collation refresh process for all databases..."
-
-databases=$(list_databases)
-
-if [ -z "$databases" ]; then
-  log_info "No databases found for reindexing or collation refresh. Please check connection details to PostgreSQL server."
-  exit 1
-fi
-
-for db in $databases; do
-  refresh_collation_version "$db"
-done
-
-# Checking for collation mismatches after reindexing and collation refresh.
-# Pass the list of databases to the check_collation_mismatches function through stdin.
-echo "$databases" | check_collation_mismatches
-
-log_info "Reindexing and collation refresh process completed."
--- a/hosts/by-name/servo/services/prosody/default.nix
+++ b/hosts/by-name/servo/services/prosody/default.nix
@@ -1,303 +0,0 @@
-# example configs:
-# - official: <https://prosody.im/doc/example_config>
-# - nixos: <https://github.com/kittywitch/nixfiles/blob/main/services/prosody.nix>
-# config options:
-# - <https://prosody.im/doc/configure>
-#
-# modules:
-# - main: <https://prosody.im/doc/modules>
-# - community: <https://modules.prosody.im/index.html>
-#
-# debugging:
-# - logging:
-#   - enable `stanza_debug` module
-#   - enable `log.debug = "*syslog"` in extraConfig
-# - interactive:
-#   - `telnet localhost 5582` (this is equal to `prosodyctl shell` -- but doesn't hang)
-#     - `watch:stanzas(target_spec, filter)` -> to log stanzas, for version > 0.12
-#   - console docs: <https://prosody.im/doc/console>
-#   - can modify/inspect arbitrary internals (lua) by prefixing line with `> `
-#     - e.g. `> _G` to print all globals
-#
-# sanity checks:
-# - `sudo -u prosody -g prosody prosodyctl check connectivity`
-# - `sudo -u prosody -g prosody prosodyctl check turn`
-# - `sudo -u prosody -g prosody prosodyctl check turn -v --ping=stun.conversations.im`
-#   - checks that my stun/turn server is usable by clients of conversations.im (?)
-# - `sudo -u prosody -g prosody prosodyctl check`  (dns, config, certs)
-#
-#
-# create users with:
-# - `sudo -u prosody prosodyctl adduser colin@uninsane.org`
-#
-#
-# federation/support matrix:
-# - nixnet.services (runs ejabberd):
-#   - WORKS: sending and receiving PMs and calls (2023/10/15)
-#     - N.B.: it didn't originally work; was solved by disabling the lua-unbound DNS option & forcing the system/local resolver
-# - cheogram (XMPP <-> SMS gateway):
-#   - WORKS: sending and receiving PMs, images (2023/10/15)
-#   - PARTIAL: calls (xmpp -> tel works; tel -> xmpp fails)
-#     - maybe i need to setup stun/turn
-#
-# TODO:
-# - enable push notifications (mod_cloud_notify)
-# - optimize coturn (e.g. move off of the VPN!)
-# - ensure muc is working
-# - enable file uploads
-#   - "upload.xmpp.uninsane.org:http_upload: URL: <https://upload.xmpp.uninsane.org:5281/upload> - Ensure this can be reached by users"
-# - disable or fix bosh (jabber over http):
-#   - "certmanager: No certificate/key found for client_https port 0"
-
-{ config, lib, pkgs, ... }:
-
-let
-  # enables very verbose logging
-  enableDebug = false;
-in
-{
-  sane.persist.sys.byStore.private = [
-    # TODO: mode?
-    { user = "prosody"; group = "prosody"; path = "/var/lib/prosody"; method = "bind"; }
-  ];
-  sane.ports.ports."5000" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    visibleTo.lan = true;
-    description = "colin-xmpp-prosody-fileshare-proxy65";
-  };
-  sane.ports.ports."5222" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    visibleTo.lan = true;
-    description = "colin-xmpp-client-to-server";
-  };
-  sane.ports.ports."5223" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    visibleTo.lan = true;
-    description = "colin-xmpps-client-to-server";  # XMPP over TLS
-  };
-  sane.ports.ports."5269" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    description = "colin-xmpp-server-to-server";
-  };
-  sane.ports.ports."5270" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    description = "colin-xmpps-server-to-server";  # XMPP over TLS
-  };
-  sane.ports.ports."5280" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    visibleTo.lan = true;
-    description = "colin-xmpp-bosh";
-  };
-  sane.ports.ports."5281" = {
-    protocol = [ "tcp" ];
-    visibleTo.doof = true;
-    visibleTo.lan = true;
-    description = "colin-xmpp-prosody-https";  # necessary?
-  };
-
-  users.users.prosody.extraGroups = [
-    "nginx"  # provide access to certs
-    "ntfy-sh"  # access to secret ntfy topic
-    "turnserver"  # to access the coturn shared secret
-  ];
-
-  security.acme.certs."uninsane.org".extraDomainNames = [
-    "xmpp.uninsane.org"
-    "conference.xmpp.uninsane.org"
-    "upload.xmpp.uninsane.org"
-  ];
-
-  # exists so the XMPP server's cert can obtain altNames for all its resources
-  services.nginx.virtualHosts."xmpp.uninsane.org" = {
-    useACMEHost = "uninsane.org";
-  };
-  services.nginx.virtualHosts."conference.xmpp.uninsane.org" = {
-    useACMEHost = "uninsane.org";
-  };
-  services.nginx.virtualHosts."upload.xmpp.uninsane.org" = {
-    useACMEHost = "uninsane.org";
-  };
-
-  sane.dns.zones."uninsane.org".inet = {
-    # XXX: SRV records have to point to something with a A/AAAA record; no CNAMEs
-    A."xmpp" =                "%ANATIVE%";
-    CNAME."conference.xmpp" = "xmpp";
-    CNAME."upload.xmpp" =     "xmpp";
-
-    # _Service._Proto.Name    TTL Class SRV    Priority Weight Port Target
-    # - <https://xmpp.org/extensions/xep-0368.html>
-    # something's requesting the SRV records for conference.xmpp, so let's include it
-    # nothing seems to request XMPP SRVs for the other records (except @)
-    # lower numerical priority field tells clients to prefer this method
-    SRV."_xmpps-client._tcp.conference.xmpp" =       "3 50 5223 xmpp";
-    SRV."_xmpps-server._tcp.conference.xmpp" =       "3 50 5270 xmpp";
-    SRV."_xmpp-client._tcp.conference.xmpp" =        "5 50 5222 xmpp";
-    SRV."_xmpp-server._tcp.conference.xmpp" =        "5 50 5269 xmpp";
-
-    SRV."_xmpps-client._tcp" =                "3 50 5223 xmpp";
-    SRV."_xmpps-server._tcp" =                "3 50 5270 xmpp";
-    SRV."_xmpp-client._tcp" =                 "5 50 5222 xmpp";
-    SRV."_xmpp-server._tcp" =                 "5 50 5269 xmpp";
-  };
-
-  # help Prosody find its certificates.
-  # pointing it to /var/lib/acme doesn't quite work because it expects the private key
-  # to be named `privkey.pem` instead of acme's `key.pem`
-  # <https://prosody.im/doc/certificates#automatic_location>
-  environment.etc."prosody/certs/uninsane.org/fullchain.pem".source = "/var/lib/acme/uninsane.org/fullchain.pem";
-  environment.etc."prosody/certs/uninsane.org/privkey.pem".source = "/var/lib/acme/uninsane.org/key.pem";
-
-  services.prosody = {
-    enable = true;
-    package = pkgs.prosody.override {
-      # XXX(2023/10/15): build without lua-unbound support.
-      # this forces Prosody to fall back to the default Lua DNS resolver, which seems more reliable.
-      # fixes errors like "unbound.queryXYZUV: Resolver error: out of memory"
-      # related: <https://issues.prosody.im/1737#comment-11>
-      lua.withPackages = selector: pkgs.lua.withPackages (p:
-        selector (p // { luaunbound = null; })
-      );
-      # withCommunityModules = [ "turncredentials" ];
-    };
-    admins = [ "colin@uninsane.org" ];
-    # allowRegistration = false;  # defaults to false
-
-    muc = [
-      {
-        domain = "conference.xmpp.uninsane.org";
-      }
-    ];
-    httpFileShare.domain = "upload.xmpp.uninsane.org";
-
-    virtualHosts = {
-      # "Prosody requires at least one enabled VirtualHost to function. You can
-      # safely remove or disable 'localhost' once you have added another."
-      # localhost = {
-      #   domain = "localhost";
-      #   enabled = true;
-      # };
-      "xmpp.uninsane.org" = {
-        domain = "uninsane.org";
-        enabled = true;
-      };
-    };
-
-    ## modules:
-    # these are enabled by default, via <repo:nixos/nixpkgs:/pkgs/servers/xmpp/prosody/default.nix>
-    # - cloud_notify
-    # - http_upload
-    # - vcard_muc
-    # these are enabled by the module defaults (services.prosody.modules.<foo>)
-    # - admin_adhoc
-    # - blocklist
-    # - bookmarks
-    # - carbons
-    # - cloud_notify
-    # - csi
-    # - dialback
-    # - disco
-    # - http_files
-    # - mam
-    # - pep
-    # - ping
-    # - private
-    #   - XEP-0049: let clients store arbitrary (private) data on the server
-    # - proxy65
-    #   - XEP-0065: allow server to proxy file transfers between two clients who are behind NAT
-    # - register
-    # - roster
-    # - saslauth
-    # - smacks
-    # - time
-    # - tls
-    # - uptime
-    # - vcard_legacy
-    # - version
-
-    extraPluginPaths = [ ./modules ];
-
-    extraModules = [
-      # admin_shell: allows `prosodyctl shell` to work
-      # see: <https://prosody.im/doc/modules/mod_admin_shell>
-      # see: <https://prosody.im/doc/console>
-      "admin_shell"
-      "admin_telnet"  #< needed by admin_shell
-      # lastactivity: XEP-0012: allow users to query how long another user has been idle for
-      # - not sure why i enabled this; think it was in someone's config i referenced
-      "lastactivity"
-      # allows prosody to share TURN/STUN secrets with XMPP clients to provide them access to the coturn server.
-      # see: <https://prosody.im/doc/coturn>
-      "turn_external"
-      # legacy coturn integration
-      # see: <https://modules.prosody.im/mod_turncredentials.html>
-      # "turncredentials"
-    ] ++ lib.optionals config.services.ntfy-sh.enable [
-      "sane_ntfy"
-    ] ++ lib.optionals enableDebug [
-      "stanza_debug"  #< logs EVERY stanza as debug: <https://prosody.im/doc/modules/mod_stanza_debug>
-    ];
-
-    extraConfig = ''
-      local function readAll(file)
-        local f = assert(io.open(file, "rb"))
-        local content = f:read("*all")
-        f:close()
-        -- remove trailing newline
-        return string.gsub(content, "%s+", "")
-      end
-
-      -- logging docs:
-      -- - <https://prosody.im/doc/logging>
-      -- - <https://prosody.im/doc/advanced_logging>
-      -- levels: debug, info, warn, error
-      log = {
-        ${if enableDebug then "debug" else "info"} = "*syslog";
-      }
-
-      -- see: <https://prosody.im/doc/certificates#automatic_location>
-      -- try to solve: "certmanager: Error indexing certificate directory /etc/prosody/certs: cannot open /etc/prosody/certs: No such file or directory"
-      -- only, this doesn't work because prosody doesn't like acme's naming scheme
-      -- certificates = "/var/lib/acme"
-
-      c2s_direct_tls_ports = { 5223 }
-      s2s_direct_tls_ports = { 5270 }
-
-      turn_external_host = "turn.uninsane.org"
-      turn_external_secret = readAll("/run/secrets/coturn_shared_secret")
-      -- turn_external_user = "prosody"
-
-      -- legacy mod_turncredentials integration
-      -- turncredentials_host = "turn.uninsane.org"
-      -- turncredentials_secret = readAll("/run/secrets/coturn_shared_secret")
-
-      -- s2s_require_encryption = true
-      -- c2s_require_encryption = true
-    '' + lib.optionalString config.services.ntfy-sh.enable ''
-      ntfy_binary = "${lib.getExe' pkgs.ntfy-sh "ntfy"}"
-      ntfy_topic = readAll("/run/secrets/ntfy-sh-topic")
-    '';
-    checkConfig = false;  # secrets aren't available at build time
-  };
-
-  systemd.services.prosody = {
-    # hardening (systemd-analyze security prosody)
-    serviceConfig.LockPersonality = true;
-    serviceConfig.NoNewPrivileges = true;
-    serviceConfig.PrivateUsers = true;
-    serviceConfig.ProcSubset = "pid";
-    serviceConfig.ProtectClock = true;
-    serviceConfig.ProtectKernelLogs = true;
-    serviceConfig.ProtectProc = "invisible";
-    serviceConfig.ProtectSystem = "strict";
-    serviceConfig.RemoveIPC = true;
-    serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-    serviceConfig.SystemCallArchitectures = "native";
-    serviceConfig.SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
-  };
-}
--- a/hosts/by-name/servo/services/prosody/modules/mod_sane_ntfy.lua
+++ b/hosts/by-name/servo/services/prosody/modules/mod_sane_ntfy.lua
@@ -1,52 +0,0 @@
-- simple proof-of-concept Prosody module
-- module development guide: <https://prosody.im/doc/developers/modules>
-- module API docs: <https://prosody.im/doc/developers/moduleapi>
--
-- much of this code is lifted from Prosody's own `mod_cloud_notify`
-
-local jid = require"util.jid";
-
-local ntfy = module:get_option_string("ntfy_binary", "ntfy");
-local ntfy_topic = module:get_option_string("ntfy_topic", "xmpp");
-
-module:log("info", "initialized");
-
-local function is_urgent(stanza)
-  if stanza.name == "message" then
-    if stanza:get_child("propose", "urn:xmpp:jingle-message:0") then
-      return true, "jingle call";
-    end
-  end
-end
-
-local function publish_ntfy(message)
-  -- message should be the message to publish
-  local ntfy_url = string.format("https://ntfy.uninsane.org/%s", ntfy_topic)
-  local cmd = string.format("%s pub %q %q", ntfy, ntfy_url, message)
-  module.log("debug", "invoking ntfy: %s", cmd)
-  local success, reason, code = os.execute(cmd)
-  if not success then
-    module:log("warn", "ntfy failed: %s => %s %d", cmd, reason, code)
-  end
-end
-
-
-local function archive_message_added(event)
-  -- event is: { origin = origin, stanza = stanza, for_user = store_user, id = id }
-  local stanza = event.stanza;
-  local to = stanza.attr.to;
-  to = to and jid.split(to) or event.origin.username;
-
-  -- only notify if the stanza destination is the mam user we store it for
-  if event.for_user == to then
-    local is_urgent_stanza, urgent_reason = is_urgent(event.stanza);
-
-    if is_urgent_stanza then
-      module:log("info", "urgent push for %s (%s)", to, urgent_reason);
-      publish_ntfy(urgent_reason)
-    end
-  end
-end
-
-
-module:hook("archive-message-added", archive_message_added);
--- a/hosts/by-name/servo/services/slskd.nix
+++ b/hosts/by-name/servo/services/slskd.nix
@@ -1,93 +0,0 @@
-# Soulseek daemon (p2p file sharing with an emphasis on Music)
-# docs: <https://github.com/slskd/slskd/blob/master/docs/config.md>
-#
-# config precedence (higher precedence overrules lower precedence):
-# - Default Values < Environment Variables < YAML Configuraiton File < Command Line Arguments
-#
-# debugging:
-# - soulseek is just *flaky*. if you see e.g. DNS errors, even though you can't replicate them via `dig` or `getent ahostsv4`, just give it 10 minutes to work out:
-#   - "Soulseek.AddressException: Failed to resolve address 'vps.slsknet.org': Resource temporarily unavailable"
-{ config, lib, pkgs, ... }:
-
-{
-  sane.persist.sys.byStore.ephemeral = [
-    # {data,downloads,incomplete,logs}: contains logs, search history, and downloads
-    # so, move the downloaded data to persistent storage regularly, or configure the downloads/incomplete dirs to point to persisted storage (in nixpkgs slskd config)
-    { user = "slskd"; group = "media"; path = "/var/lib/slskd"; method = "bind"; }
-  ];
-  sops.secrets."slskd_env" = {
-    owner = config.users.users.slskd.name;
-    mode = "0400";
-  };
-
-  users.users.slskd.extraGroups = [ "media" ];
-
-  sane.ports.ports."50300" = {
-    protocol = [ "tcp" ];
-    # visibleTo.ovpns = true;  #< not needed: it runs in the ovpns namespace
-    description = "colin-soulseek";
-  };
-
-  sane.dns.zones."uninsane.org".inet.CNAME."soulseek" = "native";
-
-  services.nginx.virtualHosts."soulseek.uninsane.org" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://${config.sane.netns.ovpns.veth.netns.ipv4}:5030";
-      proxyWebsockets = true;
-      recommendedProxySettings = true;
-    };
-  };
-
-  services.slskd.enable = true;
-  services.slskd.domain = null;  # i'll manage nginx for it
-  services.slskd.group = "media";
-  # env file, for auth (SLSKD_SLSK_PASSWORD, SLSKD_SLSK_USERNAME)
-  services.slskd.environmentFile = config.sops.secrets.slskd_env.path;
-  services.slskd.settings = {
-    soulseek.diagnostic_level = "Debug";  # one of "None"|"Warning"|"Info"|"Debug"
-    shares.directories = [
-      # folders to share
-      # syntax: <https://github.com/slskd/slskd/blob/master/docs/config.md#directories>
-      # [Alias]/path/on/disk
-      # NOTE: Music library is quick to scan; videos take a solid 10min to scan.
-      # TODO: re-enable the other libraries
-      # "[Audioooks]/var/media/Books/Audiobooks"
-      # "[Books]/var/media/Books/Books"
-      # "[Manga]/var/media/Books/Visual"
-      # "[games]/var/media/games"
-      "[Music]/var/media/Music"
-      # "[Film]/var/media/Videos/Film"
-      # "[Shows]/var/media/Videos/Shows"
-    ];
-    # directories.downloads = "..." # TODO
-    # directories.incomplete = "..." # TODO
-    # what unit is this? kbps??
-    global.upload.speed_limit = 32000;
-    web.logging = true;
-    # debug = true;
-    flags.no_logo = true;  # don't show logo at start
-    # flags.volatile = true;  # store searches and active transfers in RAM (completed transfers still go to disk). rec for btrfs/zfs
-  };
-
-  systemd.services.slskd = {
-    # run this behind the OVPN static VPN
-    serviceConfig.NetworkNamespacePath = "/run/netns/ovpns";
-    serviceConfig.ExecStartPre = [
-      # abort if public IP is not as expected
-      "${lib.getExe pkgs.sane-scripts.ip-check} --no-upnp --expect ${config.sane.netns.ovpns.wg.address.ipv4}"
-    ];
-
-    serviceConfig.Restart = lib.mkForce "always";  # exits "success" when it fails to connect to soulseek server
-    serviceConfig.RestartSec = "60s";
-
-    # hardening (systemd-analyze security slskd)
-    # upstream nixpkgs specifies moderate defaults; these are supplementary
-    # serviceConfig.MemoryDenyWriteExecute = true;
-    # serviceConfig.ProcSubset = "pid";
-    # serviceConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-    # serviceConfig.SystemCallArchitectures = "native";
-    # serviceConfig.SystemCallFilter = [ "@system-service" ];
-  };
-}
--- a/hosts/by-name/servo/services/transmission/default.nix
+++ b/hosts/by-name/servo/services/transmission/default.nix
@@ -1,173 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  # 2023/09/06: nixpkgs `transmission` defaults to old 3.00
-  # 2024/02/15: some torrent trackers whitelist clients; everyone is still on 3.00 for some reason :|
-  #             some do this via peer-id (e.g. baka); others via user-agent (e.g. MAM).
-  #             peer-id format is essentially the same between 3.00 and 4.x (just swap the MAJOR/MINOR/PATCH numbers).
-  #             user-agent format has changed. `Transmission/3.00` (old) v.s. `TRANSMISSION/MAJ.MIN.PATCH` (new).
-  realTransmission = pkgs.transmission_4;
-  realVersion = {
-    major = lib.versions.major realTransmission.version;
-    minor = lib.versions.minor realTransmission.version;
-    patch = lib.versions.patch realTransmission.version;
-  };
-  package = realTransmission.overrideAttrs (upstream: {
-    # `cmakeFlags = [ "-DTR_VERSION_MAJOR=3" ]`, etc, doesn't seem to take effect.
-    postPatch = (upstream.postPatch or "") + ''
-      substituteInPlace CMakeLists.txt \
-        --replace-fail 'TR_VERSION_MAJOR "${realVersion.major}"' 'TR_VERSION_MAJOR "3"' \
-        --replace-fail 'TR_VERSION_MINOR "${realVersion.minor}"' 'TR_VERSION_MINOR "0"' \
-        --replace-fail 'TR_VERSION_PATCH "${realVersion.patch}"' 'TR_VERSION_PATCH "0"' \
-        --replace-fail 'set(TR_USER_AGENT_PREFIX "''${TR_SEMVER}")' 'set(TR_USER_AGENT_PREFIX "3.00")'
-    '';
-  });
-  download-dir = "/var/media/torrents";  #< keep in sync with consts embedded in `torrent-done`
-  torrent-done = pkgs.static-nix-shell.mkBash {
-    pname = "torrent-done";
-    srcRoot = ./.;
-    pkgs = [
-      "acl"
-      "coreutils"
-      "findutils"
-      "rsync"
-    ];
-  };
-in
-{
-  sane.persist.sys.byStore.private = [
-    # TODO: mode? we need this specifically for the stats tracking in .config/
-    { user = "transmission"; group = config.users.users.transmission.group; path = "/var/lib/transmission"; method = "bind"; }
-    { user = "transmission"; group = config.users.users.transmission.group; path = "/var/backup/torrents"; method = "bind"; }
-  ];
-  users.users.transmission.extraGroups = [ "media" ];
-
-  services.transmission.enable = true;
-  services.transmission.package = package;
-  #v setting `group` this way doesn't tell transmission to `chown` the files it creates
-  #  it's a nixpkgs setting which just runs the transmission daemon as this group
-  services.transmission.group = "media";
-
-  # transmission will by default not allow the world to read its files.
-  services.transmission.downloadDirPermissions = "775";
-  services.transmission.extraFlags = [
-    # "--log-level=debug"
-  ];
-
-  services.transmission.settings = {
-    # DOCUMENTATION/options list: <https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options>
-
-    # message-level = 3;  #< enable for debug logging. 0-3, default is 2.
-    # ovpns.veth.netns.ipv4 => allow rpc only from the root servo ns. it'll tunnel things to the net, if need be.
-    rpc-bind-address = config.sane.netns.ovpns.veth.netns.ipv4;
-    #rpc-host-whitelist = "bt.uninsane.org";
-    #rpc-whitelist = "*.*.*.*";
-    rpc-authentication-required = true;
-    rpc-username = "colin";
-    # salted pw. to regenerate, set this plaintext, run nixos-rebuild, and then find the salted pw in:
-    # /var/lib/transmission/.config/transmission-daemon/settings.json
-    rpc-password = "{503fc8928344f495efb8e1f955111ca5c862ce0656SzQnQ5";
-    rpc-whitelist-enabled = false;
-
-    # force behind ovpns in case the NetworkNamespace fails somehow
-    bind-address-ipv4 = config.sane.netns.ovpns.wg.address.ipv4;
-    port-forwarding-enabled = false;
-
-    # hopefully, make the downloads world-readable
-    # umask = 0;  #< default is 2: i.e. deny writes from world
-
-    # force peer connections to be encrypted
-    encryption = 2;
-
-    # units in kBps
-    speed-limit-down = 12000;
-    speed-limit-down-enabled = true;
-    speed-limit-up = 800;
-    speed-limit-up-enabled = true;
-
-    # see: https://git.zknt.org/mirror/transmission/commit/cfce6e2e3a9b9d31a9dafedd0bdc8bf2cdb6e876?lang=bg-BG
-    anti-brute-force-enabled = false;
-
-    inherit download-dir;
-    incomplete-dir = "${download-dir}/incomplete";
-    # transmission regularly fails to move stuff from the incomplete dir to the main one, so disable:
-    incomplete-dir-enabled = false;
-
-    # env vars available in script:
-    # - TR_APP_VERSION - Transmission's short version string, e.g. `4.0.0`
-    # - TR_TIME_LOCALTIME
-    # - TR_TORRENT_BYTES_DOWNLOADED - Number of bytes that were downloaded for this torrent
-    # - TR_TORRENT_DIR - Location of the downloaded data
-    # - TR_TORRENT_HASH - The torrent's info hash
-    # - TR_TORRENT_ID
-    # - TR_TORRENT_LABELS - A comma-delimited list of the torrent's labels
-    # - TR_TORRENT_NAME - Name of torrent (not filename)
-    # - TR_TORRENT_TRACKERS - A comma-delimited list of the torrent's trackers' announce URLs
-    script-torrent-done-enabled = true;
-    script-torrent-done-filename = lib.getExe torrent-done;
-  };
-
-  # run this behind the OVPN static VPN
-  sane.netns.ovpns.services = [ "transmission" ];
-  systemd.services.transmission = {
-    environment.TR_DEBUG = "1";
-    serviceConfig.ExecStartPre = [
-      # abort if public IP is not as expected
-      "${lib.getExe pkgs.sane-scripts.ip-check} --no-upnp --expect ${config.sane.netns.ovpns.wg.address.ipv4}"
-    ];
-
-    serviceConfig.Restart = "on-failure";
-    serviceConfig.RestartSec = "30s";
-    serviceConfig.BindPaths = [ "/var/media" ];  #< so it can move completed torrents into the media library
-    serviceConfig.SystemCallFilter = lib.mkForce [
-      # the torrent-done script does stuff which fails the nixos default syscall filter.
-      # allow a bunch of stuff, speculatively, to hopefully fix that:
-      "@aio"
-      "@basic-io"
-      "@chown"
-      "@file-system"
-      "@io-event"
-      "@process"
-      "@sandbox"
-      "@sync"
-      "@system-service"
-      "quotactl"
-    ];
-  };
-
-  # service to automatically backup torrents i add to transmission
-  systemd.services.backup-torrents = {
-    description = "archive torrents to storage not owned by transmission";
-    script = ''
-      ${lib.getExe pkgs.rsync} -arv /var/lib/transmission/.config/transmission-daemon/torrents/ /var/backup/torrents/
-    '';
-  };
-  systemd.timers.backup-torrents = {
-    wantedBy = [ "multi-user.target" ];
-    timerConfig = {
-      OnStartupSec = "11min";
-      OnUnitActiveSec = "240min";
-    };
-  };
-
-  # transmission web client
-  services.nginx.virtualHosts."bt.uninsane.org" = {
-    # basicAuth is literally cleartext user/pw, so FORCE this to happen over SSL
-    forceSSL = true;
-    enableACME = true;
-    # inherit kTLS;
-    locations."/" = {
-      # proxyPass = "http://ovpns.uninsane.org:9091";
-      proxyPass = "http://${config.sane.netns.ovpns.veth.netns.ipv4}:9091";
-      recommendedProxySettings = true;
-    };
-  };
-
-  sane.dns.zones."uninsane.org".inet.CNAME."bt" = "native";
-  sane.ports.ports."51413" = {
-    protocol = [ "tcp" "udp" ];
-    # visibleTo.ovpns = true;  #< not needed: it runs in the ovpns namespace
-    description = "colin-bittorrent";
-  };
-}
-
--- a/hosts/by-name/servo/services/transmission/torrent-done
+++ b/hosts/by-name/servo/services/transmission/torrent-done
@@ -1,111 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p acl -p bash -p coreutils -p findutils -p rsync
-
-# transmission invokes this with no args, and the following env vars:
-# - TR_TORRENT_DIR: full path to the folder i told transmission to download it to.
-#     e.g. "/var/media/torrents/Videos/Film/Jason.Bourne-2016"
-# - TR_APP_VERSION
-# - TR_TIME_LOCALTIME
-# - TR_TORRENT_BYTES_DOWNLOADED
-# - TR_TORRENT_HASH
-# - TR_TORRENT_ID: local number to uniquely identify this torrent, used by e.g. transmission-remote.
-#     e.g. "67"
-# - TR_TORRENT_LABELS
-# - TR_TORRENT_NAME: file/folder name of the toplevel torrent item
-#     e.g. "Jason Bourne (2016) [2160p] [4K] [BluRay] [5.1] [YTS.MX]"
-# - TR_TORRENT_PRIORITY
-# - TR_TORRENT_TRACKERS
-
-# optionally, set these variables for debugging (these are specific to my script and not used upstream):
-# - TR_DRY_RUN=1
-# - TR_DEBUG=1
-
-DOWNLOAD_DIR=/var/media/torrents
-
-destructive() {
-  if [ -n "${TR_DRY_RUN-}" ]; then
-    echo "[dry-run] $*"
-  else
-    debug "$@"
-    "$@"
-  fi
-}
-debug() {
-  if [ -n "${TR_DEBUG-}" ]; then
-    echo "$@"
-  fi
-}
-
-echo "TR_TORRENT_DIR=$TR_TORRENT_DIR TR_TORRENT_NAME=$TR_TORRENT_NAME torrent-done $*"
-
-if [[ "$TR_TORRENT_DIR" =~ ^.*freeleech.*$ ]]; then
-  # freeleech torrents have no place in my permanent library
-  echo "freeleech: nothing to do"
-  exit 0
-fi
-if ! [[ "$TR_TORRENT_DIR" =~ ^$DOWNLOAD_DIR/.*$ ]]; then
-  echo "unexpected torrent dir, aborting: $TR_TORRENT_DIR"
-  exit 1
-fi
-
-TORRENT_PATH="$TR_TORRENT_DIR/$TR_TORRENT_NAME"
-if [[ ! -e "$TORRENT_PATH" ]]; then
-  echo "torrent unexpectedly doesn't exist at $TORRENT_PATH. will try fallback"
-  TORRENT_PATH="$TR_TORRENT_DIR"
-fi
-
-if [[ -d "$TORRENT_PATH" ]]; then
-  # trailing slash so that rsync copies the directory contents, without creating an extra toplevel dir.
-  TORRENT_PATH="$TORRENT_PATH/"
-elif [[ ! -e "$TORRENT_PATH" ]]; then
-  echo "torrent unexpectedly doesn't exist at TR_TORRENT_DIR=$TORRENT_PATH: bailing"
-  exit 1
-fi
-
-REL_DIR="${TR_TORRENT_DIR#$DOWNLOAD_DIR/}"
-MEDIA_DIR="/var/media/$REL_DIR"
-
-destructive mkdir -p "$(dirname "$MEDIA_DIR")"
-destructive rsync -rlv "$TORRENT_PATH" "$MEDIA_DIR/"
-# make the media rwx by anyone in the group
-destructive find "$MEDIA_DIR" -type d -exec setfacl --recursive --modify d:g::rwx,o::rx {} \;
-destructive find "$MEDIA_DIR" -type d -exec chmod g+rw,a+rx {} \;
-destructive find "$MEDIA_DIR" -type f -exec chmod g+rw,a+r {} \;
-
-# if there's a single directory inside the media dir, then inline that.
-# TODO: this is probably obsolete now that i process TR_TORRENT_NAME
-subdirs=("$MEDIA_DIR"/*)
-debug "top-level items in torrent dir:" "${subdirs[@]}"
-if [ ${#subdirs[@]} -eq 1 ]; then
-  dirname="${subdirs[0]}"
-  debug "exactly one top-level item, checking if directory: $dirname"
-  if [ -d "$dirname" ]; then
-    destructive mv "$dirname"/* "$MEDIA_DIR/" && destructive rmdir "$dirname"
-  fi
-fi
-
-# remove noisy files:
-# -iname means "insensitive", but the syntax is NOT regex -- more similar to shell matching
-destructive find "$MEDIA_DIR/" -type f \(\
-     -iname '*downloaded?from*' \
-  -o -iname '(xxxpav69).txt' \
-  -o -iname '*upcoming?releases*' \
-  -o -iname 'ETRG.mp4' \
-  -o -iname 'Encoded by*.txt' \
-  -o -iname 'PSArips.com.txt' \
-  -o -iname 'RARBG.com*' \
-  -o -iname 'RARBG.txt' \
-  -o -iname 'RARBG_DO_NOT_MIRROR.exe' \
-  -o -iname 'Tellytorrent.net.txt' \
-  -o -iname 'WWW.VPPV.LA.txt' \
-  -o -iname 'WWW.YIFY*.COM.jpg' \
-  -o -iname 'YIFY*.com.txt' \
-  -o -iname 'YTS*.com.txt' \
-  -o -iname 'YTSYify*.txt' \
-  -o -iname 'www.YTS*.jpg' \
-  \) -exec rm {} \;
-
-# might want to keep, might want to remove:
-# -o -iname 'info.txt'
-# -o -iname 'source.txt'
-# -o -iname 'sample.mkv'
--- a/hosts/by-name/servo/users/default.nix
+++ b/hosts/by-name/servo/users/default.nix
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./shelvacu.nix
-  ];
-}
--- a/hosts/by-name/servo/users/shelvacu.nix
+++ b/hosts/by-name/servo/users/shelvacu.nix
@@ -1,65 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  users.users.shelvacu = {
-    isNormalUser = true;
-    home = "/home/shelvacu";
-    subUidRanges = [
-      { startUid=300000; count=1; }
-    ];
-    group = "users";
-    initialPassword = lib.mkDefault "";
-    shell = pkgs.bash;
-
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKoy1TrmfhBGWtVedgOM1FB1oD2UdodN3LkBnnLx6Tug compute-deck"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAxAFFxQMXAgi+0cmGaNE/eAkVfEl91wafUqFIuAkI5I compute-deck-root"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINQ2c0GzlVMjV06CS7bWbCaAbzG2+7g5FCg/vClJPe0C fw"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGHLPOxRd68+DJ/bYmqn0wsgwwIcMSMyuU1Ya16hCb/m fw-root"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOre0FnYDm3arsFj9c/l5H2Q8mdmv7kmvq683pL4heru legtop"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINznGot+L8kYoVQqdLV/R17XCd1ILMoDCILOg+I3s5wC pixel9pro-nod"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcRDekd8ZOYfQS5X95/yNof3wFYIbHqWeq4jY0+ywQX pro1x-nod"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJNFbzt0NHVTaptBI38YtwLG+AsmeNYy0Nr5yX2zZEPE root@vacuInstaller toptop-root"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICVeSzDkGTueZijB0xUa08e06ovAEwwZK/D+Cc7bo91g triple-dezert"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOtwtao/TXbiuQOYJbousRPVesVcb/2nP0PCFUec0Nv8 triple-dezert-root"
-    ];
-  };
-
-  security.sudo.extraRules = [
-    {
-      users = [ "shelvacu" ];
-      runAs = "postgres";
-      commands = [
-        {
-          command = "ALL";
-          options = [ "NOPASSWD" ];
-        }
-      ];
-    }
-  ];
-
-  security.polkit.extraConfig = ''
-    // allow:
-    // - systemctl restart|start|stop SERVICE
-    polkit.addRule(function(action, subject) {
-      if (subject.user == "shelvacu" && action.id == "org.freedesktop.systemd1.manage-units") {
-        switch (action.lookup("verb")) {
-          // case "cancel":
-          // case "reenable":
-          case "restart":
-          // case "reload":
-          // case "reload-or-restart":
-          case "start":
-          case "stop":
-          // case "try-reload-or-restart":
-          // case "try-restart":
-            return polkit.Result.YES;
-          default:
-        }
-      }
-    })
-  '';
-
-  sane.persist.sys.byStore.private = [
-    { path = "/home/shelvacu/persist"; user = "shelvacu"; group = "users"; mode = "0700"; }
-  ];
-}
--- a/hosts/common/bluetooth.nix
+++ b/hosts/common/bluetooth.nix
@@ -0,0 +1,16 @@
+{ lib, pkgs, ... }:
+
+{
+  # persist external pairings by default
+  sane.persist.sys.plaintext = [ "/var/lib/bluetooth" ];
+
+  sane.fs."/var/lib/bluetooth".generated.acl.mode = "0700";
+  sane.fs."/var/lib/bluetooth/.secrets.stamp" = {
+    wantedBeforeBy = [ "bluetooth.service" ];
+    # XXX: install-bluetooth uses sed, but that's part of the default systemd unit path, it seems
+    generated.script.script = builtins.readFile ../../scripts/install-bluetooth + ''
+      touch "/var/lib/bluetooth/.secrets.stamp"
+    '';
+    generated.script.scriptArgs = [ "/run/secrets/bt" ];
+  };
+}
--- a/hosts/common/boot.nix
+++ b/hosts/common/boot.nix
@@ -1,57 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  boot.initrd.supportedFilesystems = [ "ext4" "btrfs" "ext2" "ext3" "vfat" ];
-  # useful emergency utils
-  boot.initrd.extraUtilsCommands = ''
-    copy_bin_and_libs ${lib.getExe' pkgs.btrfs-progs "btrfstune"}
-    copy_bin_and_libs ${lib.getExe' pkgs.e2fsprogs "resize2fs"}
-    copy_bin_and_libs ${lib.getExe' pkgs.gptfdisk "{cgdisk,gdisk}"}
-    copy_bin_and_libs ${lib.getExe' pkgs.mtools "mlabel"}
-    copy_bin_and_libs ${lib.getExe pkgs.nvme-cli}
-    copy_bin_and_libs ${lib.getExe' pkgs.smartmontools "smartctl"}
-    copy_bin_and_libs ${lib.getExe' pkgs.util-linux "{cfdisk,lsblk,lscpu}"}
-  '';
-  boot.kernelParams = [
-    "boot.shell_on_fail"
-    #v experimental full pre-emption for hopefully better call/audio latency on moby.
-    # also toggleable at runtime via /sys/kernel/debug/sched/preempt
-    # defaults to preempt=voluntary
-    # "preempt=full"
-  ];
-  # other kernelParams:
-  #   "boot.trace"
-  #   "systemd.log_level=debug"
-  #   "systemd.log_target=console"
-
-  # moby has to run recent kernels (defined elsewhere).
-  # meanwhile, kernel variation plays some minor role in things like sandboxing (landlock) and capabilities.
-  # - as of 2024/08/xx, my boot fails on 6.6, but works on 6.9 and (probably; recently) 6.8.
-  # simpler to keep near the latest kernel on all devices,
-  # and also makes certain that any weird system-level bugs i see aren't likely to be stale kernel bugs.
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-  # boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_testing;
-
-  # hack in the `boot.shell_on_fail` arg since that doesn't always seem to work.
-  boot.initrd.preFailCommands = "allowShell=1";
-
-  # default: 4 (warn). 7 is debug
-  boot.consoleLogLevel = 7;
-
-  boot.loader.grub.enable = lib.mkDefault false;
-  # boot.loader.generic-extlinux-compatible.enable = lib.mkDefault true;
-  boot.loader.systemd-boot.enable = lib.mkDefault true;
-  boot.loader.systemd-boot.configurationLimit = lib.mkDefault 20;
-  boot.loader.systemd-boot.edk2-uefi-shell.enable = lib.mkDefault true;
-  boot.loader.systemd-boot.memtest86.enable = lib.mkDefault
-    (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.memtest86plus);
-
-  hardware.enableAllFirmware = true;  # firmware with licenses that don't allow for redistribution. fuck lawyers, fuck IP, give me the goddamn firmware.
-  # hardware.enableRedistributableFirmware = true;  # proprietary but free-to-distribute firmware (extraneous to `enableAllFirmware` option)
-
-  # default is 252274, which is too low particularly for servo.
-  # manifests as spurious "No space left on device" when trying to install watches,
-  # e.g. in dyn-dns by `systemctl start dyn-dns-watcher.path`.
-  # see: <https://askubuntu.com/questions/828779/failed-to-add-run-systemd-ask-password-to-directory-watch-no-space-left-on-dev>
-  boot.kernel.sysctl."fs.inotify.max_user_watches" = 4194304;
-  boot.kernel.sysctl."fs.inotify.max_user_instances" = 4194304;
-}
--- a/hosts/common/cross.nix
+++ b/hosts/common/cross.nix
@@ -0,0 +1,22 @@
+{ config, ... }:
+
+let
+  mkCrossFrom = localSystem: pkgs: import pkgs.path {
+    inherit localSystem;
+    crossSystem = pkgs.stdenv.hostPlatform.system;
+    inherit (config.nixpkgs) config overlays;
+  };
+in
+{
+  # the configuration of which specific package set `pkgs.cross` refers to happens elsewhere;
+  # here we just define them all.
+  nixpkgs.overlays = [
+    (next: prev: {
+      # non-emulated packages build *from* local *for* target.
+      # for large packages like the linux kernel which are expensive to build under emulation,
+      # the config can explicitly pull such packages from `pkgs.cross` to do more efficient cross-compilation.
+      crossFrom."x86_64-linux" = mkCrossFrom "x86_64-linux" next;
+      crossFrom."aarch64-linux" = mkCrossFrom "aarch64-linux" next;
+    })
+  ];
+}
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -1,61 +1,80 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 {
  imports = [
-    ./boot.nix
+    ./bluetooth.nix
+    ./cross.nix
    ./feeds.nix
-    ./fs
-    ./home
-    ./hosts.nix
+    ./fs.nix
+    ./hardware
+    ./i2p.nix
    ./ids.nix
    ./machine-id.nix
-    ./net
-    ./nix.nix
-    ./polyunfill.nix
-    ./programs
-    ./quirks.nix
+    ./net.nix
    ./secrets.nix
-    ./snapper.nix
    ./ssh.nix
-    ./systemd.nix
-    ./users
+    ./users.nix
+    ./vpn.nix
  ];

-
-  # docs: https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersion
-  # this affects where nixos modules look for stateful data which might have been migrated across releases.
-  system.stateVersion = "21.11";
-
+  sane.home-manager.enable = true;
  sane.nixcache.enable-trusted-keys = true;
-  sane.nixcache.enable = lib.mkDefault true;
-  sane.persist.enable = lib.mkDefault true;
-  sane.root-on-tmpfs = lib.mkDefault true;
-  sane.programs.sysadminUtils.enableFor.system = lib.mkDefault true;
-  sane.programs.sysadminExtraUtils.enableFor.system = lib.mkDefault true;
-  sane.programs.consoleUtils.enableFor.user.colin = lib.mkDefault true;
+  sane.packages.enableConsolePkgs = true;
+  sane.packages.enableSystemPkgs = true;

-  services.buffyboard.enable = true;
-  services.buffyboard.settings.theme.default = "pmos-light";
-  # services.buffyboard.settings.quirks.fbdev_force_refresh = true;
-  services.buffyboard.extraFlags = [ "--verbose" ];
+  sane.persist.sys.plaintext = [
+    "/var/log"
+    "/var/backup"  # for e.g. postgres dumps
+    # TODO: move elsewhere
+    "/var/lib/alsa"                # preserve output levels, default devices
+    "/var/lib/colord"              # preserve color calibrations (?)
+    "/var/lib/machines"            # maybe not needed, but would be painful to add a VM and forget.
+  ];

-  # irqbalance monitors interrupt count (as a daemon) and assigns high-frequency interrupts to different CPUs.
-  # that reduces contention between simultaneously-fired interrupts.
-  services.irqbalance.enable = true;
+  nixpkgs.config.allowUnfree = true;

  # time.timeZone = "America/Los_Angeles";
  time.timeZone = "Etc/UTC";  # DST is too confusing for me => use a stable timezone

-  system.activationScripts.nixClosureDiff = {
-    supportsDryActivation = true;
-    text = ''
-      # show which packages changed versions or are new/removed in this upgrade
-      # source: <https://github.com/luishfonseca/dotfiles/blob/32c10e775d9ec7cc55e44592a060c1c9aadf113e/modules/upgrade-diff.nix>
-      # modified to not error on boot (when /run/current-system doesn't exist)
-      if [ -d /run/current-system ]; then
-        ${lib.getExe pkgs.nvd} --nix-bin-dir=${pkgs.nix}/bin diff /run/current-system "$systemConfig"
-      fi
+  # allow `nix flake ...` command
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
  '';
+  # allow `nix-shell` (and probably nix-index?) to locate our patched and custom packages
+  nix.nixPath = [
+    "nixpkgs=${pkgs.path}"
+    "nixpkgs-overlays=${../..}/overlays"
+  ];
+
+  # TODO: move this into home-manager?
+  fonts = {
+    enableDefaultFonts = true;
+    fonts = with pkgs; [ font-awesome twitter-color-emoji hack-font ];
+    fontconfig.enable = true;
+    fontconfig.defaultFonts = {
+      emoji = [ "Font Awesome 6 Free" "Twitter Color Emoji" ];
+      monospace = [ "Hack" ];
+      serif = [ "DejaVu Serif" ];
+      sansSerif = [ "DejaVu Sans" ];
    };
+  };
+
+  # disable non-required packages like nano, perl, rsync, strace
+  environment.defaultPackages = [];
+
+  # programs.vim.defaultEditor = true;
+  environment.variables = {
+    EDITOR = "vim";
+    # git claims it should use EDITOR, but it doesn't!
+    GIT_EDITOR = "vim";
+    # TODO: these should be moved to `home.sessionVariables` (home-manager)
+    # Electron apps should use native wayland backend:
+    #   https://nixos.wiki/wiki/Slack#Wayland
+    # Discord under sway crashes with this.
+    # NIXOS_OZONE_WL = "1";
+    # LIBGL_ALWAYS_SOFTWARE = "1";
+  };
+  # enable zsh completions
+  environment.pathsToLink = [ "/share/zsh" ];

  # link debug symbols into /run/current-system/sw/lib/debug
  # hopefully picked up by gdb automatically?
--- a/hosts/common/feeds.nix
+++ b/hosts/common/feeds.nix
@@ -1,15 +1,3 @@
-# where to find good stuff?
-# - universal search/directory: <https://podcastindex.org>
-#   - the full database is downloadable
-# - find adjacent podcasts: <https://rephonic.com/graph>
-# - charts: <https://rephonic.com/charts/apple/united-states/technology>
-# - list of lists: <https://en.wikipedia.org/wiki/Category:Lists_of_podcasts>
-# - podcasts w/ a community: <https://lemmyverse.net/communities?query=podcast>
-# - podcast recs:
-#   - active lemmy: <https://slrpnk.net/c/podcasts>
-#   - old thread: <https://lemmy.ml/post/1565858>
-#
-# - paywall bypass / bootlegs: <https://jumble.top/>
 { lib, sane-data, ... }:
 let
  hourly = { freq = "hourly"; };
@@ -25,7 +13,6 @@ let
  uncat = { cat = "uncat"; };

  text = { format = "text"; };
-  img = { format = "image"; };

  mkRss = format: url: { inherit url format; } // uncat // infrequent;
  # format-specific helpers
@@ -42,18 +29,16 @@ let
    in {
      url = raw.url;
      # not sure the exact mapping with velocity here: entries per day?
-      freq = lib.mkIf (raw.velocity or 0 != 0) (lib.mkDefault (
-        if raw.velocity > 2 then
+      freq = lib.mkDefault (
+        if raw.velocity or 0 > 2 then
          "hourly"
-        else if raw.velocity > 0.5 then
+        else if raw.velocity or 0 > 0.5 then
          "daily"
-        else if raw.velocity > 0.1 then
+        else if raw.velocity or 0 > 0.1 then
          "weekly"
        else
          "infrequent"
-      ));
-    } // lib.optionalAttrs (lib.hasPrefix "https://www.youtube.com/" raw.url) {
-      format = "video";
+      );
    } // lib.optionalAttrs (raw.is_podcast or false) {
      format = "podcast";
    } // lib.optionalAttrs (raw.title or "" != "") {
@@ -61,262 +46,136 @@ let
    };

  podcasts = [
-    (fromDb "404media.co/the-404-media-podcast" // tech)
-    (fromDb "acquiredlpbonussecretsecret.libsyn.com" // tech)  # ACQ2 - more "Acquired" episodes
-    (fromDb "adventofcomputing.com" // tech)  # computing history
-    (fromDb "api.oyez.org/podcasts/oral-arguments/2015" // pol)  # Supreme Court Oral Arguments ("2015" in URL means nothing -- it's still updated)
-    (fromDb "anchor.fm/s/34c7232c/podcast/rss" // tech)  # Civboot -- https://anchor.fm/civboot
-    (fromDb "anchor.fm/s/2da69154/podcast/rss" // tech)  # POD OF JAKE -- https://podofjake.com/
-    (fromDb "bluecityblues.org.podcastpage.io" // pol)  # hosts overlap with Seattle Nice
-    (fromDb "buzzsprout.com/2126417" // tech)  # Mystery AI Hype Theater 3000
-    (fromDb "cast.postmarketos.org" // tech)
-    (fromDb "congressionaldish.libsyn.com" // pol)  # Jennifer Briney
-    (fromDb "craphound.com" // pol)  # Cory Doctorow -- both podcast & text entries
-    (fromDb "darknetdiaries.com" // tech)
-    (fromDb "dwarkeshpatel.com" // tech)
-    (fromDb "feeds.99percentinvisible.org/99percentinvisible" // pol)  # 99% Invisible -- also available here: <https://feeds.simplecast.com/BqbsxVfO>
-    (fromDb "feeds.acast.com/public/shows/lawfare" // pol)  # <https://www.lawfaremedia.org/podcasts-multimedia/podcast/the-lawfare-podcast>
-    (fromDb "feeds.buzzsprout.com/2412334.rss")  # Matt Stoller's _Organized Money_ <https://www.organizedmoney.fm/>
-    (fromDb "feeds.eff.org/howtofixtheinternet" // pol)
-    (fromDb "feeds.feedburner.com/80000HoursPodcast" // rat)
-    (fromDb "feeds.feedburner.com/dancarlin/history" // rat)
-    (fromDb "feeds.feedburner.com/radiolab" // pol)  # Radiolab -- also available here, but ONLY OVER HTTP: <http://feeds.wnyc.org/radiolab>
-    (fromDb "feeds.megaphone.fm/CHTAL4990341033" // pol)  # ChinaTalk: https://www.chinatalk.media/podcast
-    (fromDb "feeds.megaphone.fm/GLT1412515089" // pol)  # JRE: Joe Rogan Experience
-    (fromDb "feeds.megaphone.fm/behindthebastards" // pol)  # also Maggie Killjoy
-    (fromDb "feeds.megaphone.fm/cspantheweekly" // pol)
-    (fromDb "feeds.megaphone.fm/econ102")  # Noah Smith + Erik Torenberg <https://www.podpage.com/econ102/>
-    (fromDb "feeds.megaphone.fm/history102")  # <https://www.podpage.com/history-102-with-whatifalthist/>
-    (fromDb "feeds.megaphone.fm/recodedecode" // tech)  # The Verge - Decoder
-    (fromDb "feeds.megaphone.fm/thiswontlast" // tech)  # <https://www.podpage.com/thiswontlast/>
-    (fromDb "feeds.megaphone.fm/unexplainable")
-    (fromDb "feeds.simplecast.com/wgl4xEgL" // rat)  # Econ Talk
-    (fromDb "feeds.transistor.fm/acquired" // tech)
-    (fromDb "feeds.transistor.fm/complex-systems-with-patrick-mckenzie-patio11" // tech)  # Patrick Mackenzie (from Bits About Money)
-    (fromDb "feeds.twit.tv/floss.xml" // tech)
-    (fromDb "fulltimenix.com" // tech)
-    (fromDb "futureofcoding.org/episodes" // tech)
-    (fromDb "hackerpublicradio.org" // tech)
    (fromDb "lexfridman.com/podcast" // rat)
-    (fromDb "linktr.ee/betteroffline" // pol)
-    (fromDb "linuxdevtime.com" // tech)
-    (fromDb "malicious.life" // tech)
-    (fromDb "mapspodcast.libsyn.com" // uncat)  # Multidisciplinary Association for Psychedelic Studies
-    (fromDb "motherearthnewsandfriends.libsyn.com" // uncat)  # off-grid living
-    (fromDb "microarch.club" // tech)
-    (fromDb "nocturnepodcast.org")
-    (fromDb "omegataupodcast.net" // tech)  # 3/4 German; 1/4 eps are English
-    (fromDb "omny.fm/shows/cool-people-who-did-cool-stuff" // pol)  # Maggie Killjoy -- referenced by Cory Doctorow
-    (fromDb "omny.fm/shows/money-stuff-the-podcast")  # Matt Levine
-    (fromDb "omny.fm/shows/stuff-you-should-know-1")
-    (fromDb "omny.fm/shows/the-dollop-with-dave-anthony-and-gareth-reynolds")  # The Dollop history/comedy
-    (fromDb "omny.fm/shows/weird-little-guys")  # Cool Zone Media
-    (fromDb "originstories.libsyn.com" // uncat)
-    (fromDb "podcast.ergaster.org/@flintandsilicon" // tech)  # Thib's podcast: public interest tech, gnome, etc: <https://fed.uninsane.org/users/$ALLO9MZ5g5CsQTCBH6>
-    (fromDb "pods.media/api/rss/feed/channel/unchained" // tech)  # cryptocurrency happenings; rec via patio11
-    (fromDb "politicalorphanage.libsyn.com" // pol)
-    (fromDb "reverseengineering.libsyn.com/rss" // tech)  # UnNamed Reverse Engineering Podcast
-    (fromDb "rss.acast.com/ft-tech-tonic" // tech)  # Financial Time's: Tech Tonic
-    (fromDb "rss.art19.com/the-portal" // rat)  # Eric Weinstein
-    (fromDb "seattlenice.buzzsprout.com" // pol)  # Seattle Nice
-    (fromDb "speedboatdope.com" // pol)  # Chapo Trap House (premium feed)
-    (fromDb "srslywrong.com" // pol)
-    (fromDb "sharkbytes.transistor.fm" // tech)  # Wireshark Podcast o_0
-    (fromDb "sharptech.fm/feed/podcast" // tech)  # Ben Thompson
-    (fromDb "sscpodcast.libsyn.com" // rat)  # Astral Codex Ten; Scott Alexander
-    (fromDb "talesfromthebridge.buzzsprout.com" // tech)  # Sci-Fi? has Peter Watts; author of No Moods, Ads or Cutesy Fucking Icons (rifters.com)
-    (fromDb "techtalesshow.com" // tech)  # Corbin Davenport
-    (fromDb "theamphour.com" // tech)  # The Amp Hour
-    (fromDb "the-ben-marc-show.simplecast.com" // tech // pol)  # Ben Horowitz + Marc Andreessen; love to hate em
-    (fromDb "timclicks.dev/compose-podcast" // tech)  # Rust-heavy dev interviews
-    (fromDb "werenotwrong.fireside.fm" // pol)  # We're Not Wrong
-    (fromDb "whycast.podcast.audio/@whycast" // tech)  # What Hackers Yearn [for]: <https://why2025.org/>
-    (mkPod "https://sfconservancy.org/casts/the-corresponding-source/feeds/ogg/" // tech)
-
-    # (fromDb "allinchamathjason.libsyn.com" // pol)
-    # (fromDb "feed.podbean.com/matrixlive/feed.xml" // tech)  # Matrix (chat) Live
-    # (fromDb "feeds.libsyn.com/421877" // rat)  # Less Wrong Curated
-    # (fromDb "feeds.megaphone.fm/hubermanlab" // uncat)  # Daniel Huberman on sleep
-    # (fromDb "feeds.simplecast.com/54nAGcIl" // pol)  # The Daily
-    # (fromDb "feeds.simplecast.com/82FI35Px" // pol)  # Ezra Klein Show
-    # (fromDb "feeds.simplecast.com/l2i9YnTd" // tech // pol)  # Hard Fork (NYtimes tech)
-    # (fromDb "feeds.simplecast.com/whlwDbyc" // tech)  # Tech Lounge: <https://chrischinchilla.com/podcast/techlounge/>
-    # (fromDb "feeds.simplecast.com/xKJ93w_w" // uncat)  # Atlas Obscura
-    # (fromDb "iheart.com/podcast/1119-away-days-podcast-reporti-275359753" // pol)  # Away Days (Cool Zone Media)
-    # (fromDb "lastweekinai.com" // tech)  # Last Week in AI
-    # (fromDb "mintcast.org" // tech)
-    # (fromDb "podcast.posttv.com/itunes/post-reports.xml" // pol)
-    # (fromDb "podcast.sustainoss.org" // tech)  # "Sustainable tech", only... it somehow manages to avoid any tech which is actually sustainable, and most of the time doesn't even talk about Open Source Software (!). normie/surface-level/"feel good"
-    # (fromDb "podcast.thelinuxexp.com" // tech)  # low-brow linux/foss PR announcements
-    # (fromDb "politicspoliticspolitics.com" // pol)  # don't judge me. Justin Robert Young.
-    # (fromDb "rss.acast.com/deconstructed")  # The Intercept - Deconstructed
-    # (fromDb "rss.acast.com/intercepted-with-jeremy-scahill")  # The Intercept - Intercepted
-    # (fromDb "rss.art19.com/60-minutes" // pol)
-    # (fromDb "rss.art19.com/your-welcome" // pol)  # Michael Malice - Your Welcome -- also available here: <https://origin.podcastone.com/podcast?categoryID2=2232>
-    # (fromDb "rss.prod.firstlook.media/deconstructed/podcast.rss" // pol)  #< possible URL rot
-    # (fromDb "rss.prod.firstlook.media/intercepted/podcast.rss" // pol)  #< possible URL rot
-    # (fromDb "sites.libsyn.com/438684" // humor)  # Quorators - digging up *weird* Quota questions
-    # (fromDb "techwontsave.us" // pol)  # rec by Cory Doctorow, but way too info-sparse
-    # (fromDb "trashfuturepodcast.podbean.com" // pol)  # rec by Cory Doctorow, but way rambly
-    # (fromDb "wakingup.libsyn.com" // pol)  # Sam Harris, but he just repeats himself now
-    # (mkPod "https://anchor.fm/s/21bc734/podcast/rss" // pol // infrequent)  # Emerge: making sense of what's next -- <https://www.whatisemerging.com/emergepodcast>
-    # (mkPod "https://audioboom.com/channels/5097784.rss" // tech)  # Lateral with Tom Scott
-    # (mkPod "https://feeds.megaphone.fm/RUNMED9919162779" // pol // infrequent)  # The Witch Trials of J.K. Rowling: <https://www.thefp.com/witchtrials>
-    # (mkPod "https://podcasts.la.utexas.edu/this-is-democracy/feed/podcast/" // pol // weekly)
+    # (mkPod "https://lexfridman.com/feed/podcast/" // rat // weekly)
+    ## Astral Codex Ten
+    (fromDb "sscpodcast.libsyn.com" // rat)
+    ## Econ Talk
+    (fromDb "feeds.simplecast.com/wgl4xEgL" // rat)
+    ## Cory Doctorow -- both podcast & text entries
+    (fromDb "craphound.com" // pol)
+    (mkPod "https://congressionaldish.libsyn.com/rss" // pol // infrequent)
+    ## Civboot -- https://anchor.fm/civboot
+    (fromDb "anchor.fm/s/34c7232c/podcast/rss" // tech)
+    (fromDb "feeds.feedburner.com/80000HoursPodcast" // rat)
+    (fromDb "allinchamathjason.libsyn.com" // pol)
+    (fromDb "acquired.libsyn.com" // tech)
+    # The Intercept - Deconstructed; also available: <rss.acast.com/deconstructed>
+    (fromDb "rss.prod.firstlook.media/deconstructed/podcast.rss" // pol)
+    ## The Daily
+    (mkPod "https://feeds.simplecast.com/54nAGcIl" // pol // daily)
+    # The Intercept - Intercepted; also available: <https://rss.acast.com/intercepted-with-jeremy-scahill>
+    (fromDb "rss.prod.firstlook.media/intercepted/podcast.rss" // pol)
+    (fromDb "podcast.posttv.com/itunes/post-reports.xml" // pol)
+    ## Eric Weinstein
+    (fromDb "rss.art19.com/the-portal" // rat)
+    (fromDb "darknetdiaries.com" // tech)
+    ## Radiolab -- also available here, but ONLY OVER HTTP: <http://feeds.wnyc.org/radiolab>
+    (fromDb "feeds.feedburner.com/radiolab" // pol)
+    ## Sam Harris
+    (fromDb "wakingup.libsyn.com" // pol)
+    ## 99% Invisible -- also available here: <https://feeds.simplecast.com/BqbsxVfO>
+    (fromDb "feeds.99percentinvisible.org/99percentinvisible" // pol)
+    (fromDb "rss.acast.com/ft-tech-tonic" // tech)
+    (fromDb "feeds.feedburner.com/dancarlin/history" // rat)
+    (fromDb "rss.art19.com/60-minutes" // pol)
+    ## The Verge - Decoder
+    (fromDb "feeds.megaphone.fm/recodedecode" // tech)
+    ## Matrix (chat) Live
+    (fromDb "feed.podbean.com/matrixlive/feed.xml" // tech)
+    ## Michael Malice - Your Welcome -- also available here: <https://origin.podcastone.com/podcast?categoryID2=2232>
+    (fromDb "rss.art19.com/your-welcome" // pol)
  ];

  texts = [
-    (fromDb "ergaster.org/blog" // tech)  # Thib's blog: public interest tech, gnome, etc: <https://fed.uninsane.org/users/$ALLO9MZ5g5CsQTCBH6>
-    (fromDb "acoup.blog/feed")  # history, states. author: <https://historians.social/@bretdevereaux/following>
-    (fromDb "amosbbatto.wordpress.com" // tech)
-    (fromDb "anish.lakhwara.com" // tech)
-    (fromDb "antipope.org")  # Charles Stross
-    (fromDb "apenwarr.ca/log/rss.php" // tech)  # CEO of tailscale
-    (fromDb "applieddivinitystudies.com" // rat)
-    (fromDb "artemis.sh" // tech)
-    (fromDb "ascii.textfiles.com" // tech)  # Jason Scott
-    (fromDb "austinvernon.site" // tech)
-    (fromDb "buttondown.email" // tech)
-    (fromDb "ben-evans.com/benedictevans" // pol)
-    (fromDb "bitbashing.io" // tech)
-    (fromDb "bitsaboutmoney.com" // uncat)
-    (fromDb "blog.danieljanus.pl" // tech)
-    (fromDb "blog.dshr.org" // pol)  # David Rosenthal
-    (fromDb "blog.jmp.chat" // tech)
-    (fromDb "blog.rust-lang.org" // tech)
-    (fromDb "blog.thalheim.io" // tech)  # Mic92
-    (fromDb "blog.brixit.nl" // tech)  # Martijn Braam
-    (fromDb "bunniestudios.com" // tech)  # Bunnie Juang
-    (fromDb "capitolhillseattle.com" // pol)
-    (fromDb "edwardsnowden.substack.com" // pol // text)
-    (fromDb "fasterthanli.me" // tech)
-    (fromDb "gwern.net" // rat)
-    (fromDb "hardcoresoftware.learningbyshipping.com" // tech)  # Steven Sinofsky
-    (fromDb "harihareswara.net" // tech // pol)  # rec by Cory Doctorow
-    (fromDb "ianthehenry.com" // tech)
-    (fromDb "idiomdrottning.org" // uncat)
-    (fromDb "interconnected.org/home/feed" // rat)  # Matt Webb -- engineering-ish, but dreamy
-    (fromDb "jeffgeerling.com" // tech)
-    (fromDb "jefftk.com" // tech)
-    (fromDb "justine.lol" // tech)
-    (fromDb "jwz.org/blog" // tech // pol)  # DNA lounge guy, loooong-time blogger
-    (fromDb "kill-the-newsletter.com/feeds/joh91bv7am2pnznv.xml" // pol)  # Matt Levine - Money Stuff
-    (fromDb "kosmosghost.github.io/index.xml" // tech)
-    (fromDb "linmob.net" // tech)
-    (fromDb "lwn.net" // tech)
-    (fromDb "lynalden.com" // pol)
-    (fromDb "mako.cc/copyrighteous" // tech // pol)  # rec by Cory Doctorow
-    (fromDb "mg.lol" // tech)
-    (fromDb "mindingourway.com" // rat)
-    (fromDb "momi.ca" // tech)  # Anjan, pmOS
-    (fromDb "morningbrew.com/feed" // pol)
-    (fromDb "nixpkgs.news" // tech)
-    (fromDb "overcomingbias.com" // rat)  # Robin Hanson
-    (fromDb "palladiummag.com" // uncat)
-    (fromDb "philosopher.coach" // rat)  # Peter Saint-Andre -- side project of stpeter.im
-    (fromDb "pomeroyb.com" // tech)
-    (fromDb "postmarketos.org/blog" // tech)
-    (fromDb "preposterousuniverse.com" // rat)  # Sean Carroll
-    (fromDb "project-insanity.org" // tech)  # shared blog by a few NixOS devs, notably onny
-    (fromDb "putanumonit.com" // rat)  # mostly dating topics. not advice, or humor, but looking through a social lens
-    (fromDb "richardcarrier.info" // rat)
-    (fromDb "rifters.com/crawl" // uncat)  # No Moods, Ads or Cutesy Fucking Icons
-    (fromDb "righto.com" // tech)  # Ken Shirriff
-    (fromDb "rootsofprogress.org" // rat)  # Jason Crawford
-    (fromDb "samuel.dionne-riel.com" // tech)  # SamuelDR
-    (fromDb "sagacioussuricata.com" // tech)  # ian (Sanctuary)
-    (fromDb "semiaccurate.com" // tech)
-    (fromDb "sideways-view.com" // rat)  # Paul Christiano
-    (fromDb "slatecave.net" // tech)
-    (fromDb "slimemoldtimemold.com" // rat)
-    (fromDb "spectrum.ieee.org" // tech)
-    (fromDb "stpeter.im/atom.xml" // pol)
-    (fromDb "thisweek.gnome.org" // tech)
-    (fromDb "tuxphones.com" // tech)
-    (fromDb "uninsane.org" // tech)
-    (fromDb "unintendedconsequenc.es" // rat)
-    (fromDb "vitalik.eth.limo" // tech)  # Vitalik Buterin
-    (fromDb "weekinethereumnews.com" // tech)
-    (fromDb "willow.phantoma.online")  # wizard@xyzzy.link
-    (fromDb "xn--gckvb8fzb.com" // tech)
-    (fromDb "xorvoid.com" // tech)
-    (fromDb "www.thebignewsletter.com" // pol)
-    (mkSubstack "astralcodexten" // rat // daily)  # Scott Alexander
-    (mkSubstack "chlamchowder" // tech)  # details CPU advancements
-    (mkSubstack "eliqian" // rat // weekly)
-    (mkSubstack "oversharing" // pol // daily)
-    (mkSubstack "samkriss" // humor // infrequent)
-    (mkText "http://benjaminrosshoffman.com/feed" // pol // weekly)
-    (mkText "http://boginjr.com/feed" // tech // infrequent)
-    (mkText "https://forum.merveilles.town/rss.xml" // pol // infrequent)  #quality RSS list here: <https://forum.merveilles.town/thread/57/share-your-rss-feeds%21-6/>
-    (mkText "https://icm.museum/rss20.xml" // tech // infrequent)  # Interim Computer Museum
-    (mkText "https://jvns.ca/atom.xml" // tech // weekly)  # Julia Evans
+    # AGGREGATORS (> 1 post/day)
+    (fromDb "lesswrong.com" // rat)
+    (fromDb "econlib.org" // pol)
+
+    # AGGREGATORS (< 1 post/day)
+    (mkText "https://palladiummag.com/feed" // uncat // weekly)
+    (mkText "https://profectusmag.com/feed" // uncat // weekly)
+    (mkText "https://semiaccurate.com/feed" // tech // weekly)
    (mkText "https://linuxphoneapps.org/blog/atom.xml" // tech // infrequent)
-    (mkText "https://nixos.org/blog/announcements-rss.xml" // tech // infrequent)  # more nixos stuff here, but unclear how to subscribe: <https://nixos.org/blog/categories.html>
-    (mkText "https://nixos.org/blog/stories-rss.xml" // tech // weekly)
-    (mkText "https://solar.lowtechmagazine.com/posts/index.xml" // tech // weekly)
-    (mkText "https://www.stratechery.com/rss" // pol // weekly)  # Ben Thompson
+    (mkText "https://spectrum.ieee.org/rss" // tech // weekly)

-    # (fromDb "balajis.com" // pol)  # Balaji
-    # (fromDb "drewdevault.com" // tech)
-    # (fromDb "econlib.org" // pol)
-    # (fromDb "lesswrong.com" // rat)
-    # (fromDb "profectusmag.com" // pol)  # some conservative/libertarian think tank
-    # (fromDb "thediff.co" // pol)  # Byrne Hobart; 80% is subscriber-only
-    # (fromDb "thesideview.co" // uncat)  # spiritual journal; RSS items are stubs
-    # (fromDb "theregister.com" // tech)
-    # (fromDb "vitalik.ca" // tech)  # moved to vitalik.eth.limo
-    # (fromDb "webcurious.co.uk" // uncat)  # link aggregator; defunct?
-    # (mkSubstack "doomberg" // tech // weekly)  # articles are all pay-walled
+    ## No Moods, Ads or Cutesy Fucking Icons
+    (mkText "https://www.rifters.com/crawl/?feed=rss2" // uncat // weekly)
+
+    # DEVELOPERS
+    (fromDb "uninsane.org" // tech)
+    (fromDb "mg.lol" // tech)
+    ## Ken Shirriff
+    (fromDb "righto.com" // tech)
+    ## Vitalik Buterin
+    (mkText "https://vitalik.ca/feed.xml" // tech // infrequent)
+    ## ian (Sanctuary)
+    (mkText "https://sagacioussuricata.com/feed.xml" // tech // infrequent)
+    ## Bunnie Juang
+    (mkText "https://www.bunniestudios.com/blog/?feed=rss2" // tech // infrequent)
+    (mkText "https://blog.danieljanus.pl/atom.xml" // tech // infrequent)
+    (mkText "https://ianthehenry.com/feed.xml" // tech // infrequent)
+    (mkText "https://bitbashing.io/feed.xml" // tech // infrequent)
+    (mkText "https://idiomdrottning.org/feed.xml" // uncat // daily)
+    (mkText "https://anish.lakhwara.com/home.html" // tech // weekly)
+    (mkText "https://www.jefftk.com/news.rss" // tech // daily)
+    (mkText "https://pomeroyb.com/feed.xml" // tech // infrequent)
+
+    # (TECH; POL) COMMENTATORS
+    (fromDb "edwardsnowden.substack.com" // pol // text)
+    (mkText "http://benjaminrosshoffman.com/feed" // pol // weekly)
+    ## Ben Thompson
+    (mkText "https://www.stratechery.com/rss" // pol // weekly)
+    ## Balaji
+    (mkText "https://balajis.com/rss" // pol // weekly)
+    (mkText "https://www.ben-evans.com/benedictevans/rss.xml" // pol // weekly)
+    (mkText "https://www.lynalden.com/feed" // pol // infrequent)
+    (mkText "https://austinvernon.site/rss.xml" // tech // infrequent)
+    (mkSubstack "oversharing" // pol // daily)
+    (mkSubstack "doomberg" // tech // weekly)
+    ## David Rosenthal
+    (mkText "https://blog.dshr.org/rss.xml" // pol // weekly)
+    ## Matt Levine
+    (mkText "https://www.bloomberg.com/opinion/authors/ARbTQlRLRjE/matthew-s-levine.rss" // pol // weekly)
+    (mkText "https://stpeter.im/atom.xml" // pol // weekly)
+
+    # RATIONALITY/PHILOSOPHY/ETC
+    (mkSubstack "samkriss" // humor // infrequent)
+    (mkText "https://unintendedconsequenc.es/feed" // rat // infrequent)
+    (mkText "https://applieddivinitystudies.com/atom.xml" // rat // weekly)
+    (mkText "https://slimemoldtimemold.com/feed.xml" // rat // weekly)
+    (mkText "https://www.richardcarrier.info/feed" // rat // weekly)
+    (mkText "https://www.gwern.net/feed.xml" // uncat // infrequent)
+    ## Jason Crawford
+    (mkText "https://rootsofprogress.org/feed.xml" // rat // weekly)
+    ## Robin Hanson
+    (mkText "https://www.overcomingbias.com/feed" // rat // daily)
+    ## Scott Alexander
+    (mkSubstack "astralcodexten" // rat // daily)
+    ## Paul Christiano
+    (mkText "https://sideways-view.com/feed" // rat // infrequent)
+    ## Sean Carroll
+    (mkText "https://www.preposterousuniverse.com/rss" // rat // infrequent)
+
+    ## mostly dating topics. not advice, or humor, but looking through a social lens
+    (mkText "https://putanumonit.com/feed" // rat // infrequent)
+
+    # CODE
    # (mkText "https://github.com/Kaiteki-Fedi/Kaiteki/commits/master.atom" // tech // infrequent)
-    # (mkText "https://til.simonwillison.net/tils/feed.atom" // tech // weekly)
-    # (mkText "https://www.bloomberg.com/opinion/authors/ARbTQlRLRjE/matthew-s-levine.rss" // pol // weekly)  # Matt Levine (preview/paywalled)
-  ];
-
-  videos = [
-    (fromDb "youtube.com/@Channel5YouTube" // pol)
-    (fromDb "youtube.com/@ContraPoints" // pol)
-    (fromDb "youtube.com/@Exurb1a")
-    (fromDb "youtube.com/@hbomberguy")
-    (fromDb "youtube.com/@JackStauber")
-    (fromDb "youtube.com/@jaketran")
-    (fromDb "youtube.com/@kurzgesagt")
-    (fromDb "youtube.com/@mii_beta" // tech)  # Baby Wogue / gnome reviewer
-    (fromDb "youtube.com/@Matrixdotorg" // tech)  # Matrix Live
-    (fromDb "youtube.com/@NativLang")
-    (fromDb "youtube.com/@PolyMatter")
-    (fromDb "youtube.com/@scenesbyben" // pol)  # video essays
-    (fromDb "youtube.com/@TechnologyConnections" // tech)
-    (fromDb "youtube.com/@theodd1sout")
-    (fromDb "youtube.com/@TomScottGo")
-    (fromDb "youtube.com/@TVW_Washington" // pol)  # interviews with WA public officials
-    (fromDb "youtube.com/@veritasium")
-    (fromDb "youtube.com/@Vihart")
-    (fromDb "youtube.com/@InnuendoStudios" // pol)  # breaks down the nastier political strategies, from a "politics is power" angle
-
-    # (fromDb "youtube.com/@CasuallyExplained" // pol)
-    # (fromDb "youtube.com/@ColdFusion")
-    # (fromDb "youtube.com/@rossmanngroup" // pol // tech)  # Louis Rossmann
-    # (fromDb "youtube.com/@TheB1M")
-    # (fromDb "youtube.com/@tested" // tech)  # Adam Savage  (uploads too frequently)
-    # (fromDb "youtube.com/@Vox")
-    # (fromDb "youtube.com/@Vsauce")  # they're all like 1-minute long videos now? what happened @Vsauce?
  ];

  images = [
-    (fromDb "catandgirl.com" // img // humor)
-    (fromDb "davidrevoy.com" // img // art)
-    (fromDb "grumpy.website" // img // humor)
-    (fromDb "miniature-calendar.com" // img // art // daily)
-    (fromDb "pbfcomics.com" // img // humor)
-    (fromDb "poorlydrawnlines.com/feed" // img // humor)
-    (fromDb "smbc-comics.com" // img // humor)
-    (fromDb "turnoff.us" // img // humor)
-    (fromDb "xkcd.com" // img // humor)
+    (mkImg "https://www.smbc-comics.com/comic/rss" // humor // daily)
+    (mkImg "https://xkcd.com/atom.xml" // humor // daily)
+    (mkImg "https://pbfcomics.com/feed" // humor // infrequent)
+    # (mkImg "http://dilbert.com/feed" // humor // daily)
+
+    # ART
+    (mkImg "https://miniature-calendar.com/feed" // art // daily)
  ];
 in
 {
-  sane.feeds = texts ++ images ++ podcasts ++ videos;
+  sane.feeds = texts ++ images ++ podcasts;

  assertions = builtins.map
    (p: {
--- a/hosts/common/fs.nix
+++ b/hosts/common/fs.nix
@@ -0,0 +1,74 @@
+{ pkgs, ... }:
+
+let sshOpts = rec {
+  fsType = "fuse.sshfs";
+  optionsBase = [
+    "x-systemd.automount"
+    "_netdev"
+    "user"
+    "identityfile=/home/colin/.ssh/id_ed25519"
+    "allow_other"
+    "default_permissions"
+  ];
+  optionsColin = optionsBase ++ [
+    "transform_symlinks"
+    "idmap=user"
+    "uid=1000"
+    "gid=100"
+  ];
+
+  optionsRoot = optionsBase ++ [
+    # we don't transform_symlinks because that breaks the validity of remote /nix stores
+    "sftp_server=/run/wrappers/bin/sudo\\040/run/current-system/sw/libexec/sftp-server"
+  ];
+};
+in
+{
+  environment.pathsToLink = [
+    # needed to achieve superuser access for user-mounted filesystems (see optionsRoot above)
+    # we can only link whole directories here, even though we're only interested in pkgs.openssh
+    "/libexec"
+  ];
+
+  fileSystems."/mnt/servo-media-wan" = {
+    device = "colin@uninsane.org:/var/lib/uninsane/media";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsColin;
+    noCheck = true;
+  };
+  fileSystems."/mnt/servo-media-lan" = {
+    device = "colin@servo:/var/lib/uninsane/media";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsColin;
+    noCheck = true;
+  };
+  fileSystems."/mnt/servo-root-wan" = {
+    device = "colin@uninsane.org:/";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsRoot;
+    noCheck = true;
+  };
+  fileSystems."/mnt/servo-root-lan" = {
+    device = "colin@servo:/";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsRoot;
+    noCheck = true;
+  };
+  fileSystems."/mnt/desko-home" = {
+    device = "colin@desko:/home/colin";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsColin;
+    noCheck = true;
+  };
+  fileSystems."/mnt/desko-root" = {
+    device = "colin@desko:/";
+    inherit (sshOpts) fsType;
+    options = sshOpts.optionsRoot;
+    noCheck = true;
+  };
+
+  environment.systemPackages = [
+    pkgs.sshfs-fuse
+  ];
+}
+
--- a/hosts/common/fs/default.nix
+++ b/hosts/common/fs/default.nix
@@ -1,51 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./remote-home.nix
-    ./remote-servo.nix
-  ];
-  # some services which use private directories error if the parent (/var/lib/private) isn't 700.
-  sane.fs."/var/lib/private".dir.acl.mode = "0700";
-
-
-  # allocate a proper /tmp fs, else its capacity will be limited as per impermanence defaults (i.e. 1 GB).
-  fileSystems."/tmp" = {
-    device = "none";
-    fsType = "tmpfs";
-    options = [
-      "mode=777"
-      "defaults"
-    ];
-  };
-
-  # in-memory compressed RAM
-  # defaults to compressing at most 50% size of RAM
-  # claimed compression ratio is about 2:1
-  # - but on moby w/ zstd default i see 4-7:1  (ratio lowers as it fills)
-  # note that idle overhead is about 0.05% of capacity (e.g. 2B per 4kB page)
-  # docs: <https://www.kernel.org/doc/Documentation/blockdev/zram.txt>
-  #
-  # to query effectiveness:
-  # `cat /sys/block/zram0/mm_stat`. whitespace separated fields:
-  # - *orig_data_size*  (bytes)
-  # - *compr_data_size* (bytes)
-  # - mem_used_total    (bytes)
-  # - mem_limit         (bytes)
-  # - mem_used_max      (bytes)
-  # - *same_pages*  (pages which are e.g. all zeros (consumes no additional mem))
-  # - *pages_compacted*  (pages which have been freed thanks to compression)
-  # - huge_pages  (incompressible)
-  #
-  # see also:
-  # - `man zramctl`
-  zramSwap.enable = true;
-  # how much ram can be swapped into the zram device.
-  # this shouldn't be higher than the observed compression ratio.
-  # the default is 50% (why?)
-  # 100% should be "guaranteed" safe so long as the data is even *slightly* compressible.
-  # but it decreases working memory under the heaviest of loads by however much space the compressed memory occupies (e.g. 50% if 2:1; 25% if 4:1)
-  zramSwap.memoryPercent = 100;
-
-  programs.fuse.userAllowOther = true;  #< necessary for `allow_other` or `allow_root` options.
-}
-
--- a/hosts/common/fs/fs-opts.nix
+++ b/hosts/common/fs/fs-opts.nix
@@ -1,76 +0,0 @@
-# docs
-# - x-systemd options: <https://www.freedesktop.org/software/systemd/man/systemd.mount.html>
-# - fuse options: `man mount.fuse`
-rec {
-  common = [
-    "_netdev"
-    "noatime"
-    # user: allow any user with access to the device to mount the fs.
-    #       note that this requires a suid `mount` binary; see: <https://zameermanji.com/blog/2022/8/5/using-fuse-without-root-on-linux/>
-    "user"
-    "x-systemd.requires=network-online.target"
-    "x-systemd.after=network-online.target"
-    "x-systemd.mount-timeout=10s"  # how long to wait for mount **and** how long to wait for unmount
-    # disable defaults: don't fail local-fs.target if this mount fails
-    "nofail"
-  ];
-  # x-systemd.automount: mount the fs automatically *on first access*.
-  # creates a `path-to-mount.automount` systemd unit.
-  automount = [ "x-systemd.automount" ];
-  # noauto: don't mount as part of remote-fs.target.
-  # N.B.: `remote-fs.target` is a dependency of multi-user.target, itself of graphical.target.
-  # hence, omitting `noauto` can slow down boots.
-  noauto = [ "noauto" ];
-  # lazyMount: defer mounting until first access from userspace.
-  # see: `man systemd.automount`, `man automount`, `man autofs`
-  lazyMount = noauto ++ automount;
-
-  fuse = [
-    "allow_other"  # allow users other than the one who mounts it to access it. needed, if systemd is the one mounting this fs (as root)
-    # allow_root: allow root to access files on this fs (if mounted by non-root, else it can always access them).
-    #             N.B.: if both allow_root and allow_other are specified, then only allow_root takes effect.
-    # "allow_root"
-    # default_permissions: enforce local permissions check. CRUCIAL if using `allow_other`.
-    # w/o this, permissions mode of sshfs is like:
-    # - sshfs runs all remote commands as the remote user.
-    # - if a local user has local permissions to the sshfs mount, then their file ops are sent blindly across the tunnel.
-    # - `allow_other` allows *any* local user to access the mount, and hence any local user can now freely become the remote mapped user.
-    # with default_permissions, sshfs doesn't tunnel file ops from users until checking that said user could perform said op on an equivalent local fs.
-    "default_permissions"
-    "drop_privileges"
-    "auto_unmount"  #< ensures that when the fs exits, it releases its mountpoint. then systemd can recognize it as failed.
-  ];
-  fuseColin = fuse ++ [
-    "uid=1000"
-    "gid=100"
-  ];
-
-  ssh = common ++ fuseColin ++ [
-    "identityfile=/home/colin/.ssh/id_ed25519"
-    # i *think* idmap=user means that `colin` on `localhost` and `colin` on the remote are actually treated as the same user, even if their uid/gid differs?
-    # i.e., local colin's id is translated to/from remote colin's id on every operation?
-    "idmap=user"
-  ];
-  sshColin = ssh ++ fuseColin ++ [
-    # follow_symlinks: remote files which are symlinks are presented to the local system as ordinary files (as the target of the symlink).
-    #                  if the symlink target does not exist, the presentation is unspecified.
-    #                  symlinks which point outside the mount ARE followed. so this is more capable than `transform_symlinks`
-    "follow_symlinks"
-    # symlinks on the remote fs which are absolute paths are presented to the local system as relative symlinks pointing to the expected data on the remote fs.
-    # only symlinks which would point inside the mountpoint are translated.
-    "transform_symlinks"
-  ];
-  # sshRoot = ssh ++ [
-  #   # we don't transform_symlinks because that breaks the validity of remote /nix stores
-  #   "sftp_server=/run/wrappers/bin/sudo\\040/run/current-system/sw/libexec/sftp-server"
-  # ];
-
-  # manually perform a ftp mount via e.g.
-  #   curlftpfs -o ftpfs_debug=2,user=anonymous:anonymous,connect_timeout=10 -f -s ftp://servo-hn /mnt/my-ftp
-  ftp = common ++ fuseColin ++ [
-    # "ftpfs_debug=2"
-    "user=colin:ipauth"
-    # connect_timeout=10: casting shows to T.V. fails partway through about half the time
-    "connect_timeout=20"
-  ];
-}
--- a/hosts/common/fs/remote-home.nix
+++ b/hosts/common/fs/remote-home.nix
@@ -1,85 +0,0 @@
-{ config, lib, ... }:
-let
-  fsOpts = import ./fs-opts.nix;
-  ifSshAuthorized = lib.mkIf (((config.sane.hosts.by-name."${config.networking.hostName}" or {}).ssh or {}).authorized or false);
-
-  remoteHome = name: { host ? name }: let
-    mountpoint = "/mnt/${name}/home";
-    device = "sshfs#colin@${host}:/home/colin";
-    fsType = "fuse3";
-    options = fsOpts.sshColin ++ fsOpts.lazyMount;
-  in {
-    sane.programs.sshfs-fuse.enableFor.system = true;
-    system.fsPackages = [
-      config.sane.programs.sshfs-fuse.package
-    ];
-    fileSystems."${mountpoint}" = {
-      inherit device fsType options;
-      noCheck = true;
-    };
-    # tell systemd about the mount so that i can sandbox it
-    systemd.mounts = [{
-      where = mountpoint;
-      what = device;
-      type = fsType;
-      options = lib.concatStringsSep "," options;
-      wantedBy = [ "default.target" ];
-      after = [
-        "emergency.service"
-        "network-online.target"
-      ];
-      requires = [ "network-online.target" ];
-
-      unitConfig.Conflicts = [
-        # emergency.service drops the user into a root shell;
-        # only accessible via physical TTY, but unmount sensitive data before that as a precaution.
-        "emergency.service"
-      ];
-
-      # mountConfig.LazyUnmount = true;  #< else it _ocassionally_ fails "target is busy"
-
-      mountConfig.ExecSearchPath = [ "/run/current-system/sw/bin" ];
-      mountConfig.User = "colin";
-      mountConfig.AmbientCapabilities = "CAP_SETPCAP CAP_SYS_ADMIN";
-      # hardening (systemd-analyze security mnt-desko-home.mount):
-      # TODO: i can't use ProtectSystem=full here, because i can't create a new mount space; but...
-      # with drop_privileges, i *could* sandbox the actual `sshfs` program using e.g. bwrap
-      mountConfig.CapabilityBoundingSet = "CAP_SETPCAP CAP_SYS_ADMIN";
-      mountConfig.LockPersonality = true;
-      mountConfig.MemoryDenyWriteExecute = true;
-      mountConfig.NoNewPrivileges = true;
-      mountConfig.ProtectClock = true;
-      mountConfig.ProtectHostname = true;
-      mountConfig.RemoveIPC = true;
-      mountConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-      #VVV this includes anything it reads from, e.g. /bin/sh; /nix/store/...
-      # see `systemd-analyze filesystems` for a full list
-      mountConfig.RestrictFileSystems = "@common-block @basic-api fuse";
-      mountConfig.RestrictRealtime = true;
-      mountConfig.RestrictSUIDSGID = true;
-      mountConfig.SystemCallArchitectures = "native";
-      mountConfig.SystemCallFilter = [
-        "@system-service"
-        "@mount"
-        "~@chown"
-        "~@cpu-emulation"
-        "~@keyring"
-        # could remove almost all io calls, however one has to keep `open`, and `write`, to communicate with the fuse device.
-        # so that's pretty useless as a way to prevent write access
-      ];
-      mountConfig.IPAddressDeny = "any";
-      mountConfig.IPAddressAllow = "10.0.0.0/8";
-      mountConfig.DevicePolicy = "closed";  # only allow /dev/{null,zero,full,random,urandom}
-      mountConfig.DeviceAllow = "/dev/fuse";
-      # mount.mountConfig.RestrictNamespaces = true;  #< my sshfs sandboxing uses bwrap
-    }];
-  };
-in
-lib.mkMerge [
-  (ifSshAuthorized (remoteHome "crappy" {}))
-  (ifSshAuthorized (remoteHome "desko" {}))
-  (ifSshAuthorized (remoteHome "flowy" {}))
-  # (ifSshAuthorized (remoteHome "lappy" {}))
-  (ifSshAuthorized (remoteHome "moby" { host = "moby-hn"; }))
-  (ifSshAuthorized (remoteHome "servo" {}))
-]
--- a/hosts/common/fs/remote-servo.nix
+++ b/hosts/common/fs/remote-servo.nix
@@ -1,132 +0,0 @@
-{ config, lib, utils, ... }:
-let
-  fsOpts = import ./fs-opts.nix;
-  commonOptions = fsOpts.ftp ++ fsOpts.noauto;
-  mountpoint = "/mnt/.servo_ftp";
-  systemdName = utils.escapeSystemdPath mountpoint;
-  device = "curlftpfs#ftp://servo-hn:/";
-  fsType = "fuse3";
-  options = commonOptions ++ [
-    # systemd (or maybe fuse?) swallows stderr of mount units with no obvious fix.
-    # instead, use this flag to log the mount output to disk
-    "stderr_path=/var/log/curlftpfs/servo-hn.stderr"
-  ];
-
-  remoteServo = subdir: {
-    # sane.fs."/mnt/servo/${subdir}".mount.bind = "/mnt/.servo_ftp/${subdir}";
-    systemd.mounts = [{
-      where = "/mnt/servo/${subdir}";
-      what = "/mnt/.servo_ftp/${subdir}";
-      options = "bind,nofail";
-      type = "auto";
-
-      after = [ "${systemdName}.mount" ];
-      upheldBy = [ "${systemdName}.mount" ];  #< start this mount whenever the underlying becomes available
-      bindsTo = [ "${systemdName}.mount" ];  #< stop this mount whenever the underlying disappears
-    }];
-  };
-in
-lib.mkMerge [
-  {
-    sane.programs.curlftpfs.enableFor.system = true;
-    system.fsPackages = [
-      config.sane.programs.curlftpfs.package
-    ];
-
-    sane.fs."/var/log/curlftpfs".dir.acl.mode = "0777";
-
-    fileSystems."/mnt/.servo_ftp" = {
-      inherit device fsType options;
-      noCheck = true;
-    };
-    systemd.mounts = [{
-      where = mountpoint;
-      what = device;
-      type = fsType;
-      options = lib.concatStringsSep "," options;
-      wantedBy = [ "default.target" ];
-      after = [ "network-online.target" ];
-      requires = [ "network-online.target" ];
-
-      #VVV patch so that when the mount fails, we start a timer to remount it.
-      #    and for a disconnection after a good mount (onSuccess), restart the timer to be more aggressive
-      unitConfig.OnFailure = [ "${systemdName}.timer" ];
-      unitConfig.OnSuccess = [ "${systemdName}-restart-timer.target" ];
-
-      mountConfig.TimeoutSec = "10s";
-      mountConfig.ExecSearchPath = [ "/run/current-system/sw/bin" ];
-      mountConfig.User = "colin";
-      mountConfig.AmbientCapabilities = "CAP_SETPCAP CAP_SYS_ADMIN";
-      # hardening (systemd-analyze security mnt-servo-playground.mount)
-      mountConfig.CapabilityBoundingSet = "CAP_SETPCAP CAP_SYS_ADMIN";
-      mountConfig.LockPersonality = true;
-      mountConfig.MemoryDenyWriteExecute = true;
-      mountConfig.NoNewPrivileges = true;
-      mountConfig.ProtectClock = true;
-      mountConfig.ProtectHostname = true;
-      mountConfig.RemoveIPC = true;
-      mountConfig.RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-      #VVV this includes anything it reads from, e.g. /bin/sh; /nix/store/...
-      # see `systemd-analyze filesystems` for a full list
-      mountConfig.RestrictFileSystems = "@common-block @basic-api fuse";
-      mountConfig.RestrictRealtime = true;
-      mountConfig.RestrictSUIDSGID = true;
-      mountConfig.SystemCallArchitectures = "native";
-      mountConfig.SystemCallFilter = [
-        "@system-service"
-        "@mount"
-        "~@chown"
-        "~@cpu-emulation"
-        "~@keyring"
-        # could remove almost all io calls, however one has to keep `open`, and `write`, to communicate with the fuse device.
-        # so that's pretty useless as a way to prevent write access
-      ];
-      mountConfig.IPAddressDeny = "any";
-      mountConfig.IPAddressAllow = "10.0.10.5";
-      mountConfig.DevicePolicy = "closed";  # only allow /dev/{null,zero,full,random,urandom}
-      mountConfig.DeviceAllow = "/dev/fuse";
-      # mountConfig.RestrictNamespaces = true;
-    }];
-
-    systemd.targets."${systemdName}-restart-timer" = {
-      # hack unit which, when started, stops the timer (if running), and then starts it again.
-      after = [ "${systemdName}.timer" ];
-      conflicts = [ "${systemdName}.timer" ];
-      upholds = [ "${systemdName}.timer" ];
-      unitConfig.StopWhenUnneeded = true;
-    };
-    systemd.timers."${systemdName}" = {
-      timerConfig.Unit = "${systemdName}.mount";
-      timerConfig.AccuracySec = "2s";
-      timerConfig.OnActiveSec = [
-        # try to remount at these timestamps, backing off gradually
-        # there seems to be an implicit mount attempt at t=0.
-        "10s"
-        "30s"
-        "60s"
-        "120s"
-      ];
-      # cap the backoff to a fixed interval.
-      timerConfig.OnUnitActiveSec = [ "120s" ];
-    };
-  }
-
-  # this granularity of servo media mounts is necessary to support sandboxing. consider:
-  #   1. servo offline
-  #   2. launch a long-running app
-  #   3. servo comes online
-  # in order for the servo mount to be propagated into the app's namespace, we need to bind
-  # the root mountpoint into the app namespace. if we wish to only grant the app selective access
-  # to servo, we must create *multiple* mountpoints: /mnt/servo/FOO directories which always exist,
-  # and are individually bound to /mnt/.servo_ftp/FOO as the latter becomes available.
-  (remoteServo "media/archive")
-  (remoteServo "media/Books")
-  (remoteServo "media/collections")
-  # (remoteServo "media/datasets")
-  (remoteServo "media/games")
-  (remoteServo "media/Music")
-  (remoteServo "media/Pictures/macros")
-  (remoteServo "media/torrents")
-  (remoteServo "media/Videos")
-  (remoteServo "playground")
-]
--- a/hosts/common/hardware/all.nix
+++ b/hosts/common/hardware/all.nix
@@ -0,0 +1,40 @@
+{ lib, pkgs, ... }:
+
+{
+  boot.initrd.supportedFilesystems = [ "ext4" "btrfs" "ext2" "ext3" "vfat" ];
+  # useful emergency utils
+  boot.initrd.extraUtilsCommands = ''
+    copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfstune
+  '';
+  boot.kernelParams = [ "boot.shell_on_fail" ];
+  # other kernelParams:
+  #   "boot.trace"
+  #   "systemd.log_level=debug"
+  #   "systemd.log_target=console"
+
+  # hack in the `boot.shell_on_fail` arg since that doesn't always seem to work.
+  boot.initrd.preFailCommands = "allowShell=1";
+
+  # default: 4 (warn). 7 is debug
+  boot.consoleLogLevel = 7;
+
+  boot.loader.grub.enable = lib.mkDefault false;
+  boot.loader.generic-extlinux-compatible.enable = lib.mkDefault true;
+
+  # non-free firmware
+  hardware.enableRedistributableFirmware = true;
+  services.fwupd.enable = true;
+
+  # powertop will default to putting USB devices -- including HID -- to sleep after TWO SECONDS
+  powerManagement.powertop.enable = false;
+
+  # services.snapper.configs = {
+  #   root = {
+  #     subvolume = "/";
+  #     extraConfig = {
+  #       ALLOW_USERS = "colin";
+  #     };
+  #   };
+  # };
+  # services.snapper.snapshotInterval = "daily";
+}
--- a/hosts/modules/services/default.nix
+++ b/hosts/modules/services/default.nix
@@ -1,6 +1,8 @@
 { ... }:
+
 {
  imports = [
-    ./rsync-net
+    ./all.nix
+    ./x86_64.nix
  ];
 }
--- a/hosts/common/hardware/x86_64.nix
+++ b/hosts/common/hardware/x86_64.nix
@@ -0,0 +1,26 @@
+{ lib, pkgs, ... }:
+
+with lib;
+{
+  config = mkIf (pkgs.system == "x86_64-linux") {
+    boot.initrd.availableKernelModules = [
+      "xhci_pci" "ahci" "sd_mod" "sdhci_pci"  # nixos-generate-config defaults
+      "usb_storage"   # rpi needed this to boot from usb storage, i think.
+      "nvme"  # to boot from nvme devices
+      # efi_pstore evivars
+    ];
+
+    # enable cross compilation
+    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+    # nixpkgs.config.allowUnsupportedSystem = true;
+    # nixpkgs.crossSystem.system = "aarch64-linux";
+
+    powerManagement.cpuFreqGovernor = "powersave";
+    hardware.cpu.amd.updateMicrocode = true;    # desktop
+    hardware.cpu.intel.updateMicrocode = true;  # laptop
+
+    hardware.opengl.driSupport = true;
+    # For 32 bit applications
+    hardware.opengl.driSupport32Bit = true;
+  };
+}
--- a/hosts/common/home/default.nix
+++ b/hosts/common/home/default.nix
@@ -1,9 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./fs.nix
-    ./mime.nix
-    ./ssh.nix
-    ./xdg-dirs.nix
-  ];
-}
--- a/Show More
+++ b/Show More