feeds: import econlib

2023-01-11 10:47:27 +00:00
534 changed files with 6840 additions and 29323 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -8,7 +8,7 @@ keys:
  - &host_servo age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf
  - &host_moby age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt
 creation_rules:
-  - path_regex: secrets/common*
+  - path_regex: secrets/universal*
    key_groups:
    - age:
      - *user_desko_colin
@@ -26,19 +26,19 @@ creation_rules:
      - *user_lappy_colin
      - *user_servo_colin
      - *host_servo
-  - path_regex: secrets/desko*
+  - path_regex: secrets/desko.yaml$
    key_groups:
    - age:
      - *user_desko_colin
      - *user_lappy_colin
      - *host_desko
-  - path_regex: secrets/lappy*
+  - path_regex: secrets/lappy.yaml$
    key_groups:
    - age:
      - *user_lappy_colin
      - *user_desko_colin
      - *host_lappy
-  - path_regex: secrets/moby*
+  - path_regex: secrets/moby.yaml$
    key_groups:
    - age:
      - *user_desko_colin
--- a/README.md
+++ b/README.md
@@ -1,108 +0,0 @@
-## What's Here
-
-this is the top-level repo from which i configure/deploy all my NixOS machines:
- desktop
- laptop
- server
- mobile phone
-
-i enjoy a monorepo approach. this repo references [nixpkgs][nixpkgs], a couple 3rd party
-nix modules like [sops][sops], the sources for [uninsane.org][uninsane-org], and that's
-about it. custom derivations and modules (some of which i try to upstream) live
-directly here; even the sources for those packages is often kept here too.
-
-[nixpkgs]: https://github.com/NixOS/nixpkgs
-[sops]: https://github.com/Mic92/sops-nix
-[uninsane-org]: https://uninsane.org
-
-## Layout
- `hosts/`
-    - the bulk of config which isn'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, it's most likely for something in this directory.
- `nixpatches/`
-    - literally, diffs i apply atop upstream nixpkgs before performing further eval.
- `overlays/`
-    - exposed via the `overlays` output in `flake.nix`.
-    - 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/additional/sane-scripts/` for CLI tools
-      that are highly specific to my setup).
- `scripts/`
-    - scripts which are referenced by other things in this repo.
-    - these aren't generally user-facing, but they're factored out so that they can
-      be invoked directly when i need to debug.
- `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/`
-    - exposed via the `templates` output in `flake.nix`.
-    - 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`)
-    - values defined here are applied neither at evaluation time _nor_ at activation time.
-        - rather, they become systemd services.
-        - systemd manages dependencies
-        - e.g. link `/var/www -> /mnt/my-drive/www` only _after_ `/mnt/my-drive/www` appears)
-    - 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.
- `modules/persist/`
-    - my alternative to the Impermanence module.
-    - this builds atop `modules/fs/` to achieve things stock impermanence can't:
-        - persist things to encrypted storage which is unlocked at login time (pam_mount).
-        - "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.
- `modules/programs.nix`
-    - 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;`
- `modules/users.nix`
-    - convenience layer atop the above modules so that you can just write
-      `fs.".config/git"` instead of `fs."/home/colin/.config/git"`
-
-some things in here could easily find broader use. if you would find benefit in
-them being factored out of my config, message me and we could work to make that happen.
-
-[home-manager]: https://github.com/nix-community/home-manager
-
-## Using This Repo In Your Own Config
-
-this should be a pretty "standard" flake. just reference it, and import either
- `nixosModules.sane` (for the modules)
- `overlays.pkgs` (for the packages)
-
-## 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).
--- a/TODO.md
+++ b/TODO.md
@@ -1,86 +0,0 @@
-## BUGS
- why i need to manually restart `wireguard-wg-ovpns` on servo periodically
-	- else DNS fails
-
-## REFACTORING:
-
-### sops/secrets
- attach secrets to the thing they're used by (sane.programs)
- rework secrets to leverage `sane.fs`
- remove sops activation script as it's covered by my systemd sane.fs impl
-
-### roles
- allow any host to take the role of `uninsane.org`
-    - will make it easier to test new services?
-
-### upstreaming
- split out a trust-dns module
-  - see: <https://github.com/NixOS/nixpkgs/pull/205866#issuecomment-1575753054>
- split out a sxmo module usable by NUR consumers
- bump nodejs version in lemmy-ui
- add updateScripts to all my packages in nixpkgs
- fix lightdm-mobile-greeter for newer libhandy
- port zecwallet-lite to a from-source build
- REVIEW/integrate jellyfin dataDir config: <https://github.com/NixOS/nixpkgs/pull/233617>
- remove `libsForQt5.callPackage` broadly: <https://github.com/NixOS/nixpkgs/issues/180841>
-
-
-## IMPROVEMENTS:
-### security/resilience
- validate duplicity backups!
- encrypt more ~ dirs (~/archives, ~/records, ..?)
-    - best to do this after i know for sure i have good backups
- have `sane.programs` be wrapped such that they run in a cgroup?
-    - at least, only give them access to the portion of the fs they *need*.
-    - Android takes approach of giving each app its own user: could hack that in here.
-    - **systemd-run** takes a command and runs it in a temporary scope (cgroup)
-      - presumably uses the same options as systemd services
-      - see e.g. <https://github.com/NixOS/nixpkgs/issues/113903#issuecomment-857296349>
-    - flatpak does this, somehow
-    - apparmor?  SElinux?  (desktop) "portals"?
-    - see Spectrum OS; Alyssa Ross; etc
- canaries for important services
-    - e.g. daily email checks; daily backup checks
-    - integrate `nix check` into Gitea actions?
-
-### user experience
- neovim: set up language server (lsp; rnix-lsp; nvim-lspconfig)
- firefox/librewolf: don't show browserpass/sponsorblock/metamask "first run" on every boot
- moby: improve gPodder launch time
- moby: theme GTK apps (i.e. non-adwaita styles)
-  - especially, make the menubar collapsible
- package Nix/NixOS docs for Zeal
-    - install [doc-browser](https://github.com/qwfy/doc-browser)
-    - this supports both dash (zeal) *and* the datasets from <https://devdocs.io> (which includes nix!)
-    - install [devhelp](https://wiki.gnome.org/Apps/Devhelp)  (gnome)
- have xdg-open parse `<repo:...> URIs (or adjust them so that it _can_ parse)
- `sane.programs`: auto-populate defaults with everything from `pkgs`
- `sane.persist`: auto-create parent dirs in ~/private
-  - currently if the application doesn't autocreate dirs leading to its destination, then ~/private storage fails
-  - this might be why librewolf on mobile is still amnesiac
- sane-bt-search: show details like 5.1 vs stereo, h264 vs h265
- 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"
-
-### perf
- why does zsh take so long to init?
- why does nixos-rebuild switch take 5 minutes when net is flakey?
-    - trying to auto-mount servo?
-    - something to do with systemd services restarting/stalling
-    - maybe wireguard & its refresh operation, specifically?
- fix OOM for large builds like webkitgtk
-    - these use significant /tmp space.
-    - either place /tmp on encrypted-cleared-at-boot storage
-        - which probably causes each CPU load for the encryption
-    - or have nix builds use a subdir of /tmp like /tmp/nix/...
-        - and place that on non-encrypted clear-on-boot (with very lax writeback/swappiness to minimize writes)
-    - **or set up encrypted swap**
-        - encrypted swap could remove the need for my encrypted-cleared-at-boot stuff
-
-
-## NEW FEATURES:
- migrate MAME cabinet to nix
-    - boot it from PXE from servo?
- enable IPv6
--- a/flake.lock
+++ b/flake.lock
@@ -1,15 +1,12 @@
 {
  "nodes": {
    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
      "locked": {
-        "lastModified": 1687709756,
-        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
        "type": "github"
      },
      "original": {
@@ -18,14 +15,35 @@
        "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": 1683422260,
-        "narHash": "sha256-79zaClbubRkBNlJ04OSADILuLQHH48N5fu296hEWYlw=",
+        "lastModified": 1670131242,
+        "narHash": "sha256-T/o1/3gffr010fsqgNshs1NJJjsnUYvQnUZgm6hilsY=",
        "owner": "nixos",
        "repo": "mobile-nixos",
-        "rev": "ba4638836e94a8f16d1d1f9e8c0530b86078029c",
+        "rev": "5ee45cc1f8e43f4af14ee17ccef9156b0db8cd77",
        "type": "github"
      },
      "original": {
@@ -34,75 +52,75 @@
        "type": "github"
      }
    },
-    "nix-serve": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1687251388,
-        "narHash": "sha256-E9cVlgeCvzPbA/G3mCDCzz8TdRwXyGYzIjmwcvIfghg=",
-        "owner": "edolstra",
-        "repo": "nix-serve",
-        "rev": "d6df5bd8584f37e22cff627db2fc4058a4aab5ee",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "nix-serve",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unpatched"
+        ]
+      },
      "locked": {
-        "lastModified": 1606086654,
-        "narHash": "sha256-VFl+3eGIMqNp7cyOMJ6TjM/+UcsLKtodKoYexrlTJMI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "19db3e5ea2777daa874563b5986288151f502e27",
-        "type": "github"
+        "lastModified": 1,
+        "narHash": "sha256-5eJxyBRYQCoRt92ZFUOdT237Z0VscuNRd0pktDYWJYE=",
+        "path": "nixpatches",
+        "type": "path"
      },
      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-20.09",
-        "type": "indirect"
+        "path": "nixpatches",
+        "type": "path"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1687031877,
-        "narHash": "sha256-yMFcVeI+kZ6KD2QBrFPNsvBrLq2Gt//D0baHByMrjFY=",
+        "lastModified": 1673163619,
+        "narHash": "sha256-B33PFBL64ZgTWgMnhFL3jgheAN/DjHPsZ1Ih3z0VE5I=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e2e2059d19668dab1744301b8b0e821e3aae9c99",
+        "rev": "8c54d842d9544361aac5f5b212ba04e4089e8efe",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-22.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1673100377,
+        "narHash": "sha256-mT76pTd0YFxT6CwtPhDgHJhuIgLY+ZLSMiQpBufwMG4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9f11a2df77cb945c115ae2a65f53f38121597d73",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-23.05",
+        "ref": "release-22.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-unpatched": {
      "locked": {
-        "lastModified": 1688049487,
-        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
-        "owner": "nixos",
+        "lastModified": 1673226411,
+        "narHash": "sha256-b6cGb5Ln7Zy80YO66+cbTyGdjZKtkoqB/iIIhDX9gRA=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
+        "rev": "aa1d74709f5dac623adb4d48fdfb27cc2c92a4d4",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
+        "id": "nixpkgs",
        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "indirect"
      }
    },
    "root": {
      "inputs": {
+        "home-manager": "home-manager",
        "mobile-nixos": "mobile-nixos",
-        "nix-serve": "nix-serve",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
        "nixpkgs-unpatched": "nixpkgs-unpatched",
        "sops-nix": "sops-nix",
        "uninsane-dot-org": "uninsane-dot-org"
@@ -111,16 +129,16 @@
    "sops-nix": {
      "inputs": {
        "nixpkgs": [
-          "nixpkgs-unpatched"
+          "nixpkgs"
        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1687398569,
-        "narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
+        "lastModified": 1673147300,
+        "narHash": "sha256-gR9OEfTzWfL6vG0qkbn1TlBAOlg4LuW8xK/u0V41Ihc=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "2ff6973350682f8d16371f8c071a304b8067f192",
+        "rev": "2253120d2a6147e57bafb5c689e086221df8032f",
        "type": "github"
      },
      "original": {
@@ -129,34 +147,19 @@
        "type": "github"
      }
    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "uninsane-dot-org": {
      "inputs": {
        "flake-utils": "flake-utils",
        "nixpkgs": [
-          "nixpkgs-unpatched"
+          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1687821285,
-        "narHash": "sha256-pw0UYKG8yhW1H3nPgAhVYCzYFXYtamMh2DmF8YhtRec=",
+        "lastModified": 1666870107,
+        "narHash": "sha256-b9eXZxSwhzdJI5uQgfrMhu4SY2POrPkinUg7F5gQVYo=",
        "ref": "refs/heads/master",
-        "rev": "ae27eb61b55b6c6d83c25384fb163df398a80265",
-        "revCount": 201,
+        "rev": "80c6ec95bd430e29d231cf745f19279bb76fb382",
+        "revCount": 164,
        "type": "git",
        "url": "https://git.uninsane.org/colin/uninsane"
      },
--- a/flake.nix
+++ b/flake.nix
@@ -1,150 +1,82 @@
-# 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>
+# docs:
+# - <https://nixos.wiki/wiki/Flakes>
 # - <https://serokell.io/blog/practical-nix-flakes>
-#
-#
-# COMMON OPERATIONS:
-# - update a specific flake input:
-#   - `nix flake lock --update-input nixpkgs`

 {
-  # 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 = {
-    # branch workflow:
-    # - daily:
-    #   - nixos-unstable cut from master after enough packages have been built in caches.
-    # - every 6 hours:
-    #   - master auto-merged into staging.
-    #   - staging-next auto-merged into staging.
-    # - manually, approximately once per month:
-    #   - staging-next is cut from staging.
-    #   - staging-next merged into master.
-    #
-    # which branch to source from?
-    # - for everyday development, prefer `nixos-unstable` branch, as it provides good caching.
-    # - if need to test bleeding updates (e.g. if submitting code into staging):
-    #   - use `staging-next` if it's been cut (i.e. if there's an active staging-next -> master PR)
-    #   - use `staging` if no staging-next branch has been cut.
-    #
-    # <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
-    nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
-    # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging";
-
+    nixpkgs-stable.url = "nixpkgs/nixos-22.11";
+    nixpkgs-unpatched.url = "nixpkgs/nixos-unstable";
+    nixpkgs = {
+      url = "path:nixpatches";
+      inputs.nixpkgs.follows = "nixpkgs-unpatched";
+    };
    mobile-nixos = {
-      # <https://github.com/nixos/mobile-nixos>
      url = "github:nixos/mobile-nixos";
      flake = false;
    };
+    home-manager = {
+      url = "github:nix-community/home-manager/release-22.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    sops-nix = {
-      # <https://github.com/Mic92/sops-nix>
      url = "github:Mic92/sops-nix";
-      # inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs-unpatched";
+      inputs.nixpkgs.follows = "nixpkgs";
    };
    uninsane-dot-org = {
      url = "git+https://git.uninsane.org/colin/uninsane";
-      # inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs-unpatched";
-    };
-    nix-serve = {
-      # <https://github.com/edolstra/nix-serve>
-      url = "github:edolstra/nix-serve";
+      inputs.nixpkgs.follows = "nixpkgs";
    };
  };

  outputs = {
    self,
+    nixpkgs,
+    nixpkgs-stable,
    nixpkgs-unpatched,
    mobile-nixos,
+    home-manager,
    sops-nix,
-    uninsane-dot-org,
-    nix-serve,
-    ...
-  }@inputs:
+    uninsane-dot-org
+  }:
    let
-      inherit (builtins) attrNames elem listToAttrs map mapAttrs;
-      mapAttrs' = f: set:
-        listToAttrs (map (attr: f attr set.${attr}) (attrNames set));
-      # mapAttrs but without the `name` argument
-      mapAttrValues = f: mapAttrs (_: f);
-      # rather than apply our nixpkgs patches as a flake input, do that here instead.
-      # this (temporarily?) resolves the bad UX wherein a subflake residing in the same git
-      # repo as the main flake causes the main flake to have an unstable hash.
-      nixpkgs = (import ./nixpatches/flake.nix).outputs {
-        self = nixpkgs;
-        nixpkgs = nixpkgs-unpatched;
-      };
+      nixpkgsCompiledBy = local: nixpkgs.legacyPackages."${local}";

-      nixpkgsCompiledBy = system: nixpkgs.legacyPackages."${system}";
-
-      evalHost = { name, local, target }: nixpkgs.lib.nixosSystem {
-        system = target;
-        modules = [
-          (import ./hosts/instantiate.nix { localSystem = local; hostName = name; })
-          self.nixosModules.default
-          self.nixosModules.passthru
-          {
-            nixpkgs.overlays = [
-              self.overlays.passthru
-              self.overlays.sane-all
-            ];
-          }
-          ({ lib, ... }: {
-            # TODO: does the earlier `system` arg to nixosSystem make its way here?
-            nixpkgs.hostPlatform.system = target;
-            # nixpkgs.buildPlatform = local;  # set by instantiate.nix instead
-            # nixpkgs.config.replaceStdenv = { pkgs }: pkgs.ccacheStdenv;
-          })
-        ];
-      };
-    in {
-      nixosConfigurations =
+      evalHost = { name, local, target }:
        let
-          hosts = {
-            servo =  { name = "servo"; local = "x86_64-linux"; target = "x86_64-linux"; };
-            desko =  { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; };
-            lappy =  { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; };
-            moby  =  { name = "moby";  local = "x86_64-linux"; target = "aarch64-linux"; };
-            rescue = { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
-          };
-          # cross-compiled builds: instead of emulating the host, build using a cross-compiler.
-          # - these are faster to *build* than the emulated variants (useful when tweaking packages),
-          # - but fewer of their packages can be found in upstream caches.
-          cross = mapAttrValues evalHost hosts;
-          emulated = mapAttrValues
-            ({name, local, target}: evalHost {
-              inherit name target;
-              local = null;
-            })
-            hosts;
-          prefixAttrs = prefix: attrs: mapAttrs'
-            (name: value: {
-              name = prefix + name;
-              inherit value;
-            })
-            attrs;
+          # XXX: we'd prefer to use `nixosSystem = (nixpkgsCompiledBy local).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.
+          nixosSystem = import ((nixpkgsCompiledBy local).path + "/nixos/lib/eval-config.nix");
        in
-          (prefixAttrs "cross-" cross) //
-          (prefixAttrs "emulated-" emulated) // {
-            # prefer native builds for these machines:
-            inherit (emulated) servo desko lappy rescue;
-            # prefer cross-compiled builds for these machines:
-            inherit (cross) moby;
-          };
+          (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
+                ];
+              }
+            ];
+          });
+    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).
@@ -160,37 +92,21 @@
      #   - 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 = mapAttrValues (host: host.config.system.build.img) self.nixosConfigurations;
+      imgs = builtins.mapAttrs (_: host-dfn: host-dfn.config.system.build.img) self.nixosConfigurations;

-      # unofficial output
-      host-pkgs = mapAttrValues (host: host.config.system.build.pkgs) self.nixosConfigurations;
-      host-programs = mapAttrValues (host: mapAttrValues (p: p.package) host.config.sane.programs) self.nixosConfigurations;
-
-      overlays = {
-        # N.B.: `nix flake check` requires every overlay to take `final: prev:` at defn site,
-        #   hence the weird redundancy.
-        default = final: prev: self.overlays.pkgs final prev;
-        sane-all = final: prev: import ./overlays/all.nix final prev;
-        disable-flakey-tests = final: prev: import ./overlays/disable-flakey-tests.nix final prev;
-        pkgs = final: prev: import ./overlays/pkgs.nix final prev;
-        pins = final: prev: import ./overlays/pins.nix final prev;
-        optimizations = final: prev: import ./overlays/optimizations.nix final prev;
-        passthru = final: prev:
+      overlays = rec {
+        default = pkgs;
+        pkgs = import ./pkgs/overlay.nix;
+        passthru =
          let
+            stable = next: prev: {
+              stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform}";
+            };
            mobile = (import "${mobile-nixos}/overlay/overlay.nix");
            uninsane = uninsane-dot-org.overlay;
-            # nix-serve' = nix-serve.overlay;
-            nix-serve' = next: prev: {
-              # XXX(2023/03/02): upstream isn't compatible with modern `nix`. probably the perl bindings.
-              # - we use the package built against `nixpkgs` specified in its flake rather than use its overlay,
-              #   to get around this.
-              inherit (nix-serve.packages."${next.system}") nix-serve;
-            };
          in
-            (mobile final prev)
-            // (uninsane final prev)
-            // (nix-serve' final prev)
-          ;
+            next: prev:
+              (stable next prev) // (mobile next prev) // (uninsane next prev);
      };

      nixosModules = rec {
@@ -198,6 +114,7 @@
        sane = import ./modules;
        passthru = { ... }: {
          imports = [
+            home-manager.nixosModule
            sops-nix.nixosModules.sops
          ];
        };
@@ -214,103 +131,35 @@
          aarch64-linux = allPkgsFor "aarch64-linux";
        };

-      # extract only our own packages from the full set.
-      # because of `nix flake check`, we flatten the package set and only surface x86_64-linux packages.
-      packages = mapAttrs
-        (system: allPkgs:
-          allPkgs.lib.filterAttrs (name: pkg:
-            # keep only packages which will pass `nix flake check`, i.e. keep only:
-            # - derivations (not package sets)
-            # - packages that build for the given platform
-            (! elem name [ "feeds" "pythonPackagesExtensions" ])
-            && (allPkgs.lib.meta.availableOn allPkgs.stdenv.hostPlatform pkg)
-          )
-          (
-            # expose sane packages and chosen inputs (uninsane.org)
-            (import ./pkgs { pkgs = allPkgs; }) // {
-              inherit (allPkgs) uninsane-dot-org;
-            }
-          )
-        )
-        # self.legacyPackages;
-        { inherit (self.legacyPackages) x86_64-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";
-          deployScript = action: pkgs.writeShellScript "deploy-moby" ''
-            nixos-rebuild --flake '.#moby' build $@
-            sudo nix sign-paths -r -k /run/secrets/nix_serve_privkey $(readlink ./result)
-            nixos-rebuild --flake '.#moby' ${action} --target-host colin@moby --use-remote-sudo $@
-          '';
        in {
          update-feeds = {
            type = "app";
-            program = "${pkgs.feeds.updateScript}";
+            program = "${pkgs.feeds.passthru.updateScript}";
          };

          init-feed = {
-            # use like `nix run '.#init-feed' uninsane.org`
            type = "app";
-            program = "${pkgs.feeds.initFeedScript}";
-          };
-
-          deploy-moby-test = {
-            # `nix run '.#deploy-moby-test'`
-            type = "app";
-            program = ''${deployScript "test"}'';
-          };
-          deploy-moby = {
-            # `nix run '.#deploy-moby-switch'`
-            type = "app";
-            program = ''${deployScript "switch"}'';
-          };
-
-          check-nur = {
-            # `nix run '.#check-nur'`
-            # validates that my repo can be included in the Nix User Repository
-            type = "app";
-            program = builtins.toString (pkgs.writeShellScript "check-nur" ''
-              cd ${./.}/integrations/nur
-              NIX_PATH= NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 nix-env -f . -qa \* --meta --xml \
-                --allowed-uris https://static.rust-lang.org \
-                --option restrict-eval true \
-                --option allow-import-from-derivation true \
-                --drv-path --show-trace \
-                -I nixpkgs=$(nix-instantiate --find-file nixpkgs) \
-                -I ../../
-            '');
+            program = "${pkgs.feeds.passthru.initFeedScript}";
          };
        };

      templates = {
-        env.python-data = {
+        python-data = {
          # initialize with:
-          # - `nix flake init -t '/home/colin/dev/nixos/#env.python-data'`
+          # - `nix flake init -t '/home/colin/dev/nixos/#python-data'`
          # then enter with:
          # - `nix develop`
-          path = ./templates/env/python-data;
+          path = ./templates/python-data;
          description = "python environment for data processing";
        };
-        pkgs.rust-inline = {
-          # initialize with:
-          # - `nix flake init -t '/home/colin/dev/nixos/#pkgs.rust-inline'`
-          path = ./templates/pkgs/rust-inline;
-          description = "rust package and development environment (inline rust sources)";
-        };
-        pkgs.rust = {
-          # initialize with:
-          # - `nix flake init -t '/home/colin/dev/nixos/#pkgs.rust'`
-          path = ./templates/pkgs/rust;
-          description = "rust package fit to ship in nixpkgs";
-        };
-        pkgs.make = {
-          # initialize with:
-          # - `nix flake init -t '/home/colin/dev/nixos/#pkgs.make'`
-          path = ./templates/pkgs/make;
-          description = "default Makefile-based derivation";
-        };
      };
    };
 }
--- 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/lappy/polyfill.nix
+++ b/hosts/by-name/lappy/polyfill.nix
@@ -1,38 +0,0 @@
-# doesn't actually *enable* anything,
-# but sets up any modules such that if they *were* enabled, they'll act as expected.
-{ pkgs, ... }:
-{
-  sane.gui.sxmo = {
-    greeter = "sway";
-    settings = {
-      # XXX: make sure the user is part of the `input` group!
-      SXMO_LISGD_INPUT_DEVICE = "/dev/input/by-id/usb-Wacom_Co._Ltd._Pen_and_multitouch_sensor-event-if00";
-      # these identifiers are from `swaymsg -t get_inputs`
-      SXMO_VOLUME_BUTTON = "1:1:AT_Translated_Set_2_keyboard";
-      # SXMO_VOLUME_BUTTON = "none";
-      SXMO_POWER_BUTTON = "0:1:Power_Button";
-      # SXMO_POWER_BUTTON = "none";
-      SXMO_DISABLE_LEDS = "1";
-      SXMO_UNLOCK_IDLE_TIME = "120";  # default
-      # sxmo tries to determine device type from /proc/device-tree/compatible,
-      # but that doesn't seem to exist on NixOS?  (or maybe it just doesn't exist
-      # on non-aarch64 builds).
-      # the device type informs (at least):
-      # - SXMO_WIFI_MODULE
-      # - SXMO_RTW_SCAN_INTERVAL
-      # - SXMO_SYS_FILES
-      # - SXMO_TOUCHSCREEN_ID
-      # - SXMO_MONITOR
-      # - SXMO_ALSA_CONTROL_NAME
-      # - SXMO_SWAY_SCALE
-      # see <repo:mil/sxmo-utils:scripts/deviceprofiles>
-      # SXMO_DEVICE_NAME = "pine64,pinephone-1.2";
-    };
-    package = pkgs.sxmo-utils.overrideAttrs (base: {
-      postPatch = (base.postPatch or "") + ''
-        # after volume-button navigation mode, restore full keyboard functionality
-        cp ${./xkb_mobile_normal_buttons} ./configs/xkb/xkb_mobile_normal_buttons
-      '';
-    });
-  };
-}
--- a/hosts/by-name/lappy/xkb_mobile_normal_buttons
+++ b/hosts/by-name/lappy/xkb_mobile_normal_buttons
@@ -1,7 +0,0 @@
-xkb_keymap {
-	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
-	xkb_types     { include "complete"	};
-	xkb_compat    { include "complete"	};
-	xkb_symbols   { include "pc+us+inet(evdev)"	};
-	xkb_geometry  { include "pc(pc105)"	};
-};
--- a/hosts/by-name/moby/default.nix
+++ b/hosts/by-name/moby/default.nix
@@ -1,110 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports = [
-    ./firmware.nix
-    ./fs.nix
-    ./kernel.nix
-    ./polyfill.nix
-  ];
-
-  sane.roles.client = true;
-  sane.services.wg-home.enable = true;
-  sane.services.wg-home.ip = config.sane.hosts.by-name."moby".wg-home.ip;
-
-  # 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";
-  services.getty.autologinUser = "root";  # allows for emergency maintenance?
-
-  sops.secrets.colin-passwd.neededForUsers = true;
-
-  sane.programs.web-browser.config = {
-    # compromise impermanence for the sake of usability
-    persistCache = "private";
-    persistData = "private";
-
-    # i don't do crypto stuff on moby
-    addons.ether-metamask.enable = false;
-    # addons.sideberry.enable = false;
-  };
-
-  sane.user.persist.plaintext = [
-    # TODO: make this just generally conditional upon pulse being enabled?
-    ".config/pulse"  # persist pulseaudio volume
-  ];
-
-  sane.gui.sxmo.enable = true;
-  # sane.programs.consoleUtils.enableFor.user.colin = false;
-  # sane.programs.guiApps.enableFor.user.colin = false;
-  sane.programs.sequoia.enableFor.user.colin = false;
-  sane.programs.tuiApps.enableFor.user.colin = false;  # visidata, others, don't compile well
-  # disabled for faster deploys (gthumb depends on webkitgtk, particularly)
-  sane.programs.soundconverter.enableFor.user.colin = false;
-  sane.programs.jellyfin-media-player.enableFor.user.colin = false;
-  # sane.programs.mpv.enableFor.user.colin = true;
-
-  boot.loader.efi.canTouchEfiVariables = false;
-  # /boot space is at a premium. default was 20.
-  # even 10 can be too much
-  # TODO: compress moby kernels!
-  boot.loader.generic-extlinux-compatible.configurationLimit = 8;
-  # mobile.bootloader.enable = false;
-  # mobile.boot.stage-1.enable = false;
-  # boot.initrd.systemd.enable = false;
-  # boot.initrd.services.swraid.enable = false;  # attempt to fix dm_mod stuff
-  # disable proximity sensor.
-  # the filtering/calibration is bad that it causes the screen to go fully dark at times.
-  boot.blacklistedKernelModules = [ "stk3310" ];
-
-  # without this some GUI apps fail: `DRM_IOCTL_MODE_CREATE_DUMB failed: Cannot allocate memory`
-  # this is because they can't allocate enough video ram.
-  # the default CMA seems to be 32M.
-  # i was running fine with 256MB from 2022/07-ish through 2022/12-ish, but then the phone quit reliably coming back from sleep: maybe a memory leak?
-  # `cat /proc/meminfo` to see CmaTotal/CmaFree if interested in tuning this.
-  boot.kernelParams = [ "cma=512M" ];
-
-  # mobile-nixos' /lib/firmware includes:
-  #   rtl_bt          (bluetooth)
-  #   anx7688-fw.bin  (USB-C -> HDMI bridge)
-  #   ov5640_af.bin   (camera module)
-  # hardware.firmware = [ config.mobile.device.firmware ];
-  hardware.firmware = [ pkgs.rtl8723cs-firmware ];
-
-  system.stateVersion = "21.11";
-
-  # defined: https://www.freedesktop.org/software/systemd/man/machine-info.html
-  # XXX colin: not sure which, if any, software makes use of this
-  environment.etc."machine-info".text = ''
-    CHASSIS="handset"
-  '';
-
-  # enable rotation sensor
-  hardware.sensor.iio.enable = true;
-
-  # inject specialized alsa configs via the environment.
-  # specifically, this gets the pinephone headphones & internal earpiece working.
-  # see pkgs/patched/alsa-ucm-conf for more info.
-  environment.variables.ALSA_CONFIG_UCM2 = "/run/current-system/sw/share/alsa/ucm2";
-  environment.pathsToLink = [ "/share/alsa/ucm2" ];
-  environment.systemPackages = [ pkgs.alsa-ucm-conf-sane ];
-  systemd =
-    let ucm-env = config.environment.variables.ALSA_CONFIG_UCM2;
-    in {
-    # cribbed from <repo:nixos/mobile-nixos:modules/quirks/audio.nix>
-
-    # pulseaudio
-    user.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = ucm-env;
-    services.pulseaudio.environment.ALSA_CONFIG_UCM2      = ucm-env;
-
-    # pipewire
-    user.services.pipewire.environment.ALSA_CONFIG_UCM2       = ucm-env;
-    user.services.pipewire-pulse.environment.ALSA_CONFIG_UCM2 = ucm-env;
-    user.services.wireplumber.environment.ALSA_CONFIG_UCM2    = ucm-env;
-    services.pipewire.environment.ALSA_CONFIG_UCM2            = ucm-env;
-    services.pipewire-pulse.environment.ALSA_CONFIG_UCM2      = ucm-env;
-    services.wireplumber.environment.ALSA_CONFIG_UCM2         = ucm-env;
-  };
-
-
-  hardware.opengl.driSupport = true;
-}
--- a/hosts/by-name/moby/kernel.nix
+++ b/hosts/by-name/moby/kernel.nix
@@ -1,83 +0,0 @@
-{ lib, pkgs, ... }:
-let
-  # use the last commit on the 5.18 branch (5.18.14)
-  # manjaro's changes between kernel patch versions tend to be minimal if any.
-  manjaroBase = "https://gitlab.manjaro.org/manjaro-arm/packages/core/linux/-/raw/25bd828cd47b1c6e09fcbcf394a649b89d2876dd";
-  manjaroPatch = name: sha256: {
-    inherit name;
-    patch = pkgs.fetchpatch {
-      inherit name;
-      url = "${manjaroBase}/${name}?inline=false";
-      inherit sha256;
-    };
-  };
-
-  # the idea for patching off Manjaro's kernel comes from jakewaksbaum:
-  # - https://git.sr.ht/~jakewaksbaum/pi/tree/af20aae5653545d6e67a459b59ee3e1ca8a680b0/item/kernel/default.nix
-  # - he later abandoned this, i think because he's using the Pinephone Pro which received mainline support.
-  manjaroPatches = [
-    (manjaroPatch
-      "1001-arm64-dts-allwinner-add-hdmi-sound-to-pine-devices.patch"
-      "sha256-DApd791A+AxB28Ven/MVAyuyVphdo8KQDx8O7oxVPnc="
-    )
-    # these patches below are critical to enable wifi (RTL8723CS)
-    # - the alternative is a wholly forked kernel by megi/megous:
-    #   - https://xnux.eu/howtos/build-pinephone-kernel.html#toc-how-to-build-megi-s-pinehpone-kernel
-    # - i don't know if these patches are based on megi's or original
-    (manjaroPatch
-      "2001-Bluetooth-Add-new-quirk-for-broken-local-ext-features.patch"
-      "sha256-CExhJuUWivegxPdnzKINEsKrMFx/m/1kOZFmlZ2SEOc="
-    )
-    (manjaroPatch
-      "2002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch"
-      "sha256-dDdvOphTcP/Aog93HyH+L9m55laTgtjndPSE4/rnzUA="
-    )
-    (manjaroPatch
-      "2004-arm64-dts-allwinner-enable-bluetooth-pinetab-pinepho.patch"
-      "sha256-o43P3WzXyHK1PF+Kdter4asuyGAEKO6wf5ixcco2kCQ="
-    )
-    # XXX: this one has a Makefile, which hardcodes /sbin/depmod:
-    # - drivers/staging/rtl8723cs/Makefile
-    # - not sure if this is problematic?
-    (manjaroPatch
-      "2005-staging-add-rtl8723cs-driver.patch"
-      "sha256-6ywm3dQQ5JYl60CLKarxlSUukwi4QzqctCj3tVgzFbo="
-    )
-  ];
-in
-{
-  # use Megi's kernel:
-  # even with the Manjaro patches, stock 5.18 has a few issues on Pinephone:
-  # - no battery charging
-  # - phone rotation sensor is off by 90 degrees
-  # - ambient light sensor causes screen brightness to be shakey
-  # - phosh greeter may not appear after wake from sleep
-  boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux-megous;
-
-  # alternatively, use nixos' kernel and add the stuff we want:
-  # # cross-compilation optimization:
-  # boot.kernelPackages =
-  #   let p = (import nixpkgs { localSystem = "x86_64-linux"; });
-  #   in p.pkgsCross.aarch64-multiplatform.linuxPackages_5_18;
-  # # non-cross:
-  # # boot.kernelPackages = pkgs.linuxPackages_5_18;
-
-  # boot.kernelPatches = manjaroPatches ++ [
-  #   (patchDefconfig kernelConfig)
-  # ];
-
-  nixpkgs.hostPlatform.linux-kernel = {
-    # defaults:
-    name = "aarch64-multiplatform";
-    baseConfig = "defconfig";
-    DTB = true;
-    autoModules = true;
-    preferBuiltin = true;
-    # extraConfig = ...
-    # ^-- raspberry pi stuff: we don't need it.
-
-    # target = "Image";  # <-- default
-    target = "Image.gz";  # <-- compress the kernel image
-    # target = "zImage";  # <-- confuses other parts of nixos :-(
-  };
-}
--- a/hosts/by-name/moby/polyfill.nix
+++ b/hosts/by-name/moby/polyfill.nix
@@ -1,26 +0,0 @@
-{ pkgs, sane-lib, ... }:
-{
-  sane.gui.sxmo = {
-    settings = {
-      # touch screen
-      SXMO_LISGD_INPUT_DEVICE = "/dev/input/by-path/platform-1c2ac00.i2c-event";
-      # vol and power are detected correctly by upstream
-
-      # preferences
-      # N.B. some deviceprofiles explicitly set SXMO_SWAY_SCALE, overwriting what we put here.
-      SXMO_SWAY_SCALE = "1.5";
-      SXMO_ROTATION_GRAVITY = "12800";
-      SXMO_LOCK_IDLE_TIME = "15";  # how long between screenoff -> lock -> back to screenoff
-      DEFAULT_COUNTRY = "US";
-      BROWSWER = "librewolf";
-    };
-    package = pkgs.sxmo-utils.overrideAttrs (base: {
-      postPatch = (base.postPatch or "") + ''
-        cat <<EOF >> ./configs/default_hooks/sxmo_hook_start.sh
-        # rotate UI based on physical display angle by default
-        sxmo_daemons.sh start autorotate sxmo_autorotate.sh
-        EOF
-      '';
-    });
-  };
-}
--- a/hosts/by-name/servo/services/calibre.nix
+++ b/hosts/by-name/servo/services/calibre.nix
@@ -1,34 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cweb-cfg = config.services.calibre-web;
-  inherit (cweb-cfg) user group;
-  inherit (cweb-cfg.listen) ip port;
-  svc-dir = "/var/lib/${cweb-cfg.dataDir}";
-in
-# XXX: disabled because of runtime errors like:
-# > File "/nix/store/c7jqvx980nlg9xhxi065cba61r2ain9y-calibre-web-0.6.19/lib/python3.10/site-packages/calibreweb/cps/db.py", line 926, in speaking_language
-# > languages = self.session.query(Languages) \
-# > AttributeError: 'NoneType' object has no attribute 'query'
-lib.mkIf false
-{
-  sane.persist.sys.plaintext = [
-    { inherit user group; mode = "0700"; directory = svc-dir; }
-  ];
-
-  services.calibre-web.enable = true;
-  services.calibre-web.listen.ip = "127.0.0.1";
-  # XXX: externally populate `${svc-dir}/metadata.db` (once) from
-  #   <https://github.com/janeczku/calibre-web/blob/master/library/metadata.db>
-  # i don't know why you have to do this??
-  # services.calibre-web.options.calibreLibrary = svc-dir;
-
-  services.nginx.virtualHosts."calibre.uninsane.org" = {
-    addSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://${ip}:${builtins.toString port}";
-    };
-  };
-  sane.dns.zones."uninsane.org".inet.CNAME."calibre" = "native";
-}
--- a/hosts/by-name/servo/services/email/default.nix
+++ b/hosts/by-name/servo/services/email/default.nix
@@ -1,37 +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
-
-{ ... }:
-{
-  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,142 +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.lan = true;
-    visibleTo.wan = true;
-    description = "colin-imap-imap.uninsane.org";
-  };
-  sane.ports.ports."993" = {
-    protocol = [ "tcp" ];
-    visibleTo.lan = true;
-    visibleTo.wan = 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"
-      # ];
-    };
-  };
-  services.dovecot2.modules = [
-    pkgs.dovecot_pigeonhole  # enables sieve execution (?)
-  ];
-  services.dovecot2.sieveScripts = {
-    # 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
-    after = builtins.toFile "ensuredkim.sieve" ''
-      require "fileinto";
-
-      if not header :contains "Authentication-Results" "dkim=pass" {
-        fileinto "Junk";
-        stop;
-      }
-    '';
-  };
-}
--- a/hosts/by-name/servo/services/ftp/default.nix
+++ b/hosts/by-name/servo/services/ftp/default.nix
@@ -1,70 +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>
-#
-# sftpgo is a FTP server that also supports WebDAV, SFTP, and web clients.
-
-
-{ lib, pkgs, sane-lib, ... }:
-let
-  authProgram = pkgs.static-nix-shell.mkBash {
-    pname = "sftpgo_external_auth_hook";
-    src = ./.;
-  };
-in
-{
-  # 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.
-  sane.ports.ports = {
-    "21" = {
-      protocol = [ "tcp" ];
-      visibleTo.lan = true;
-      description = "colin-FTP server";
-    };
-  } // (sane-lib.mapToAttrs
-    (port: {
-      name = builtins.toString port;
-      value = {
-        protocol = [ "tcp" ];
-        visibleTo.lan = true;
-        description = "colin-FTP server data port range";
-      };
-    })
-    (lib.range 50000 50100)
-  );
-
-  services.sftpgo = {
-    enable = true;
-    settings = {
-      ftpd = {
-        bindings = [{
-          address = "10.0.10.5";
-          port = 21;
-          debug = true;
-        }];
-
-        # active mode is susceptible to "bounce attacks", without much benefit over passive mode
-        disable_active_mode = true;
-        hash_support = true;
-        passive_port_range = {
-          start = 50000;
-          end = 50100;
-        };
-
-        banner = ''
-          Welcome, friends, to Colin's read-only FTP server! Also available via NFS on the same host.
-          Please let me know if anything's broken or not as it should be. Otherwise, browse and DL freely :)
-        '';
-
-      };
-      data_provider = {
-        driver = "memory";
-        external_auth_hook = "${authProgram}/bin/sftpgo_external_auth_hook";
-      };
-    };
-  };
-}
--- a/hosts/by-name/servo/services/ftp/sftpgo_external_auth_hook
+++ b/hosts/by-name/servo/services/ftp/sftpgo_external_auth_hook
@@ -1,55 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash
-# vim: set filetype=bash :
-#
-# 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.
-# TODO: don't reuse /var/nfs/export here. formalize this some other way.
-
-
-if [ "$SFTPGO_AUTHD_USERNAME" = "anonymous" ]; then
-  echo '{'
-  echo '  "status":1,'
-  echo '  "username":"anonymous","expiration_date":0,'
-  echo '  "home_dir":"/var/nfs/export","uid":65534,"gid":65534,"max_sessions":0,"quota_size":0,"quota_files":100000,'
-  echo '  "permissions":{'
-  echo '    "/":["list", "download"]'
-  echo '  },'
-  echo '  "upload_bandwidth":0,"download_bandwidth":0,'
-  echo '  "filters":{"allowed_ip":[],"denied_ip":[]},"public_keys":[]'
-  echo '}'
-else
-  echo '{"username":""}'
-fi
--- a/hosts/by-name/servo/services/jellyfin.nix
+++ b/hosts/by-name/servo/services/jellyfin.nix
@@ -1,127 +0,0 @@
-# configuration options (today i don't store my config 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?
-
-{ config, lib, ... }:
-
-{
-  # 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.plaintext = [
-    { user = "jellyfin"; group = "jellyfin"; mode = "0700"; directory = "/var/lib/jellyfin"; }
-  ];
-  sane.fs."/var/lib/jellyfin/config/logging.json" = {
-    # "Emby.Dlna" logging: <https://jellyfin.org/docs/general/networking/dlna>
-    symlink.text = ''
-      {
-        "Serilog": {
-          "MinimumLevel": {
-            "Default": "Information",
-            "Override": {
-              "Microsoft": "Warning",
-              "System": "Warning",
-              "Emby.Dlna": "Debug",
-              "Emby.Dlna.Eventing": "Debug"
-            }
-          },
-          "WriteTo": [
-            {
-              "Name": "Console",
-              "Args": {
-                "outputTemplate": "[{Timestamp:HH:mm:ss}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message:lj}{NewLine}{Exception}"
-              }
-            }
-          ],
-          "Enrich": [ "FromLogContext", "WithThreadId" ]
-        }
-      }
-    '';
-    wantedBeforeBy = [ "jellyfin.service" ];
-  };
-
-  # Jellyfin multimedia server
-  # this is mostly taken from the official jellfin.org docs
-  services.nginx.virtualHosts."jelly.uninsane.org" = {
-    addSSL = true;
-    enableACME = true;
-    # inherit kTLS;
-
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:8096";
-      extraConfig = ''
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Protocol $scheme;
-        proxy_set_header X-Forwarded-Host $http_host;
-
-        # Disable buffering when the nginx proxy gets very resource heavy upon streaming
-        proxy_buffering off;
-      '';
-    };
-    # locations."/web/" = {
-    #   proxyPass = "http://127.0.0.1:8096/web/index.html";
-    #   extraConfig = ''
-    #     proxy_set_header Host $host;
-    #     proxy_set_header X-Real-IP $remote_addr;
-    #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    #     proxy_set_header X-Forwarded-Proto $scheme;
-    #     proxy_set_header X-Forwarded-Protocol $scheme;
-    #     proxy_set_header X-Forwarded-Host $http_host;
-    #   '';
-    # };
-    locations."/socket" = {
-      proxyPass = "http://127.0.0.1:8096";
-      extraConfig = ''
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Protocol $scheme;
-        proxy_set_header X-Forwarded-Host $http_host;
-      '';
-    };
-  };
-
-  sane.dns.zones."uninsane.org".inet.CNAME."jelly" = "native";
-
-  services.jellyfin.enable = true;
-}
--- a/hosts/by-name/servo/services/komga.nix
+++ b/hosts/by-name/servo/services/komga.nix
@@ -1,22 +0,0 @@
-{ config, ... }:
-let
-  svc-cfg = config.services.komga;
-  inherit (svc-cfg) user group port stateDir;
-in
-{
-  sane.persist.sys.plaintext = [
-    { inherit user group; mode = "0700"; directory = stateDir; }
-  ];
-
-  services.komga.enable = true;
-  services.komga.port = 11319;  # chosen at random
-
-  services.nginx.virtualHosts."komga.uninsane.org" = {
-    addSSL = true;
-    enableACME = true;
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:${builtins.toString port}";
-    };
-  };
-  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,59 +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, ... }:
-let
-  inherit (builtins) toString;
-  inherit (lib) mkForce;
-  uiPort = 1234;  # default ui port is 1234
-  backendPort = 8536; # default backend port is 8536
-  # - i guess the "backend" port is used for federation?
-in {
-  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.serviceConfig = {
-    # fix to use a normal user so we can configure perms correctly
-    DynamicUser = mkForce false;
-    User = "lemmy";
-    Group = "lemmy";
-  };
-  systemd.services.lemmy.environment = {
-    RUST_BACKTRACE = "full";
-    # 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 = mkForce "postgres://lemmy@?host=/run/postgresql";  # WORKS
-    LEMMY_DATABASE_URL = 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";
-}
--- 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,168 +0,0 @@
-# config docs:
-# - <https://github.com/matrix-org/matrix-appservice-irc/blob/develop/config.sample.yaml>
-# TODO: /quit message for bridged users reveals to IRC users that i'm using a bridge;
-#       probably want to remove that.
-{ config, lib, ... }:
-
-let
-  ircServer = { name, additionalAddresses ? [], sasl ? true, port ? 6697 }: let
-    lowerName = lib.toLower name;
-  in {
-    # XXX sasl: appservice doesn't support NickServ identification (only SASL, or PASS if sasl = false)
-    inherit name additionalAddresses sasl port;
-    ssl = true;
-    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.plaintext = [
-    # TODO: mode?
-    { user = "matrix-appservice-irc"; group = "matrix-appservice-irc"; directory = "/var/lib/matrix-appservice-irc"; }
-  ];
-
-  # 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 = {
-      servers = {
-        "irc.esper.net" = ircServer {
-          name = "esper";
-          sasl = false;
-          # notable channels:
-          # - #merveilles
-        };
-        "irc.libera.chat" = ircServer {
-          name = "libera";
-          sasl = false;
-          # notable channels:
-          # - #hare
-        };
-        "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
-        };
-        "irc.rizon.net" = ircServer { name = "Rizon"; };
-      };
-    };
-  };
-
-  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";
-  };
-}
--- a/hosts/by-name/servo/services/matrix/signal.nix
+++ b/hosts/by-name/servo/services/matrix/signal.nix
@@ -1,37 +0,0 @@
-# config options:
-# - <https://github.com/mautrix/signal/blob/master/mautrix_signal/example-config.yaml>
-{ config, pkgs, ... }:
-{
-  sane.persist.sys.plaintext = [
-    { user = "mautrix-signal"; group = "mautrix-signal"; directory = "/var/lib/mautrix-signal"; }
-    { user = "signald"; group = "signald"; directory = "/var/lib/signald"; }
-  ];
-
-  # 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/nfs.nix
+++ b/hosts/by-name/servo/services/nfs.nix
@@ -1,67 +0,0 @@
-# docs:
-# - <https://nixos.wiki/wiki/NFS>
-# - <https://wiki.gentoo.org/wiki/Nfs-utils>
-
-{ ... }:
-{
-  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" ];
-    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;
-
-  # 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
-  # - mountpoint[=/path]:  only export the directory if it's a mountpoint. used to avoid exporting failed mounts.
-  #
-  # 10.0.0.0/8 to export (readonly) both to LAN (unencrypted) and wg vpn (encrypted)
-  services.nfs.server.exports = ''
-    /var/nfs/export 10.78.79.0/22(ro,crossmnt,fsid=0,subtree_check) 10.0.10.0/24(rw,no_root_squash,crossmnt,fsid=0,subtree_check)
-  '';
-
-  fileSystems."/var/nfs/export/media" = {
-    # everything in here could be considered publicly readable (based on the viewer's legal jurisdiction)
-    device = "/var/lib/uninsane/media";
-    options = [ "rbind" ];
-  };
-}
--- 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.plaintext = lib.mkIf cfg.enable [
-    { user = "pict-rs"; group = "pict-rs"; directory = cfg.dataDir; }
-  ];
-
-  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/trust-dns.nix
+++ b/hosts/by-name/servo/services/trust-dns.nix
@@ -1,131 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  sane.services.trust-dns.enable = true;
-
-  sane.services.trust-dns.settings.listen_addrs_ipv4 = [
-    # specify each address explicitly, instead of using "*".
-    # this ensures responses are sent from the address at which the request was received.
-    config.sane.hosts.by-name."servo".lan-ip
-    "10.0.1.5"
-  ];
-  sane.services.trust-dns.quiet = true;
-  # sane.services.trust-dns.debug = true;
-
-  sane.ports.ports."53" = {
-    protocol = [ "udp" "tcp" ];
-    visibleTo.lan = true;
-    visibleTo.wan = 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. (
-                                      2022122101 ; Serial
-                                      4h         ; Refresh
-                                      30m        ; Retry
-                                      7d         ; Expire
-                                      5m)        ; Negative response TTL
-    '';
-    TXT."rev" = "2023052901";
-
-    CNAME."native" = "%CNAMENATIVE%";
-    A."@" =      "%ANATIVE%";
-    A."wan" = "%AWAN%";
-    A."servo.lan" = config.sane.hosts.by-name."servo".lan-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" =    "185.157.162.178";
-    A."ns3" =    "185.157.162.178";
-    A."ovpns" =  "185.157.162.178";
-    NS."@" = [
-      "ns1.uninsane.org."
-      "ns2.uninsane.org."
-      "ns3.uninsane.org."
-    ];
-  };
-
-  # we need trust-dns to load our zone by relative path instead of /nix/store path
-  # because we generate it at runtime.
-  sane.services.trust-dns.settings.zones = [
-    {
-      zone = "uninsane.org";
-    }
-  ];
-
-  sane.services.trust-dns.package =
-    let
-      sed = "${pkgs.gnused}/bin/sed";
-      zone-dir = "/var/lib/trust-dns";
-      zone-wan = "${zone-dir}/wan/uninsane.org.zone";
-      zone-lan = "${zone-dir}/lan/uninsane.org.zone";
-      zone-template = pkgs.writeText "uninsane.org.zone.in" config.sane.dns.zones."uninsane.org".rendered;
-    in pkgs.writeShellScriptBin "named" ''
-      # compute wan/lan values
-      mkdir -p ${zone-dir}/{ovpn,wan,lan}
-      wan=$(cat '${config.sane.services.dyn-dns.ipPath}')
-      lan=${config.sane.hosts.by-name."servo".lan-ip}
-
-      # create specializations that resolve native.uninsane.org to different CNAMEs
-      ${sed} s/%AWAN%/$wan/ ${zone-template} \
-        | ${sed} s/%CNAMENATIVE%/wan/ \
-        | ${sed} s/%ANATIVE%/$wan/ \
-        > ${zone-wan}
-      ${sed} s/%AWAN%/$wan/ ${zone-template} \
-        | ${sed} s/%CNAMENATIVE%/servo.lan/ \
-        | ${sed} s/%ANATIVE%/$lan/ \
-        > ${zone-lan}
-
-      # launch the different interfaces, separately
-      ${pkgs.trust-dns}/bin/named --port 53 --zonedir ${zone-dir}/wan/ $@ &
-      WANPID=$!
-      ${pkgs.trust-dns}/bin/named --port 1053 --zonedir ${zone-dir}/lan/ $@ &
-      LANPID=$!
-
-      # wait until any of the processes exits, then kill them all and exit error
-      while kill -0 $WANPID $LANPID ; do
-        sleep 5
-      done
-      kill $WANPID $LANPID
-      exit 1
-    '';
-
-  sane.services.dyn-dns.restartOnChange = [ "trust-dns.service" ];
-
-  networking.nat.enable = true;
-  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?
-    protocol = [ "udp" "tcp" ];
-    visibleTo.lan = true;
-    description = "colin-redirected-dns-for-lan-namespace";
-  };
-}
--- 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/cross.nix
+++ b/hosts/common/cross.nix
@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+  # 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" = (prev.forceSystem "x86_64-linux" null).appendOverlays next.overlays;
+      crossFrom."aarch64-linux" = (prev.forceSystem "aarch64-linux" null).appendOverlays next.overlays;
+    })
+  ];
+}
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -1,107 +1,75 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 {
  imports = [
+    ./bluetooth.nix
+    ./cross.nix
    ./feeds.nix
    ./fs.nix
-    ./hardware.nix
-    ./home
+    ./hardware
+    ./i2p.nix
    ./ids.nix
    ./machine-id.nix
    ./net.nix
-    ./nix-path
-    ./persist.nix
-    ./programs
    ./secrets.nix
    ./ssh.nix
-    ./users
+    ./users.nix
    ./vpn.nix
  ];

+  sane.home-manager.enable = true;
  sane.nixcache.enable-trusted-keys = true;
-  sane.nixcache.enable = lib.mkDefault true;
-  sane.persist.enable = lib.mkDefault true;
-  sane.programs.sysadminUtils.enableFor.system = lib.mkDefault true;
-  sane.programs.consoleUtils.enableFor.user.colin = lib.mkDefault true;
+  sane.packages.enableConsolePkgs = true;
+  sane.packages.enableSystemPkgs = true;

-  # 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";
+  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.
+  ];

  nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.allowBroken = true;  # NIXPKGS_ALLOW_BROKEN

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

  # allow `nix flake ...` command
-  # TODO: is this still required?
  nix.extraOptions = ''
    experimental-features = nix-command flakes
  '';
-  # hardlinks identical files in the nix store to save 25-35% disk space.
-  # unclear _when_ this occurs. it's not a service.
-  # does the daemon continually scan the nix store?
-  # does the builder use some content-addressed db to efficiently dedupe?
-  nix.settings.auto-optimise-store = true;

-  systemd.services.nix-daemon.serviceConfig = {
-    # the nix-daemon manages nix builders
-    # kill nix-daemon subprocesses when systemd-oomd detects an out-of-memory condition
-    # see:
-    # - nixos PR that enabled systemd-oomd: <https://github.com/NixOS/nixpkgs/pull/169613>
-    # - systemd's docs on these properties: <https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#ManagedOOMSwap=auto%7Ckill>
-    #
-    # systemd's docs warn that without swap, systemd-oomd might not be able to react quick enough to save the system.
-    # see `man oomd.conf` for further tunables that may help.
-    #
-    # alternatively, apply this more broadly with `systemd.oomd.enableSystemSlice = true` or `enableRootSlice`
-    # TODO: also apply this to the guest user's slice (user-1100.slice)
-    # TODO: also apply this to distccd
-    ManagedOOMMemoryPressure = "kill";
-    ManagedOOMSwap = "kill";
-  };
-
-  # TODO: move this to gui machines only
+  # TODO: move this into home-manager?
  fonts = {
    enableDefaultFonts = true;
-    fonts = with pkgs; [ font-awesome noto-fonts-emoji hack-font ];
+    fonts = with pkgs; [ font-awesome twitter-color-emoji hack-font ];
    fontconfig.enable = true;
    fontconfig.defaultFonts = {
-      emoji = [ "Font Awesome 6 Free" "Noto Color Emoji" ];
+      emoji = [ "Font Awesome 6 Free" "Twitter Color Emoji" ];
      monospace = [ "Hack" ];
      serif = [ "DejaVu Serif" ];
      sansSerif = [ "DejaVu Sans" ];
    };
  };

-  # XXX: twitter-color-emoji doesn't cross-compile; but not-fonts-emoji does
-  # 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 = [];

-  # dconf docs: <https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/desktop_migration_and_administration_guide/profiles>
-  # find keys/values with `dconf dump /`
-  programs.dconf.enable = true;
-  programs.dconf.packages = [
-    (pkgs.writeTextFile {
-      name = "dconf-user-profile";
-      destination = "/etc/dconf/profile/user";
-      text = ''
-        user-db:user
-        system-db:site
-      '';
-    })
-  ];
+  # 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,13 +1,4 @@
-# where to find good stuff?
-# - podcast rec thread: <https://lemmy.ml/post/1565858>
-#
-# candidates:
-# - The Nonlinear Library (podcast): <https://forum.effectivealtruism.org/posts/JTZTBienqWEAjGDRv/listen-to-more-ea-content-with-the-nonlinear-library>
-#   - has ~10 posts per day, text-to-speech; i would need better tagging before adding this
-# - <https://www.metaculus.com/questions/11102/introducing-the-metaculus-journal-podcast/>
-#   - dead since 2022/10 - 2023/03
-
-{ lib, sane-data, ... }:
+{ ... }:
 let
  hourly = { freq = "hourly"; };
  daily = { freq = "daily"; };
@@ -21,9 +12,6 @@ let
  tech = { cat = "tech"; };
  uncat = { cat = "uncat"; };

-  text = { format = "text"; };
-  img = { format = "image"; };
-
  mkRss = format: url: { inherit url format; } // uncat // infrequent;
  # format-specific helpers
  mkText = mkRss "text";
@@ -33,221 +21,131 @@ let
  # host-specific helpers
  mkSubstack = subdomain: { substack = subdomain; };

-  fromDb = name:
-    let
-      raw = sane-data.feeds."${name}";
-    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
-          "hourly"
-        else if raw.velocity > 0.5 then
-          "daily"
-        else if raw.velocity > 0.1 then
-          "weekly"
-        else
-          "infrequent"
-      ));
-    } // lib.optionalAttrs (raw.is_podcast or false) {
-      format = "podcast";
-    } // lib.optionalAttrs (raw.title or "" != "") {
-      title = lib.mkDefault raw.title;
-    };
-
  podcasts = [
-    (fromDb "lexfridman.com/podcast" // rat)
+    (mkPod "https://lexfridman.com/feed/podcast/" // rat // weekly)
    ## Astral Codex Ten
-    (fromDb "sscpodcast.libsyn.com" // rat)
-    ## Less Wrong Curated
-    (fromDb "feeds.libsyn.com/421877" // rat)
+    (mkPod "http://feeds.libsyn.com/108018/rss" // rat // daily)
    ## Econ Talk
-    (fromDb "feeds.simplecast.com/wgl4xEgL" // rat)
-    ## Cory Doctorow -- both podcast & text entries
-    (fromDb "craphound.com" // pol)
-    ## Maggie Killjoy -- referenced by Cory Doctorow
-    (fromDb "omny.fm/shows/cool-people-who-did-cool-stuff" // pol)
-    (fromDb "congressionaldish.libsyn.com" // pol)
-    # (mkPod "https://podcasts.la.utexas.edu/this-is-democracy/feed/podcast/" // pol // weekly)
-    ## Civboot -- https://anchor.fm/civboot
-    (fromDb "anchor.fm/s/34c7232c/podcast/rss" // tech)
-    ## Emerge: making sense of what's next -- <https://www.whatisemerging.com/emergepodcast>
-    (mkPod "https://anchor.fm/s/21bc734/podcast/rss" // pol // infrequent)
-    (fromDb "feeds.feedburner.com/80000HoursPodcast" // rat)
-    ## Daniel Huberman on sleep
-    (fromDb "feeds.megaphone.fm/hubermanlab" // uncat)
-    ## Multidisciplinary Association for Psychedelic Studies
-    (fromDb "mapspodcast.libsyn.com" // uncat)
-    (fromDb "allinchamathjason.libsyn.com" // pol)
-    (fromDb "feeds.transistor.fm/acquired" // tech)
-    ## ACQ2 - more "Acquired" episodes
-    (fromDb "acquiredlpbonussecretsecret.libsyn.com" // tech)
-    # The Intercept - Deconstructed
-    (fromDb "rss.acast.com/deconstructed")
-    # (fromDb "rss.prod.firstlook.media/deconstructed/podcast.rss" // pol)  #< possible URL rot
+    (mkPod "https://feeds.simplecast.com/wgl4xEgL" // rat // daily)
+    ## Cory Doctorow
+    (mkPod "https://feeds.feedburner.com/doctorow_podcast" // pol // infrequent)
+    (mkPod "https://congressionaldish.libsyn.com/rss" // pol // infrequent)
+    ## Civboot
+    (mkPod "https://anchor.fm/s/34c7232c/podcast/rss" // tech // infrequent)
+    (mkPod "https://feeds.feedburner.com/80000HoursPodcast" // rat // weekly)
+    (mkPod "https://allinchamathjason.libsyn.com/rss" // pol // weekly)
+    (mkPod "https://acquired.libsyn.com/rss" // tech // infrequent)
+    (mkPod "https://rss.acast.com/deconstructed" // pol // infrequent)
    ## The Daily
    (mkPod "https://feeds.simplecast.com/54nAGcIl" // pol // daily)
-    # The Intercept - Intercepted
-    (fromDb "rss.acast.com/intercepted-with-jeremy-scahill")
-    # (fromDb "rss.prod.firstlook.media/intercepted/podcast.rss" // pol)  #< possible URL rot
-    (fromDb "podcast.posttv.com/itunes/post-reports.xml" // pol)
+    (mkPod "https://rss.acast.com/intercepted-with-jeremy-scahill" // pol // weekly)
+    (mkPod "https://podcast.posttv.com/itunes/post-reports.xml" // pol // weekly)
    ## 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)
+    (mkPod "https://rss.art19.com/the-portal" // rat // infrequent)
+    (mkPod "https://feeds.megaphone.fm/darknetdiaries" // tech // infrequent)
+    (mkPod "http://feeds.wnyc.org/radiolab" // pol // infrequent)
+    (mkPod "https://wakingup.libsyn.com/rss" // pol // infrequent)
+    ## 99% Invisible
+    (mkPod "https://feeds.simplecast.com/BqbsxVfO" // pol // infrequent)
+    (mkPod "https://rss.acast.com/ft-tech-tonic" // tech // infrequent)
+    (mkPod "https://feeds.feedburner.com/dancarlin/history?format=xml" // rat // infrequent)
+    ## 60 minutes (NB: this features more than *just* audio?)
+    (mkPod "https://www.cbsnews.com/latest/rss/60-minutes" // pol // infrequent)
    ## The Verge - Decoder
-    (fromDb "feeds.megaphone.fm/recodedecode" // tech)
+    (mkPod "https://feeds.megaphone.fm/recodedecode" // tech // weekly)
    ## Matrix (chat) Live
-    (fromDb "feed.podbean.com/matrixlive/feed.xml" // tech)
-    (fromDb "cast.postmarketos.org" // tech)
-    (fromDb "podcast.thelinuxexp.com" // tech)
-    ## Michael Malice - Your Welcome -- also available here: <https://origin.podcastone.com/podcast?categoryID2=2232>
-    (fromDb "rss.art19.com/your-welcome" // pol)
-    (fromDb "seattlenice.buzzsprout.com" // pol)
-    ## Sci-Fi? has Peter Watts; author of No Moods, Ads or Cutesy Fucking Icons (rifters.com)
-    (fromDb "talesfromthebridge.buzzsprout.com" // tech)
-    ## UnNamed Reverse Engineering Podcast
-    (fromDb "reverseengineering.libsyn.com/rss" // tech)
-    ## The Witch Trials of J.K. Rowling
-    ## - <https://www.thefp.com/witchtrials>
-    (mkPod "https://feeds.megaphone.fm/RUNMED9919162779" // pol // infrequent)
+    (mkPod "https://feed.podbean.com/matrixlive/feed.xml" // tech // weekly)
+    ## Michael Malice - Your Welcome
+    (mkPod "https://www.podcastone.com/podcast?categoryID2=2232" // pol // weekly)
  ];

  texts = [
    # AGGREGATORS (> 1 post/day)
-    (fromDb "lwn.net" // tech)
-    (fromDb "lesswrong.com" // rat)
-    # (fromDb "econlib.org" // pol)
+    (mkText "https://www.lesswrong.com/feed.xml" // rat // hourly)
+    (mkText "http://www.econlib.org/index.xml" // pol // hourly)

    # AGGREGATORS (< 1 post/day)
-    (fromDb "palladiummag.com" // uncat)
-    (fromDb "profectusmag.com" // uncat)
-    (fromDb "semiaccurate.com" // tech)
+    (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)
-    (fromDb "tuxphones.com" // tech)
-    (fromDb "spectrum.ieee.org" // tech)
-    (fromDb "theregister.com" // tech)
-    (fromDb "thisweek.gnome.org" // tech)
-    # more nixos stuff here, but unclear how to subscribe: <https://nixos.org/blog/categories.html>
-    (mkText "https://nixos.org/blog/announcements-rss.xml" // tech // infrequent)
-    (mkText "https://nixos.org/blog/stories-rss.xml" // tech // weekly)
-    ## n.b.: quality RSS list here: <https://forum.merveilles.town/thread/57/share-your-rss-feeds%21-6/>
-    (mkText "https://forum.merveilles.town/rss.xml" // pol // infrequent)
+    (mkText "https://spectrum.ieee.org/rss" // tech // weekly)

    ## No Moods, Ads or Cutesy Fucking Icons
-    (fromDb "rifters.com/crawl" // uncat)
+    (mkText "https://www.rifters.com/crawl/?feed=rss2" // uncat // weekly)

    # DEVELOPERS
-    (fromDb "blog.jmp.chat" // tech)
-    (fromDb "uninsane.org" // tech)
-    (fromDb "ascii.textfiles.com" // tech)  # Jason Scott
-    (fromDb "xn--gckvb8fzb.com" // tech)
-    (fromDb "mg.lol" // tech)
-    # (fromDb "drewdevault.com" // tech)
+    (mkText "https://uninsane.org/atom.xml" // infrequent // tech)
+    (mkText "https://mg.lol/blog/rss/" // infrequent // tech)
    ## Ken Shirriff
-    (fromDb "righto.com" // tech)
-    ## shared blog by a few NixOS devs, notably onny
-    (fromDb "project-insanity.org" // tech)
+    (mkText "https://www.righto.com/feeds/posts/default" // tech // infrequent)
    ## Vitalik Buterin
-    (fromDb "vitalik.ca" // tech)
+    (mkText "https://vitalik.ca/feed.xml" // tech // infrequent)
    ## ian (Sanctuary)
-    (fromDb "sagacioussuricata.com" // tech)
+    (mkText "https://sagacioussuricata.com/feed.xml" // tech // infrequent)
    ## Bunnie Juang
-    (fromDb "bunniestudios.com" // tech)
-    (fromDb "blog.danieljanus.pl" // tech)
-    (fromDb "ianthehenry.com" // tech)
-    (fromDb "bitbashing.io" // tech)
-    (fromDb "idiomdrottning.org" // uncat)
+    (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)
-    (fromDb "jefftk.com" // tech)
-    (fromDb "pomeroyb.com" // tech)
-    (mkText "https://til.simonwillison.net/tils/feed.atom" // tech // weekly)
-
-    # TECH PROJECTS
-    (fromDb "blog.rust-lang.org" // tech)
+    (mkText "https://www.jefftk.com/news.rss" // tech // daily)
+    (mkText "https://pomeroyb.com/feed.xml" // tech // infrequent)

    # (TECH; POL) COMMENTATORS
-    ## Matt Webb -- engineering-ish, but dreamy
-    (fromDb "interconnected.org/home/feed" // rat)
-    (fromDb "edwardsnowden.substack.com" // pol // text)
-    ## Julia Evans
-    (mkText "https://jvns.ca/atom.xml" // tech // weekly)
+    (mkSubstack "edwardsnowden" // pol // infrequent)
    (mkText "http://benjaminrosshoffman.com/feed" // pol // weekly)
    ## Ben Thompson
    (mkText "https://www.stratechery.com/rss" // pol // weekly)
    ## Balaji
-    (fromDb "balajis.com" // pol)
-    (fromDb "ben-evans.com/benedictevans" // pol)
-    (fromDb "lynalden.com" // pol)
-    (fromDb "austinvernon.site" // tech)
+    (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 "byrnehobart" // pol // infrequent)
-    # (mkSubstack "doomberg" // tech // weekly)  # articles are all pay-walled
+    (mkSubstack "doomberg" // tech // weekly)
    ## David Rosenthal
-    (fromDb "blog.dshr.org" // pol)
+    (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)
-    (fromDb "stpeter.im/atom.xml" // pol)
-    ## Peter Saint-Andre -- side project of stpeter.im
-    (fromDb "philosopher.coach" // rat)
-    (fromDb "morningbrew.com/feed" // pol)
+    (mkText "https://stpeter.im/atom.xml" // pol // weekly)

    # RATIONALITY/PHILOSOPHY/ETC
    (mkSubstack "samkriss" // humor // infrequent)
-    (fromDb "unintendedconsequenc.es" // rat)
-    (fromDb "applieddivinitystudies.com" // rat)
-    (fromDb "slimemoldtimemold.com" // rat)
-    (fromDb "richardcarrier.info" // rat)
-    (fromDb "gwern.net" // rat)
+    (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
-    (fromDb "rootsofprogress.org" // rat)
+    (mkText "https://rootsofprogress.org/feed.xml" // rat // weekly)
    ## Robin Hanson
-    (fromDb "overcomingbias.com" // rat)
+    (mkText "https://www.overcomingbias.com/feed" // rat // daily)
    ## Scott Alexander
    (mkSubstack "astralcodexten" // rat // daily)
    ## Paul Christiano
-    (fromDb "sideways-view.com" // rat)
+    (mkText "https://sideways-view.com/feed" // rat // infrequent)
    ## Sean Carroll
-    (fromDb "preposterousuniverse.com" // rat)
-    (mkSubstack "eliqian" // rat // weekly)
-    (mkText "https://acoup.blog/feed" // rat // weekly)
+    (mkText "https://www.preposterousuniverse.com/rss" // rat // infrequent)

    ## mostly dating topics. not advice, or humor, but looking through a social lens
-    (fromDb "putanumonit.com" // rat)
-
-    # LOCAL
-    (fromDb "capitolhillseattle.com" // pol)
+    (mkText "https://putanumonit.com/feed" // rat // infrequent)

    # CODE
    # (mkText "https://github.com/Kaiteki-Fedi/Kaiteki/commits/master.atom" // tech // infrequent)
  ];

  images = [
-    (fromDb "smbc-comics.com" // img // humor)
-    (fromDb "xkcd.com" // img // humor)
-    (fromDb "pbfcomics.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)
-    (fromDb "poorlydrawnlines.com/feed" // img // humor)

    # ART
-    (fromDb "miniature-calendar.com" // img // art // daily)
+    (mkImg "https://miniature-calendar.com/feed" // art // daily)
  ];
 in
 {
  sane.feeds = texts ++ images ++ podcasts;
-
-  assertions = builtins.map
-    (p: {
-      assertion = p.format or "unknown" == "podcast";
-      message = ''${p.url} is not a podcast: ${p.format or "unknown"}'';
-    })
-    podcasts;
 }
--- a/hosts/common/fs.nix
+++ b/hosts/common/fs.nix
@@ -1,131 +1,72 @@
-# docs
-# - x-systemd options: <https://www.freedesktop.org/software/systemd/man/systemd.mount.html>
+{ pkgs, ... }:

-{ pkgs, sane-lib, ... }:
-
-let fsOpts = rec {
-  common = [
+let sshOpts = rec {
+  fsType = "fuse.sshfs";
+  optionsBase = [
+    "x-systemd.automount"
    "_netdev"
-    "noatime"
-    "user"  # allow any user with access to the device to mount the fs
-    "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
-  ];
-  auto = [ "x-systemd.automount" ];
-  noauto = [ "noauto" ];  # don't mount as part of remote-fs.target
-  wg = [
-    "x-systemd.requires=wireguard-wg-home.service"
-    "x-systemd.after=wireguard-wg-home.service"
-  ];
-
-  ssh = common ++ [
+    "user"
    "identityfile=/home/colin/.ssh/id_ed25519"
    "allow_other"
    "default_permissions"
  ];
-  sshColin = ssh ++ [
+  optionsColin = optionsBase ++ [
    "transform_symlinks"
    "idmap=user"
    "uid=1000"
    "gid=100"
  ];
-  sshRoot = ssh ++ [
+
+  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 the event of hunt NFS mounts, consider:
-  # - <https://unix.stackexchange.com/questions/31979/stop-broken-nfs-mounts-from-locking-a-directory>
-
-  # NFS options: <https://linux.die.net/man/5/nfs>
-  # actimeo=n  = how long (in seconds) to cache file/dir attributes (default: 3-60s)
-  # bg         = retry failed mounts in the background
-  # retry=n    = for how many minutes `mount` will retry NFS mount operation
-  # soft       = on "major timeout", report I/O error to userspace
-  # retrans=n  = how many times to retry a NFS request before giving userspace a "server not responding" error (default: 3)
-  # timeo=n    = number of *deciseconds* to wait for a response before retrying it (default: 600)
-  #              note: client uses a linear backup, so the second request will have double this timeout, then triple, etc.
-  nfs = common ++ [
-    # "actimeo=10"
-    "bg"
-    "retrans=4"
-    "retry=0"
-    "soft"
-    "timeo=15"
-    "nofail"  # don't fail remote-fs.target when this mount fails  (not an option for sshfs else would be common)
-  ];
 };
 in
 {
-  # fileSystems."/mnt/servo-nfs" = {
-  #   device = "servo-hn:/";
-  #   noCheck = true;
-  #   fsType = "nfs";
-  #   options = fsOpts.nfs ++ fsOpts.auto ++ fsOpts.wg;
-  # };
-  fileSystems."/mnt/servo-nfs/media" = {
-    device = "servo-hn:/media";
-    noCheck = true;
-    fsType = "nfs";
-    options = fsOpts.nfs ++ fsOpts.auto ++ fsOpts.wg;
-  };
-  # fileSystems."/mnt/servo-media-nfs" = {
-  #   device = "servo-hn:/media";
-  #   noCheck = true;
-  #   fsType = "nfs";
-  #   options = fsOpts.common ++ fsOpts.auto;
-  # };
-  sane.fs."/mnt/servo-media" = sane-lib.fs.wantedSymlinkTo "/mnt/servo-nfs/media";
-
-  fileSystems."/mnt/servo-media-wan" = {
-    device = "colin@uninsane.org:/var/lib/uninsane/media";
-    fsType = "fuse.sshfs";
-    options = fsOpts.sshColin ++ fsOpts.noauto;
-    noCheck = true;
-  };
-  sane.fs."/mnt/servo-media-wan" = sane-lib.fs.wantedDir;
-  fileSystems."/mnt/servo-media-lan" = {
-    device = "colin@servo:/var/lib/uninsane/media";
-    fsType = "fuse.sshfs";
-    options = fsOpts.sshColin ++ fsOpts.noauto;
-    noCheck = true;
-  };
-  sane.fs."/mnt/servo-media-lan" = sane-lib.fs.wantedDir;
-  fileSystems."/mnt/servo-root-wan" = {
-    device = "colin@uninsane.org:/";
-    fsType = "fuse.sshfs";
-    options = fsOpts.sshRoot ++ fsOpts.noauto;
-    noCheck = true;
-  };
-  sane.fs."/mnt/servo-root-wan" = sane-lib.fs.wantedDir;
-  fileSystems."/mnt/servo-root-lan" = {
-    device = "colin@servo:/";
-    fsType = "fuse.sshfs";
-    options = fsOpts.sshRoot ++ fsOpts.noauto;
-    noCheck = true;
-  };
-  sane.fs."/mnt/servo-root-lan" = sane-lib.fs.wantedDir;
-  fileSystems."/mnt/desko-home" = {
-    device = "colin@desko:/home/colin";
-    fsType = "fuse.sshfs";
-    options = fsOpts.sshColin ++ fsOpts.noauto;
-    noCheck = true;
-  };
-  sane.fs."/mnt/desko-home" = sane-lib.fs.wantedDir;
-  fileSystems."/mnt/desko-root" = {
-    device = "colin@desko:/";
-    fsType = "fuse.sshfs";
-    options = fsOpts.sshRoot ++ fsOpts.noauto;
-    noCheck = true;
-  };
-  sane.fs."/mnt/desko-root" = sane-lib.fs.wantedDir;
-
  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/hardware/all.nix
+++ b/hosts/common/hardware/all.nix
@@ -28,11 +28,6 @@
  # powertop will default to putting USB devices -- including HID -- to sleep after TWO SECONDS
  powerManagement.powertop.enable = false;

-  services.logind.extraConfig = ''
-    # don’t shutdown when power button is short-pressed
-    HandlePowerKey=ignore
-  '';
-
  # services.snapper.configs = {
  #   root = {
  #     subvolume = "/";
--- a/hosts/modules/hardware/default.nix
+++ b/hosts/modules/hardware/default.nix
@@ -2,6 +2,7 @@

 {
  imports = [
+    ./all.nix
    ./x86_64.nix
  ];
 }
--- a/hosts/modules/hardware/x86_64.nix
+++ b/hosts/modules/hardware/x86_64.nix
@@ -1,7 +1,8 @@
 { lib, pkgs, ... }:

+with lib;
 {
-  config = lib.mkIf (pkgs.system == "x86_64-linux") {
+  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.
@@ -9,6 +10,11 @@
      # 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
--- a/hosts/common/home/default.nix
+++ b/hosts/common/home/default.nix
@@ -1,9 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./keyring.nix
-    ./mime.nix
-    ./ssh.nix
-    ./xdg-dirs.nix
-  ];
-}
--- a/hosts/common/home/keyring.nix
+++ b/hosts/common/home/keyring.nix
@@ -1,12 +0,0 @@
-{ config, sane-lib, ... }:
-
-{
-  sane.user.persist.private = [ ".local/share/keyrings" ];
-
-  sane.user.fs."private/.local/share/keyrings/default" = {
-    generated.script.script = builtins.readFile ../../../scripts/init-keyring;
-    # TODO: is this `wantedBy` needed? can we inherit it?
-    wantedBy = [ config.sane.fs."/home/colin/private".unit ];
-    wantedBeforeBy = [ ];  # don't created this as part of `multi-user.target`
-  };
-}
--- a/hosts/common/home/mime.nix
+++ b/hosts/common/home/mime.nix
@@ -1,46 +0,0 @@
-{ config, sane-lib, ...}:
-
-let
-  # TODO: should move all of this into `sane.programs` to not ship broken associations
-  www = config.sane.programs.web-browser.config.browser.desktop;
-  pdf = "org.gnome.Evince.desktop";
-  md = "obsidian.desktop";
-  thumb = "org.gnome.gThumb.desktop";
-  video = "vlc.desktop";
-  # audio = "mpv.desktop";
-  audio = "vlc.desktop";
-  email = "aerc.desktop";
-in
-{
-
-  # the xdg mime type for a file can be found with:
-  # - `xdg-mime query filetype path/to/thing.ext`
-  # we can have single associations or a list of associations.
-  # there's also options to *remove* [non-default] associations from specific apps
-  xdg.mime.enable = true;
-  xdg.mime.defaultApplications = {
-    # AUDIO
-    "audio/flac" = audio;
-    "audio/mpeg" = audio;
-    "audio/x-vorbis+ogg" = audio;
-    # IMAGES
-    "image/heif" = thumb;  # apple codec
-    "image/png" = thumb;
-    "image/jpeg" = thumb;
-    # VIDEO
-    "video/mp4" = video;
-    "video/quicktime" = video;
-    "video/webm" = video;
-    "video/x-matroska" = video;
-    # HTML
-    "text/html" = www;
-    "x-scheme-handler/http" = www;
-    "x-scheme-handler/https" = www;
-    "x-scheme-handler/about" = www;
-    "x-scheme-handler/unknown" = www;
-    # RICH-TEXT DOCUMENTS
-    "application/pdf" = pdf;
-    "text/markdown" = md;
-    "x-scheme-handler/mailto" = email;
-  };
-}
--- a/hosts/common/home/xdg-dirs.nix
+++ b/hosts/common/home/xdg-dirs.nix
@@ -1,20 +0,0 @@
-{ lib, sane-lib, ...}:
-
-{
-  # XDG defines things like ~/Desktop, ~/Downloads, etc.
-  # these clutter the home, so i mostly don't use them.
-  sane.user.fs.".config/user-dirs.dirs" = sane-lib.fs.wantedText ''
-    XDG_DESKTOP_DIR="$HOME/.xdg/Desktop"
-    XDG_DOCUMENTS_DIR="$HOME/dev"
-    XDG_DOWNLOAD_DIR="$HOME/tmp"
-    XDG_MUSIC_DIR="$HOME/Music"
-    XDG_PICTURES_DIR="$HOME/Pictures"
-    XDG_PUBLICSHARE_DIR="$HOME/.xdg/Public"
-    XDG_TEMPLATES_DIR="$HOME/.xdg/Templates"
-    XDG_VIDEOS_DIR="$HOME/Videos"
-  '';
-
-  # prevent `xdg-user-dirs-update` from overriding/updating our config
-  # see <https://manpages.ubuntu.com/manpages/bionic/man5/user-dirs.conf.5.html>
-  sane.user.fs.".config/user-dirs.conf" = sane-lib.fs.wantedText "enabled=False";
-}
--- a/hosts/common/i2p.nix
+++ b/hosts/common/i2p.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  services.i2p.enable = true;
+}
--- a/hosts/common/ids.nix
+++ b/hosts/common/ids.nix
@@ -1,6 +1,3 @@
-# TODO: migrate to nixpkgs `config.ids.uids`
-# - note that nixpkgs' `config.ids.uids` is strictly a database: it doesn't set anything by default
-#   whereas our impl sets the gid/uid of the user/group specified if they exist.
 { ... }:

 {
@@ -15,8 +12,6 @@
  sane.ids.acme.gid = 996;
  sane.ids.pleroma.uid = 997;
  sane.ids.acme.uid = 998;
-  sane.ids.matrix-appservice-irc.uid = 993;
-  sane.ids.matrix-appservice-irc.gid = 992;

  # greetd (used by sway)
  sane.ids.greeter.uid = 999;
@@ -26,22 +21,6 @@
  sane.ids.freshrss.uid = 2401;
  sane.ids.freshrss.gid = 2401;
  sane.ids.mediawiki.uid = 2402;
-  sane.ids.signald.uid = 2403;
-  sane.ids.signald.gid = 2403;
-  sane.ids.mautrix-signal.uid = 2404;
-  sane.ids.mautrix-signal.gid = 2404;
-  sane.ids.navidrome.uid = 2405;
-  sane.ids.navidrome.gid = 2405;
-  sane.ids.calibre-web.uid = 2406;
-  sane.ids.calibre-web.gid = 2406;
-  sane.ids.komga.uid = 2407;
-  sane.ids.komga.gid = 2407;
-  sane.ids.lemmy.uid = 2408;
-  sane.ids.lemmy.gid = 2408;
-  sane.ids.pict-rs.uid = 2409;
-  sane.ids.pict-rs.gid = 2409;
-  sane.ids.sftpgo.uid = 2410;
-  sane.ids.sftpgo.gid = 2410;

  sane.ids.colin.uid = 1000;
  sane.ids.guest.uid = 1100;
@@ -50,12 +29,11 @@
  sane.ids.sshd.uid = 2001;  # 997
  sane.ids.sshd.gid = 2001;  # 997
  sane.ids.polkituser.gid = 2002;  # 998
-  sane.ids.systemd-coredump.gid = 2003;  # 996  # 2023/02/12-2023/02/28: upstream temporarily specified this as 151
+  sane.ids.systemd-coredump.gid = 2003;  # 996
  sane.ids.nscd.uid = 2004;
  sane.ids.nscd.gid = 2004;
  sane.ids.systemd-oom.uid = 2005;
  sane.ids.systemd-oom.gid = 2005;
-  sane.ids.wireshark.gid = 2006;

  # found on graphical hosts
  sane.ids.nm-iodine.uid = 2101;  # desko/moby/lappy
--- a/hosts/common/net.nix
+++ b/hosts/common/net.nix
@@ -1,6 +1,16 @@
-{ lib, ... }:
+{ config, lib, pkgs, ... }:

 {
+  # if using router's DNS, these mappings will already exist.
+  # if using a different DNS provider (which servo does), then we need to explicity provide them.
+  # ugly hack. would be better to get servo to somehow use the router's DNS
+  networking.hosts = {
+    "192.168.0.5" = [ "servo" ];
+    "192.168.0.20" = [ "lappy" ];
+    "192.168.0.22" = [ "desko" ];
+    "192.168.0.48" = [ "moby" ];
+  };
+
  # the default backend is "wpa_supplicant".
  # wpa_supplicant reliably picks weak APs to connect to.
  # see: <https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/474>
@@ -21,21 +31,13 @@
    General.RoamThreshold5G = "-52";  # default -76
  };

-  # plugins mostly add support for establishing different VPN connections.
-  # the default plugin set includes mostly proprietary VPNs:
-  # - fortisslvpn (Fortinet)
-  # - iodine (DNS tunnels)
-  # - l2tp
-  # - openconnect (Cisco Anyconnect / Juniper / ocserv)
-  # - openvpn
-  # - vpnc (Cisco VPN)
-  # - sstp
-  #
-  # i don't use these, and notably they drag in huge dependency sets and don't cross compile well.
-  # e.g. openconnect drags in webkitgtk (for SSO)!
-  networking.networkmanager.plugins = lib.mkForce [];
-
-  networking.firewall.allowedUDPPorts = [
-    1900  # to received UPnP advertisements. required by sane-ip-check-upnp
-  ];
+  sane.fs."/var/lib/iwd/.secrets.psk.stamp" = {
+    wantedBeforeBy = [ "iwd.service" ];
+    generated.acl.mode = "0600";
+    # XXX: install-iwd uses sed, but that's part of the default systemd unit path, it seems
+    generated.script.script = builtins.readFile ../../scripts/install-iwd + ''
+      touch "/var/lib/iwd/.secrets.psk.stamp"
+    '';
+    generated.script.scriptArgs = [ "/run/secrets/iwd" "/var/lib/iwd" ];
+  };
 }
--- a/hosts/common/nix-path/default.nix
+++ b/hosts/common/nix-path/default.nix
@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # allow `nix-shell` (and probably nix-index?) to locate our patched and custom packages
-  nix.nixPath = [
-    "nixpkgs=${pkgs.path}"
-    # note the import starts at repo root: this allows `./overlay/default.nix` to access the stuff at the root
-    # "nixpkgs-overlays=${../../..}/hosts/common/nix-path/overlay"
-    # as long as my system itself doesn't rely on NIXPKGS at runtime, we can point the overlays to git
-    # to avoid switching so much during development
-    "nixpkgs-overlays=/home/colin/dev/nixos/hosts/common/nix-path/overlay"
-  ];
-}
--- a/hosts/common/nix-path/overlay/default.nix
+++ b/hosts/common/nix-path/overlay/default.nix
@@ -1,4 +0,0 @@
-# XXX: NIX_PATH=...:nixpkgs-overlays=... will import every overlay in the directory
-# so we prefer to give it a directory with just this *one* overlay, otherwise it imports conflicting overlays
-# and gets stuck in a loop until it OOMs
-import ../../../../overlays/all.nix
--- a/hosts/common/persist.nix
+++ b/hosts/common/persist.nix
@@ -1,18 +0,0 @@
-{ ... }:
-
-{
-  sane.persist.stores.private.origin = "/home/colin/private";
-  # store /home/colin/a/b in /home/private/a/b instead of /home/private/home/colin/a/b
-  sane.persist.stores.private.prefix = "/home/colin";
-
-  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.
-    "/var/lib/systemd/backlight"   # backlight brightness
-    "/var/lib/systemd/coredump"
-  ];
-}
--- a/hosts/common/programs/aerc.nix
+++ b/hosts/common/programs/aerc.nix
@@ -1,6 +0,0 @@
-# Terminal UI mail client
-{ ... }:
-
-{
-  sane.programs.aerc.secrets.".config/aerc/accounts.conf" = ../../../secrets/common/aerc_accounts.conf.bin;
-}
--- a/hosts/common/programs/assorted.nix
+++ b/hosts/common/programs/assorted.nix
@@ -1,392 +0,0 @@
-{ lib, pkgs, ... }:
-
-let
-  inherit (builtins) attrNames;
-
-  flattenedPkgs = pkgs // (with pkgs; {
-    # XXX can't `inherit` a nested attr, so we move them to the toplevel
-    "cacert.unbundled" = pkgs.cacert.unbundled;
-    "gnome.cheese" = gnome.cheese;
-    "gnome.dconf-editor" = gnome.dconf-editor;
-    "gnome.file-roller" = gnome.file-roller;
-    "gnome.gnome-disk-utility" = gnome.gnome-disk-utility;
-    "gnome.gnome-maps" = gnome.gnome-maps;
-    "gnome.nautilus" = gnome.nautilus;
-    "gnome.gnome-system-monitor" = gnome.gnome-system-monitor;
-    "gnome.gnome-terminal" = gnome.gnome-terminal;
-    "gnome.gnome-weather" = gnome.gnome-weather;
-    "gnome.totem" = gnome.totem;
-    "libsForQt5.plasmatube" = libsForQt5.plasmatube;
-  });
-
-  sysadminPkgs = {
-    inherit (flattenedPkgs)
-      btrfs-progs
-      "cacert.unbundled"  # some services require unbundled /etc/ssl/certs
-      cryptsetup
-      dig
-      efibootmgr
-      fatresize
-      fd
-      file
-      gawk
-      git
-      gptfdisk
-      hdparm
-      htop
-      iftop
-      inetutils  # for telnet
-      iotop
-      iptables
-      jq
-      killall
-      lsof
-      miniupnpc
-      nano
-      neovim
-      netcat
-      nethogs
-      nmap
-      openssl
-      parted
-      pciutils
-      powertop
-      pstree
-      ripgrep
-      screen
-      smartmontools
-      socat
-      strace
-      subversion
-      tcpdump
-      tree
-      usbutils
-      wget
-      wirelesstools  # iwlist
-    ;
-  };
-  sysadminExtraPkgs = {
-    # application-specific packages
-    inherit (pkgs)
-      backblaze-b2
-      duplicity
-      sqlite  # to debug sqlite3 databases
-    ;
-  };
-
-  iphonePkgs = {
-    inherit (pkgs)
-      ifuse
-      ipfs
-      libimobiledevice
-    ;
-  };
-
-  tuiPkgs = {
-    inherit (pkgs)
-      aerc  # email client
-      msmtp  # sendmail
-      offlineimap  # email mailox sync
-      sfeed  # RSS fetcher
-      visidata  # TUI spreadsheet viewer/editor
-      w3m
-    ;
-  };
-
-  consoleMediaPkgs = {
-    inherit (pkgs)
-      ffmpeg
-      imagemagick
-      sox
-      yt-dlp
-    ;
-  };
-  # TODO: split these into smaller groups.
-  # - moby doesn't want a lot of these.
-  # - categories like
-  #   - dev?
-  #   - debugging?
-  consolePkgs = {
-    inherit (pkgs)
-      alsaUtils  # for aplay, speaker-test
-      # cdrtools
-      clinfo
-      dmidecode
-      efivar
-      # flashrom
-      fwupd
-      gh  # MS GitHub cli
-      git  # needed as a user package, for config.
-      # gnupg
-      # gocryptfs
-      # gopass
-      # gopass-jsonapi
-      kitty  # TODO: move to GUI, but `ssh servo` from kitty sets `TERM=xterm-kitty` in the remove and breaks things
-      libsecret  # for managing user keyrings. TODO: what needs this? lift into the consumer
-      lm_sensors  # for sensors-detect. TODO: what needs this? lift into the consumer
-      lshw
-      # memtester
-      neovim  # needed as a user package, for swap persistence
-      # nettools
-      # networkmanager
-      nix-index
-      nixpkgs-review
-      # nixos-generators
-      nmon
-      # node2nix
-      # oathToolkit  # for oathtool
-      # ponymix
-      pulsemixer
-      python3
-      ripgrep  # needed as a user package so that its user-level config file can be installed
-      rsync
-      # python3Packages.eyeD3  # music tagging
-      sane-scripts
-      sequoia
-      snapper
-      sops
-      speedtest-cli
-      # ssh-to-age
-      sudo
-      # tageditor  # music tagging
-      unar
-      wireguard-tools
-      xdg-terminal-exec
-      xdg-utils  # for xdg-open
-      # yarn
-      zsh
-    ;
-  };
-
-  guiPkgs = {
-    inherit (flattenedPkgs)
-      # celluloid  # mpv frontend
-      cozy  # audiobook player
-      # emote
-      evince  # works on phosh
-
-      # { pkg = fluffychat-moby; persist.plaintext = [ ".local/share/chat.fluffy.fluffychat" ]; }  # TODO: ship normal fluffychat on non-moby?
-
-      # foliate  # e-book reader
-
-      # XXX by default fractal stores its state in ~/.local/share/<UUID>.
-      # after logging in, manually change ~/.local/share/keyrings/... to point it to some predictable subdir.
-      # then reboot (so that libsecret daemon re-loads the keyring...?)
-      # { pkg = fractal-latest; persist.private = [ ".local/share/fractal" ]; }
-      # { pkg = fractal-next; persist.private = [ ".local/share/fractal" ]; }
-
-      # "gnome.cheese"
-      # gnome-feeds  # RSS reader (with claimed mobile support)
-      "gnome.file-roller"
-      # "gnome.gnome-maps"  # works on phosh
-      "gnome.nautilus"
-      # gnome-podcasts
-      # "gnome.gnome-system-monitor"
-      # "gnome.gnome-terminal"  # works on phosh
-      # "gnome.gnome-weather"
-      gpodder
-      gthumb
-      jellyfin-media-player
-      komikku
-      koreader
-      lemoa  # lemmy app
-      # lollypop
-      mepo  # maps viewer
-      # mpv
-      # networkmanagerapplet
-      # newsflash
-      nheko
-      pavucontrol
-      # picard  # music tagging
-      # "libsForQt5.plasmatube"  # Youtube player
-      soundconverter
-      # sublime-music
-      # tdesktop  # broken on phosh
-      # tokodon
-      tuba  # mastodon/pleroma client (stores pw in keyring)
-      vlc
-      # pleroma client (Electron). input is broken on phosh. TODO(2023/02/02): fix electron19 input (insecure)
-      # whalebird
-      xterm  # broken on phosh
-    ;
-  };
-  desktopGuiPkgs = {
-    inherit (flattenedPkgs)
-      audacity
-      brave  # for the integrated wallet -- as a backup
-      chromium
-      dino
-      electrum
-      element-desktop
-      # font-manager  #< depends on webkitgtk4_0 (expensive to build)
-      gajim  # XMPP client
-      gimp  # broken on phosh
-      "gnome.dconf-editor"
-      "gnome.gnome-disk-utility"
-      # "gnome.totem"  # video player, supposedly supports UPnP
-      handbrake
-      hase
-      inkscape
-      kdenlive
-      kid3  # audio tagging
-      krita
-      libreoffice-fresh
-      mumble
-      obsidian
-      slic3r
-      steam
-      wireshark  # could maybe ship the cli as sysadmin pkg
-    ;
-  };
-  x86GuiPkgs = {
-    inherit (pkgs)
-      discord
-
-      # kaiteki  # Pleroma client
-      # gnome.zenity # for kaiteki (it will use qarma, kdialog, or zenity)
-      # gpt2tc  # XXX: unreliable mirror
-
-      # logseq  # Personal Knowledge Management
-      losslesscut-bin
-      makemkv
-      monero-gui
-      signal-desktop
-      spotify
-      tor-browser-bundle-bin
-      zecwallet-lite
-    ;
-  };
-
-  # packages not part of any package set; not enabled by default
-  otherPkgs = {
-    inherit (pkgs)
-      lemmy-server
-      mx-sanebot
-      stepmania
-    ;
-  };
-
-  # define -- but don't enable -- the packages in some attrset.
-  declarePkgs = pkgsAsAttrs: lib.mapAttrs (_n: p: {
-    # no need to actually define the package here: it's defaulted
-    # package = mkDefault p;
-  }) pkgsAsAttrs;
-in
-{
-  sane.programs = lib.mkMerge [
-    (declarePkgs consoleMediaPkgs)
-    (declarePkgs consolePkgs)
-    (declarePkgs desktopGuiPkgs)
-    (declarePkgs guiPkgs)
-    (declarePkgs iphonePkgs)
-    (declarePkgs sysadminPkgs)
-    (declarePkgs sysadminExtraPkgs)
-    (declarePkgs tuiPkgs)
-    (declarePkgs x86GuiPkgs)
-    (declarePkgs otherPkgs)
-    {
-      # link the various package sets into their own meta packages
-      consoleMediaUtils = {
-        package = null;
-        suggestedPrograms = attrNames consoleMediaPkgs;
-      };
-      consoleUtils = {
-        package = null;
-        suggestedPrograms = attrNames consolePkgs;
-      };
-      desktopGuiApps = {
-        package = null;
-        suggestedPrograms = attrNames desktopGuiPkgs;
-      };
-      guiApps = {
-        package = null;
-        suggestedPrograms = (attrNames guiPkgs)
-          ++ [ "web-browser" ]
-          ++ [ "tuiApps" ]
-          ++ lib.optional (pkgs.system == "x86_64-linux") "x86GuiApps";
-      };
-      iphoneUtils = {
-        package = null;
-        suggestedPrograms = attrNames iphonePkgs;
-      };
-      sysadminUtils = {
-        package = null;
-        suggestedPrograms = attrNames sysadminPkgs;
-      };
-      sysadminExtraUtils = {
-        package = null;
-        suggestedPrograms = attrNames sysadminExtraPkgs;
-      };
-      tuiApps = {
-        package = null;
-        suggestedPrograms = attrNames tuiPkgs;
-      };
-      x86GuiApps = {
-        package = null;
-        suggestedPrograms = attrNames x86GuiPkgs;
-      };
-    }
-    {
-      # nontrivial package definitions
-
-      dino.persist.private = [ ".local/share/dino" ];
-
-      # creds, but also 200 MB of node modules, etc
-      discord.persist.private = [ ".config/discord" ];
-
-      # creds/session keys, etc
-      element-desktop.persist.private = [ ".config/Element" ];
-
-      # `emote` will show a first-run dialog based on what's in this directory.
-      # mostly, it just keeps a LRU of previously-used emotes to optimize display order.
-      # TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience.
-      emote.persist.plaintext = [ ".local/share/Emote" ];
-
-      # MS GitHub stores auth token in .config
-      # TODO: we can populate gh's stuff statically; it even lets us use the same oauth across machines
-      gh.persist.private = [ ".config/gh" ];
-
-      # actual monero blockchain (not wallet/etc; safe to delete, just slow to regenerate)
-      # XXX: is it really safe to persist this? it doesn't have info that could de-anonymize if captured?
-      monero-gui.persist.plaintext = [ ".bitmonero" ];
-
-      mumble.persist.private = [ ".local/share/Mumble" ];
-
-      # not strictly necessary, but allows caching articles; offline use, etc.
-      nheko.persist.private = [
-        ".config/nheko"  # config file (including client token)
-        ".cache/nheko"  # media cache
-        ".local/share/nheko"  # per-account state database
-      ];
-
-      # settings (electron app)
-      obsidian.persist.plaintext = [ ".config/obsidian" ];
-
-      # creds, media
-      signal-desktop.persist.private = [ ".config/Signal" ];
-
-      # printer/filament settings
-      slic3r.persist.plaintext = [ ".Slic3r" ];
-
-      # creds, widevine .so download. TODO: could easily manage these statically.
-      spotify.persist.plaintext = [ ".config/spotify" ];
-
-      tdesktop.persist.private = [ ".local/share/TelegramDesktop" ];
-
-      tokodon.persist.private = [ ".cache/KDE/tokodon" ];
-
-      # hardenedMalloc solves a crash at startup
-      # TODO 2023/02/02: is this safe to remove yet?
-      tor-browser-bundle-bin.package = pkgs.tor-browser-bundle-bin.override {
-        useHardenedMalloc = false;
-      };
-
-      whalebird.persist.private = [ ".config/Whalebird" ];
-
-      yarn.persist.plaintext = [ ".cache/yarn" ];
-
-      # zcash coins. safe to delete, just slow to regenerate (10-60 minutes)
-      zecwallet-lite.persist.private = [ ".zcash" ];
-    }
-  ];
-}
--- a/hosts/common/programs/cozy.nix
+++ b/hosts/common/programs/cozy.nix
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  sane.programs.cozy = {
-    # cozy uses a sqlite db for its config and exposes no CLI options other than --help and --debug
-    persist.plaintext = [
-      ".local/share/cozy"  # sqlite db (config & index?)
-      ".cache/cozy"  # offline cache
-    ];
-  };
-}
--- a/hosts/common/programs/default.nix
+++ b/hosts/common/programs/default.nix
@@ -1,43 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./aerc.nix
-    ./assorted.nix
-    ./cozy.nix
-    ./git.nix
-    ./gnome-feeds.nix
-    ./gpodder.nix
-    ./gthumb.nix
-    ./imagemagick.nix
-    ./jellyfin-media-player.nix
-    ./kitty
-    ./komikku.nix
-    ./koreader
-    ./libreoffice.nix
-    ./lemoa.nix
-    ./mepo.nix
-    ./mpv.nix
-    ./msmtp.nix
-    ./neovim.nix
-    ./newsflash.nix
-    ./nix-index.nix
-    ./offlineimap.nix
-    ./ripgrep.nix
-    ./sfeed.nix
-    ./splatmoji.nix
-    ./steam.nix
-    ./sublime-music.nix
-    ./vlc.nix
-    ./web-browser.nix
-    ./wireshark.nix
-    ./zeal.nix
-    ./zsh
-  ];
-
-  config = {
-    # XXX: this might not be necessary. try removing this and cacert.unbundled (servo)?
-    environment.etc."ssl/certs".source = "${pkgs.cacert.unbundled}/etc/ssl/certs/*";
-
-  };
-}
--- a/hosts/common/programs/git.nix
+++ b/hosts/common/programs/git.nix
@@ -1,39 +0,0 @@
-{ lib, pkgs, ... }:
-
-let
-  mkCfg = lib.generators.toINI { };
-in
-{
-  sane.programs.git.fs.".config/git/config".symlink.text = mkCfg {
-    # top-level options documented:
-    # - <https://git-scm.com/docs/git-config#_variables>
-
-    user.name = "Colin";
-    user.email = "colin@uninsane.org";
-
-    alias.br      = "branch";
-    alias.co      = "checkout";
-    alias.cp      = "cherry-pick";
-    alias.d       = "difftool";
-    alias.dif     = "diff";  # common typo
-    alias.difsum  = "diff --compact-summary";  #< show only the list of files which changed, not contents
-    alias.rb      = "rebase";
-    alias.st      = "status";
-    alias.stat    = "status";
-
-    # difftastic docs:
-    # - <https://difftastic.wilfred.me.uk/git.html>
-    diff.tool = "difftastic";
-    difftool.prompt = false;
-    "difftool \"difftastic\"".cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
-    # now run `git difftool` to use difftastic git
-
-    # render dates as YYYY-MM-DD HH:MM:SS +TZ
-    log.date = "iso";
-
-    sendemail.annotate = "yes";
-    sendemail.confirm = "always";
-
-    stash.showPatch = true;
-  };
-}
--- a/hosts/common/programs/gnome-feeds.nix
+++ b/hosts/common/programs/gnome-feeds.nix
@@ -1,40 +0,0 @@
-# gnome feeds RSS viewer
-{ config, lib, sane-lib, ... }:
-
-let
-  feeds = sane-lib.feeds;
-  all-feeds = config.sane.feeds;
-  wanted-feeds = feeds.filterByFormat ["text" "image"] all-feeds;
-in {
-  sane.programs.gnome-feeds.fs.".config/org.gabmus.gfeeds.json".symlink.text = builtins.toJSON {
-    # feed format is a map from URL to a dict,
-    #   with dict["tags"] a list of string tags.
-    feeds = sane-lib.mapToAttrs (feed: {
-      name = feed.url;
-      value.tags = [ feed.cat feed.freq ];
-    }) wanted-feeds;
-    dark_reader = false;
-    new_first = true;
-    # windowsize = {
-    #   width = 350;
-    #   height = 650;
-    # };
-    max_article_age_days = 90;
-    enable_js = false;
-    max_refresh_threads = 3;
-    # saved_items = {};
-    # read_items = [];
-    show_read_items = true;
-    full_article_title = true;
-    # views: "webview", "reader", "rsscont"
-    default_view = "rsscont";
-    open_links_externally = true;
-    full_feed_name = false;
-    refresh_on_startup = true;
-    tags = lib.unique (
-      (builtins.catAttrs "cat" wanted-feeds) ++ (builtins.catAttrs "freq" wanted-feeds)
-    );
-    open_youtube_externally = false;
-    media_player = "vlc";  # default: mpv
-  };
-}
--- a/hosts/common/programs/gpodder.nix
+++ b/hosts/common/programs/gpodder.nix
@@ -1,18 +0,0 @@
-# gnome feeds RSS viewer
-{ config, pkgs, sane-lib, ... }:
-
-let
-  feeds = sane-lib.feeds;
-  all-feeds = config.sane.feeds;
-  wanted-feeds = feeds.filterByFormat ["podcast"] all-feeds;
-in {
-  sane.programs.gpodder = {
-    package = pkgs.gpodder-adaptive-configured;
-    # package = pkgs.gpodder-configured;
-    fs.".config/gpodderFeeds.opml".symlink.text = feeds.feedsToOpml wanted-feeds;
-
-    # XXX: we preserve the whole thing because if we only preserve gPodder/Downloads
-    #   then startup is SLOW during feed import, and we might end up with zombie eps in the dl dir.
-    persist.plaintext = [ "gPodder" ];
-  };
-}
--- a/hosts/common/programs/gthumb.nix
+++ b/hosts/common/programs/gthumb.nix
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  sane.programs.gthumb.package = pkgs.gthumb.override { withWebservices = false; };
-}
--- a/hosts/common/programs/imagemagick.nix
+++ b/hosts/common/programs/imagemagick.nix
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  sane.programs.imagemagick = {
-    package = pkgs.imagemagick.override {
-      ghostscriptSupport = true;
-    };
-    suggestedPrograms = [ "ghostscript" ];
-  };
-  sane.programs.ghostscript = {};
-}
--- a/hosts/common/programs/jellyfin-media-player.nix
+++ b/hosts/common/programs/jellyfin-media-player.nix
@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-  sane.programs.jellyfin-media-player = {
-    # package = pkgs.jellyfin-media-player;
-    package = pkgs.jellyfin-media-player-qt6;
-
-    # jellyfin stores things in a bunch of directories: this one persists auth info.
-    # it *might* be possible to populate this externally (it's Qt stuff), but likely to
-    # be fragile and take an hour+ to figure out.
-    persist.plaintext = [ ".local/share/Jellyfin Media Player" ];
-  };
-}
--- a/hosts/common/programs/kitty/PaperColor_dark.conf
+++ b/hosts/common/programs/kitty/PaperColor_dark.conf
@@ -1,47 +0,0 @@
-# vim:ft=kitty
-
-## name: PaperColor Dark
-## author: Nikyle Nguyen
-## license: MIT
-## blurb: Dark color scheme inspired by Google's Material Design 
-
-# special
-foreground		#d0d0d0
-background		#1c1c1c
-cursor			#d0d0d0
-cursor_text_color	background
-
-# black
-color0			#1c1c1c
-color8			#585858
-
-# red
-color1			#af005f
-color9			#5faf5f
-
-# green
-# "color2" is the green color used by ls to indicate executability
-#   both as text color
-#   or as bg color when the text is blue (color4)
-color2			#246a28
-color10			#2df200
-
-# yellow
-color3			#d7af5f
-color11			#af87d7
-
-# blue
-color4			#78c6ef
-color12			#ffaf00
-
-# magenta
-color5			#808080
-color13			#ff5faf
-
-# cyan
-color6			#d7875f
-color14			#00afaf
-
-# white
-color7			#d0d0d0
-color15			#5f8787
--- a/hosts/common/programs/kitty/default.nix
+++ b/hosts/common/programs/kitty/default.nix
@@ -1,73 +0,0 @@
-{ lib, ... }:
-
-{
-  sane.programs.kitty = {
-    fs.".config/kitty/kitty.conf".symlink.text = ''
-      # docs: https://sw.kovidgoyal.net/kitty/conf/
-      # disable terminal bell (when e.g. you backspace too many times)
-      enable_audio_bell no
-
-      map ctrl+n new_os_window_with_cwd
-      include ${./PaperColor_dark.conf}
-    '';
-    env.TERMINAL = lib.mkDefault "kitty";
-  };
-
-  #  include ${pkgs.kitty-themes}/themes/PaperColor_dark.conf
-
-  # THEME CHOICES:
-  #   docs: https://github.com/kovidgoyal/kitty-themes
-  # theme = "1984 Light";  # dislike: awful, harsh blues/teals
-  # theme = "Adventure Time";  # dislike: harsh (dark)
-  # theme = "Atom One Light";  # GOOD: light theme. all color combos readable. not a huge fan of the blue.
-  # theme = "Belafonte Day";  # dislike: too low contrast for text colors
-  # theme = "Belafonte Night";  # better: dark theme that's easy on the eyes. all combos readable. low contrast.
-  # theme = "Catppuccin";  # dislike: a bit pale/low-contrast (dark)
-  # theme = "Desert";  # mediocre: colors are harsh
-  # theme = "Earthsong";  # BEST: dark theme. readable, good contrast. unique, but decent colors.
-  # theme = "Espresso Libre";  # better: dark theme. readable, but meh colors
-  # theme = "Forest Night";  # decent: very pastel. it's workable, but unconventional and muted/flat.
-  # theme = "Gruvbox Material Light Hard";  # mediocre light theme.
-  # theme = "kanagawabones";  # better: dark theme. colors are too background-y
-  # theme = "Kaolin Dark";  # dislike: too dark
-  # theme = "Kaolin Breeze";  # mediocre: not-too-harsh light theme, but some parts are poor contrast
-  # theme = "Later This Evening";  # mediocre: not-too-harsh dark theme, but cursor is poor contrast
-  # theme = "Material"; # decent: light theme, few colors.
-  # theme = "Mayukai";  # decent: not-too-harsh dark theme. the teal is a bit straining
-  # theme = "Nord";  # mediocre: pale background, low contrast
-  # theme = "One Half Light";  # better: not-too-harsh light theme. contrast could be better
-  # theme = "PaperColor Dark";  # BEST: dark theme, very readable still the colors are background-y
-  # theme = "Parasio Dark";  # dislike: too low contrast
-  # theme = "Pencil Light";  # better: not-too-harsh light theme. decent contrast.
-  # theme = "Pnevma";  # dislike: too low contrast
-  # theme = "Piatto Light";  # better: readable light theme. pleasing colors. powerline prompt is hard to read.
-  # theme = "Rosé Pine Dawn";  # GOOD: light theme. all color combinations are readable. it is very mild -- may need to manually tweak contrast. tasteful colors
-  # theme = "Rosé Pine Moon";  # GOOD: dark theme. tasteful colors. but background is a bit intense
-  # theme = "Sea Shells";  # mediocre. not all color combos are readable
-  # theme = "Solarized Light";  # mediocre: not-too-harsh light theme; GREAT background; but some colors are low contrast
-  # theme = "Solarized Dark Higher Contrast";  # better: dark theme, decent colors
-  # theme = "Sourcerer";  # mediocre: ugly colors
-  # theme = "Space Gray";  # mediocre: too muted
-  # theme = "Space Gray Eighties";  # better: all readable, decent colors
-  # theme = "Spacemacs";  # mediocre: too muted
-  # theme = "Spring";  # mediocre: readable light theme, but the teal is ugly.
-  # theme = "Srcery";  # better: highly readable. colors are ehhh
-  # theme = "Substrata";  # decent: nice colors, but a bit flat.
-  # theme = "Sundried";  # mediocre: the solar text makes me squint
-  # theme = "Symfonic";  # mediocre: the dark purple has low contrast to the black bg.
-  # theme = "Tango Light";  # dislike: teal is too grating
-  # theme = "Tokyo Night Day";  # medicore: too muted
-  # theme = "Tokyo Night";  # better: tasteful. a bit flat
-  # theme = "Tomorrow";  # GOOD: all color combinations are readable. contrast is slightly better than Rose. on the blander side
-  # theme = "Treehouse";  # dislike: the orange is harsh on my eyes.
-  # theme = "Urple";  # dislike: weird palette
-  # theme = "Warm Neon";  # decent: not-too-harsh dark theme. the green is a bit unattractive
-  # theme = "Wild Cherry";  # GOOD: dark theme: nice colors. a bit flat
-  # theme = "Xcodedark";  # dislike: bad palette
-  # theme = "citylights";  # decent: dark theme. some parts have just a bit low contrast
-  # theme = "neobones_light"; # better light theme. the background is maybe too muted
-  # theme = "vimbones";
-  # theme = "zenbones_dark";  # mediocre: readable, but meh colors
-  # theme = "zenbones_light";  # decent: light theme. all colors are readable. contrast is passable but not excellent. highlight color is BAD
-  # theme = "zenwritten_dark";  # mediocre: looks same as zenbones_dark
-}
--- a/hosts/common/programs/komikku.nix
+++ b/hosts/common/programs/komikku.nix
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  sane.programs.komikku = {
-    secrets.".local/share/komikku/keyrings/plaintext.keyring" = ../../../secrets/common/komikku_accounts.json.bin;
-    # downloads end up here, and without the toplevel database komikku doesn't know they exist.
-    persist.plaintext = [ ".local/share/komikku" ];
-  };
-}
--- a/hosts/common/programs/koreader/2-colin-NetworkManager-isConnected.lua
+++ b/hosts/common/programs/koreader/2-colin-NetworkManager-isConnected.lua
@@ -1,42 +0,0 @@
-- as of 2023.05.1, koreader FTP browser always fails to load.
-- it's convinced that it's offline, and asks to connect to wifi.
-- this seems to be because of the following in <frontend/device/sdl/device.lua>:
--
-- function Device:initNetworkManager(NetworkMgr)
--     function NetworkMgr:isWifiOn() return true end
--     function NetworkMgr:isConnected()
--         -- Pull the default gateway first, so we don't even try to ping anything if there isn't one...
--         local default_gw = Device:getDefaultRoute()
--         if not default_gw then
--             return false
--         end
--         return 0 == os.execute("ping -c1 -w2 " .. default_gw .. " > /dev/null")
--     end
-- end
--
-- specifically, `os.execute` is not *expected* to return 0. it returns `true` on success:
-- <https://www.lua.org/manual/5.3/manual.html#pdf-os.execute>
-- this apparently changed from 5.1 -> 5.2
--
-- XXX: this same bug likely applies to `isCommand` and `runCommand` in <frontend/device/sdl/device.lua>
-- - that would manifest as wikipedia links failing to open in external application (xdg-open)
-
-local logger = require("logger")
-logger.info("applying colin patch")
-
-local Device = require("device")
-logger.info("Device:" .. tostring(Device))
-
-local orig_initNetworkManager = Device.initNetworkManager
-Device.initNetworkManager = function(self, NetworkMgr)
-  logger.info("Device:initNetworkManager")
-  orig_initNetworkManager(self, NetworkMgr)
-  function NetworkMgr:isConnected()
-    logger.info("mocked `NetworkMgr:isConnected` to return true")
-    return true
-    -- unpatch to show that the boolean form works
-    -- local rc = os.execute("ping -c1 -w2 10.78.79.1 > /dev/null")
-    -- logger.info("ping rc: " .. tostring(rc))
-    -- return rc
-  end
-end
--- a/hosts/common/programs/koreader/default.nix
+++ b/hosts/common/programs/koreader/default.nix
@@ -1,46 +0,0 @@
-{ config, lib, sane-lib, ... }:
-
-let
-  feeds = sane-lib.feeds;
-  allFeeds = config.sane.feeds;
-  wantedFeeds = feeds.filterByFormat [ "image" "text" ] allFeeds;
-  koreaderRssEntries = builtins.map (feed:
-    # format:
-    # { "<rss/atom url>", limit = <int>, download_full_article=<bool>, include_images=<bool>, enable_filter=<bool>, filter_element = "<css selector>"},
-    # limit = 0                    => download and keep *all* articles
-    # download_full_article = true => populate feed by downloading the webpage -- not just what's encoded in the RSS <article> tags
-    # - use this for articles where the RSS only encodes content previews
-    # enable_filter         = true => only render content that matches the filter_element css selector.
-    let fields = [
-      (lib.escapeShellArg feed.url)
-      "limit = 5"
-      "download_full_article = false"
-      "include_images = true"
-      "enable_filter = false"
-      "filter_element = \"\""
-    ]; in "{ ${lib.concatStringsSep ", " fields } }"
-  ) wantedFeeds;
-in {
-  sane.programs.koreader = {
-    # koreader applies these lua "patches" at boot:
-    # - <https://github.com/koreader/koreader/wiki/User-patches>
-    # - TODO: upstream this patch to koreader
-    # fs.".config/koreader/patches".symlink.target = "${./.}";
-    fs.".config/koreader/patches/2-colin-NetworkManager-isConnected.lua".symlink.target = "${./2-colin-NetworkManager-isConnected.lua}";
-
-    # koreader news plugin, enabled by default. file format described here:
-    # - <repo:koreader/koreader:plugins/newsdownloader.koplugin/feed_config.lua>
-    fs.".config/koreader/news/feed_config.lua".symlink.text = ''
-      return {--do NOT change this line
-        ${lib.concatStringsSep ",\n  " koreaderRssEntries}
-      }--do NOT change this line
-    '';
-
-    # koreader on aarch64 errors if there's no fonts directory (sandboxing thing, i guess)
-    fs.".local/share/fonts".dir = {};
-
-    # history, cache, dictionaries...
-    # could be more explicit if i symlinked the history.lua file to somewhere it can persist better.
-    persist.plaintext = [ ".config/koreader" ];
-  };
-}
--- a/hosts/common/programs/lemoa.nix
+++ b/hosts/common/programs/lemoa.nix
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  sane.programs.lemoa = {
-    # creds
-    persist.private = [ ".local/share/io.github.lemmygtk.lemoa" ];
-  };
-}
--- a/hosts/common/programs/libreoffice.nix
+++ b/hosts/common/programs/libreoffice.nix
@@ -1,14 +0,0 @@
-{ ... }:
-
-{
-  # libreoffice: disable first-run stuff
-  sane.programs.libreoffice-fresh.fs.".config/libreoffice/4/user/registrymodifications.xcu".symlink.text = ''
-    <?xml version="1.0" encoding="UTF-8"?>
-    <oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-      <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="FirstRun" oor:op="fuse"><value>false</value></prop></item>
-      <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="ShowTipOfTheDay" oor:op="fuse"><value>false</value></prop></item>
-    </oor:items>
-  '';
-  # <item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeDonateShown" oor:op="fuse"><value>1667693880</value></prop></item>
-  # <item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeGetInvolvedShown" oor:op="fuse"><value>1667693880</value></prop></item>
-}
--- a/hosts/common/programs/mepo.nix
+++ b/hosts/common/programs/mepo.nix
@@ -1,18 +0,0 @@
-# docs: <https://git.sr.ht/~mil/mepo>
-# irc #mepo:irc.oftc.net
-{ config, lib, ... }:
-
-{
-  sane.programs.mepo = {
-    persist.plaintext = [ ".cache/mepo/tiles" ];
-    # ~/.cache/mepo/savestate has precise coordinates and pins: keep those private
-    persist.private = [ ".cache/mepo/savestate" ];
-  };
-
-  programs.mepo = lib.mkIf config.sane.programs.mepo.enabled {
-    # enable location services (via geoclue)
-    enable = true;
-    # more precise, via gpsd ("may require additional config")
-    # programs.mepo.gpsd.enable = true
-  };
-}
--- a/hosts/common/programs/mpv.nix
+++ b/hosts/common/programs/mpv.nix
@@ -1,13 +0,0 @@
-{ ... }:
-
-{
-  sane.programs.mpv = {
-    persist.plaintext = [ ".config/mpv/watch_later" ];
-    # format is <key>=%<length>%<value>
-    fs.".config/mpv/mpv.conf".symlink.text = ''
-      save-position-on-quit=%3%yes
-      keep-open=%3%yes
-    '';
-  };
-}
-
--- a/hosts/common/programs/msmtp.nix
+++ b/hosts/common/programs/msmtp.nix
@@ -1,25 +0,0 @@
-# docs: <https://nixos.wiki/wiki/Msmtp>
-# validate with e.g.
-# - `echo -e "Content-Type: text/plain\r\nSubject: Test\r\n\r\nHello World" | sendmail test@uninsane.org`
-{ config, lib, ... }:
-
-{
-  sane.programs.msmtp = {
-    secrets.".config/msmtp/password.txt" = ../../../secrets/common/msmtp_password.txt.bin;
-  };
-
-  programs.msmtp = lib.mkIf config.sane.programs.msmtp.enabled {
-    enable = true;
-    accounts = {
-      default = {
-        auth = true;
-        tls = true;
-        tls_starttls = false;  # needed else sendmail hangs
-        from = "Colin <colin@uninsane.org>";
-        host = "mx.uninsane.org";
-        user = "colin";
-        passwordeval = "cat ~/.config/msmtp/password.txt";
-      };
-    };
-  };
-}
--- a/hosts/common/programs/neovim.nix
+++ b/hosts/common/programs/neovim.nix
@@ -1,143 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (builtins) map;
-  inherit (lib) concatMapStrings mkIf optionalString;
-  # this structure roughly mirrors home-manager's `programs.neovim.plugins` option
-  plugins = with pkgs.vimPlugins; [
-    {
-      # docs: fzf-vim (fuzzy finder): https://github.com/junegunn/fzf.vim
-      plugin = fzf-vim;
-    }
-    {
-      # treesitter syntax highlighting: https://nixos.wiki/wiki/Tree_sitters
-      # docs: https://github.com/nvim-treesitter/nvim-treesitter
-      # config taken from: https://github.com/i077/system/blob/master/modules/home/neovim/default.nix
-      # this is required for tree-sitter to even highlight
-      plugin = nvim-treesitter.withAllGrammars;
-      type = "lua";
-      config = ''
-        require'nvim-treesitter.configs'.setup {
-          highlight = {
-            enable = true,
-            -- disable treesitter on Rust so that we can use SyntaxRange
-            -- and leverage TeX rendering in rust projects
-            disable = { "rust", "tex", "latex" },
-            -- disable = { "tex", "latex" },
-            -- true to also use builtin vim syntax highlighting when treesitter fails
-            additional_vim_regex_highlighting = false
-          },
-          incremental_selection = {
-            enable = true,
-            keymaps = {
-              init_selection = "gnn",
-              node_incremental = "grn",
-              mcope_incremental = "grc",
-              node_decremental = "grm"
-            }
-          },
-          indent = {
-            enable = true,
-            disable = {}
-          }
-        }
-
-        vim.o.foldmethod = 'expr'
-        vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
-      '';
-    }
-    {
-      # docs: tex-conceal-vim: https://github.com/KeitaNakamura/tex-conceal.vim/
-      plugin = tex-conceal-vim;
-      type = "viml";
-      config = ''
-        " present prettier fractions
-        let g:tex_conceal_frac=1
-      '';
-    }
-    {
-      # source: <https://github.com/LnL7/vim-nix>
-      # fixes auto-indent (incl tab size) when editing .nix files
-      plugin = vim-nix;
-    }
-    {
-      # docs: surround-nvim: https://github.com/ur4ltz/surround.nvim/
-      # docs: vim-surround: https://github.com/tpope/vim-surround
-      plugin = vim-surround;
-    }
-    {
-      plugin = vim-SyntaxRange;
-      type = "viml";
-      config = ''
-        " enable markdown-style codeblock highlighting for tex code
-        autocmd BufEnter * call SyntaxRange#Include('```tex', '```', 'tex', 'NonText')
-        " autocmd Syntax tex set conceallevel=2
-      '';
-    }
-  ];
-  plugin-packages = map (p: p.plugin) plugins;
-  plugin-config-tex = concatMapStrings (p: optionalString (p.type or "" == "viml") p.config) plugins;
-  plugin-config-lua = concatMapStrings (p: optionalString (p.type or "" == "lua") p.config) plugins;
-in
-{
-  # private because there could be sensitive things in the swap
-  sane.programs.neovim = {
-    persist.private = [ ".cache/vim-swap" ];
-    env.EDITOR = "vim";
-    # git claims it should use EDITOR, but it doesn't!
-    env.GIT_EDITOR = "vim";
-  };
-
-  programs.neovim = mkIf config.sane.programs.neovim.enabled {
-    # neovim: https://github.com/neovim/neovim
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    configure = {
-      packages.myVimPackage = {
-        start = plugin-packages;
-      };
-      customRC = ''
-        " let the terminal handle mouse events, that way i get OS-level ctrl+shift+c/etc
-        " this used to be default, until <https://github.com/neovim/neovim/pull/19290>
-        set mouse=
-
-        " copy/paste to system clipboard
-        set clipboard=unnamedplus
-
-        " screw tabs; always expand them into spaces
-        set expandtab
-
-        " at least don't open files with sections folded by default
-        set nofoldenable
-
-        " allow text substitutions for certain glyphs.
-        " higher number = more aggressive substitution (0, 1, 2, 3)
-        " i only make use of this for tex, but it's unclear how to
-        " apply that *just* to tex and retain the SyntaxRange stuff.
-        set conceallevel=2
-
-        " horizontal rule under the active line
-        " set cursorline
-
-        " highlight trailing space & related syntax errors (doesn't seem to work??)
-        " let c_space_errors=1
-        " let python_space_errors=1
-
-        " enable highlighting of leading/trailing spaces,
-        " and especially tabs
-        " source: https://www.reddit.com/r/neovim/comments/chlmfk/highlight_trailing_whitespaces_in_neovim/
-        set list
-        set listchars=tab:▷\·,trail:·,extends:◣,precedes:◢,nbsp:○
-
-        """"" PLUGIN CONFIG (tex)
-        ${plugin-config-tex}
-
-        """"" PLUGIN CONFIG (lua)
-        lua <<EOF
-        ${plugin-config-lua}
-        EOF
-      '';
-    };
-  };
-}
--- a/hosts/common/programs/nix-index.nix
+++ b/hosts/common/programs/nix-index.nix
@@ -1,7 +0,0 @@
-{ config, lib, ... }:
-{
-  # provides `nix-locate`, backed by the manually run `nix-index`
-  sane.programs.nix-index = {
-    persist.plaintext = [ ".cache/nix-index" ];
-  };
-}
--- a/hosts/common/programs/offlineimap.nix
+++ b/hosts/common/programs/offlineimap.nix
@@ -1,12 +0,0 @@
-# mail archiving/synchronization tool.
-#
-# manually download all emails for an account with
-# - `offlineimap -a <accountname>`
-#
-# view account names inside the secrets file, listed below.
-{ ... }:
-
-{
-  sane.programs.offlineimap.secrets.".config/offlineimap/config" = ../../../secrets/common/offlineimaprc.bin;
-}
-
--- a/hosts/common/programs/ripgrep.nix
+++ b/hosts/common/programs/ripgrep.nix
@@ -1,9 +0,0 @@
-{ ... }:
-{
-  # .ignore file is read by ripgrep (rg), silver searcher (ag), maybe others.
-  # ignore translation files by default when searching, as they tend to have
-  # a LOT of duplicate text.
-  sane.programs.ripgrep.fs.".ignore".symlink.text = ''
-    po/
-  '';
-}
--- a/hosts/common/programs/sfeed.nix
+++ b/hosts/common/programs/sfeed.nix
@@ -1,28 +0,0 @@
-# simple RSS and Atom parser
-# - <https://codemadness.org/sfeed-simple-feed-parser.html>
-# - used by sxmo
-# - man 5 sfeedrc
-#
-# call `sfeed_update` to query each feed and populate entries in ~/.sfeed/feeds
-{ lib, config, sane-lib, ... }:
-let
-  feeds = sane-lib.feeds;
-  allFeeds = config.sane.feeds;
-  wantedFeeds = feeds.filterByFormat ["text"] allFeeds;
-  sfeedEntries = builtins.map (feed:
-    # format:
-    # feed <name> <feedurl> [basesiteurl] [encoding]
-    lib.escapeShellArgs [ "feed" (if feed.title != null then feed.title else feed.url) feed.url ]
-  ) wantedFeeds;
-in {
-  sane.programs.sfeed = {
-    fs.".sfeed/sfeedrc".symlink.text = ''
-      feeds() {
-        ${lib.concatStringsSep "\n  " sfeedEntries}
-      }
-    '';
-
-    # this is where the parsed feed items go
-    persist.plaintext = [ ".sfeed/feeds" ];
-  };
-}
--- a/hosts/common/programs/splatmoji.nix
+++ b/hosts/common/programs/splatmoji.nix
@@ -1,22 +0,0 @@
-# borrows from:
-# - default config: <https://github.com/cspeterson/splatmoji/blob/master/splatmoji.config>
-# - wayland: <https://github.com/cspeterson/splatmoji/issues/32#issuecomment-830862566>
-{ pkgs, ... }:
-
-{
-  sane.programs.splatmoji = {
-    persist.plaintext = [ ".local/state/splatmoji" ];
-    fs.".config/splatmoji/splatmoji.config".symlink.text = ''
-      # XXX doesn't seem to understand ~ as shorthand for `$HOME`
-      history_file=/home/colin/.local/state/splatmoji/history
-      history_length=5
-      # TODO: wayland equiv
-      paste_command=xdotool key ctrl+v
-      # rofi_command=${pkgs.wofi}/bin/wofi --dmenu --insensitive --cache-file /dev/null
-      rofi_command=${pkgs.fuzzel}/bin/fuzzel -d -i -w 60
-      xdotool_command=${pkgs.wtype}/bin/wtype
-      # TODO: wayland equiv
-      xsel_command=xsel -b -i
-    '';
-  };
-}
--- a/hosts/common/programs/steam.nix
+++ b/hosts/common/programs/steam.nix
@@ -1,16 +0,0 @@
-{ config, lib, ...}:
-{
-  sane.programs.steam = {
-    persist.plaintext = [
-      ".steam"
-      ".local/share/Steam"
-    ];
-  };
-  # steam requires system-level config for e.g. firewall or controller support
-  programs.steam = lib.mkIf config.sane.programs.steam.enabled {
-    enable = true;
-    # not sure if needed: stole this whole snippet from the wiki
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
-}
--- a/hosts/common/programs/sublime-music.nix
+++ b/hosts/common/programs/sublime-music.nix
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-
-{
-  sane.programs.sublime-music = {
-    package = pkgs.sublime-music-mobile;
-    # sublime music persists any downloaded albums here.
-    # it doesn't obey a conventional ~/Music/{Artist}/{Album}/{Track} notation, so no symlinking
-    # config (e.g. server connection details) is persisted in ~/.config/sublime-music/config.json
-    #   possible to pass config as a CLI arg (sublime-music -c config.json)
-    persist.plaintext = [ ".local/share/sublime-music" ];
-
-    secrets.".config/sublime-music/config.json" = ../../../secrets/common/sublime_music_config.json.bin;
-  };
-}
--- a/hosts/common/programs/vlc.nix
+++ b/hosts/common/programs/vlc.nix
@@ -1,24 +0,0 @@
-{ config, lib, sane-lib, ... }:
-
-let
-  feeds = sane-lib.feeds;
-  all-feeds = config.sane.feeds;
-  wanted-feeds = feeds.filterByFormat ["podcast"] all-feeds;
-  podcast-urls = lib.concatStringsSep "|" (
-    builtins.map (feed: feed.url) wanted-feeds
-  );
-in
-{
-  sane.programs.vlc = {
-    # vlc remembers play position in ~/.config/vlc/vlc-qt-interface.conf
-    persist.plaintext = [ ".config/vlc" ];
-    fs.".config/vlc/vlcrc".symlink.text = ''
-      [podcast]
-      podcast-urls=${podcast-urls}
-      [core]
-      metadata-network-access=0
-      [qt]
-      qt-privacy-ask=0
-    '';
-  };
-}
--- a/hosts/common/programs/web-browser.nix
+++ b/hosts/common/programs/web-browser.nix
@@ -1,251 +0,0 @@
-# common settings to toggle (at runtime, in about:config):
-#   > security.ssl.require_safe_negotiation
-
-# librewolf is a forked firefox which patches firefox to allow more things
-# (like default search engines) to be configurable at runtime.
-# many of the settings below won't have effect without those patches.
-# see: https://gitlab.com/librewolf-community/settings/-/blob/master/distribution/policies.json
-
-{ config, lib, pkgs, ...}:
-with lib;
-let
-  cfg = config.sane.programs.web-browser.config;
-  # allow easy switching between firefox and librewolf with `defaultSettings`, below
-  librewolfSettings = {
-    browser = pkgs.librewolf-unwrapped;
-    extraPrefsFiles = pkgs.librewolf-unwrapped.extraPrefsFiles ++ pkgs.librewolf-pmos-mobile.extraPrefsFiles;
-    libName = "librewolf";
-    dotDir = ".librewolf";
-    cacheDir = ".cache/librewolf";
-    desktop = "librewolf.desktop";
-  };
-  firefoxSettings = {
-    browser = pkgs.firefox-esr-unwrapped;
-    extraPrefsFiles = pkgs.firefox-pmos-mobile.extraPrefsFiles;
-    libName = "firefox";
-    dotDir = ".mozilla/firefox";
-    cacheDir = ".cache/mozilla";
-    desktop = "firefox.desktop";
-  };
-  # defaultSettings = firefoxSettings;
-  defaultSettings = librewolfSettings;
-
-  addon = name: extid: hash: pkgs.fetchFirefoxAddon {
-    inherit name hash;
-    url = "https://addons.mozilla.org/firefox/downloads/latest/${name}/latest.xpi";
-    # extid can be found by unar'ing the above xpi, and copying browser_specific_settings.gecko.id field
-    fixedExtid = extid;
-  };
-  localAddon = pkg: pkgs.fetchFirefoxAddon {
-    inherit (pkg) name;
-    src = "${pkg}/share/mozilla/extensions/\\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\\}/${pkg.extid}.xpi";
-    fixedExtid = pkg.extid;
-  };
-
-  package = pkgs.wrapFirefox cfg.browser.browser {
-    # inherit the default librewolf.cfg
-    # it can be further customized via ~/.librewolf/librewolf.overrides.cfg
-    inherit (cfg.browser) extraPrefsFiles libName;
-
-    extraNativeMessagingHosts = optional cfg.addons.browserpass-extension.enable pkgs.browserpass;
-    # extraNativeMessagingHosts = [ pkgs.gopass-native-messaging-host ];
-
-    nixExtensions = concatMap (ext: optional ext.enable ext.package) (attrValues cfg.addons);
-
-    extraPolicies = {
-      FirefoxHome = {
-        Search = true;
-        Pocket = false;
-        Snippets = false;
-        TopSites = false;
-        Highlights = false;
-      };
-      NoDefaultBookmarks = true;
-      OfferToSaveLogins = false;
-      OfferToSaveLoginsDefault = false;
-      PasswordManagerEnabled = false;
-      SearchEngines = {
-        Default = "DuckDuckGo";
-      };
-      UserMessaging = {
-        ExtensionRecommendations = false;
-        FeatureRecommendations = false;
-        SkipOnboarding = true;
-        UrlbarInterventions = false;
-        WhatsNew = false;
-      };
-
-      # these were taken from Librewolf
-      AppUpdateURL = "https://localhost";
-      DisableAppUpdate = true;
-      OverrideFirstRunPage = "";
-      OverridePostUpdatePage = "";
-      DisableSystemAddonUpdate = true;
-      DisableFirefoxStudies = true;
-      DisableTelemetry = true;
-      DisableFeedbackCommands = true;
-      DisablePocket = true;
-      DisableSetDesktopBackground = false;
-
-      # remove many default search providers
-      # XXX this seems to prevent the `nixExtensions` from taking effect
-      # Extensions.Uninstall = [
-      #   "google@search.mozilla.org"
-      #   "bing@search.mozilla.org"
-      #   "amazondotcom@search.mozilla.org"
-      #   "ebay@search.mozilla.org"
-      #   "twitter@search.mozilla.org"
-      # ];
-      # XXX doesn't seem to have any effect...
-      # docs: https://github.com/mozilla/policy-templates#homepage
-      # Homepage = {
-      #   HomepageURL = "https://uninsane.org/";
-      #   StartPage = "homepage";
-      # };
-      # NewTabPage = true;
-    };
-    # extraPrefs = ...
-  };
-
-  addonOpts = types.submodule {
-    options = {
-      package = mkOption {
-        type = types.package;
-      };
-      enable = mkOption {
-        type = types.bool;
-      };
-    };
-  };
-
-  configOpts = {
-    options = {
-      browser = mkOption {
-        default = defaultSettings;
-        type = types.anything;
-      };
-      persistData = mkOption {
-        description = "optional store name to which persist browsing data (like history)";
-        type = types.nullOr types.str;
-        default = null;
-      };
-      persistCache = mkOption {
-        description = "optional store name to which persist browser cache";
-        type = types.nullOr types.str;
-        default = "cryptClearOnBoot";
-      };
-      addons = mkOption {
-        type = types.attrsOf addonOpts;
-        default = {};
-      };
-    };
-  };
-in
-{
-  config = mkMerge [
-    ({
-      sane.programs.web-browser.configOption = mkOption {
-        type = types.submodule configOpts;
-        default = {};
-      };
-      sane.programs.web-browser.config.addons = {
-        # get names from:
-        # - ~/ref/nix-community/nur-combined/repos/rycee/pkgs/firefox-addons/generated-firefox-addons.nix
-        # `wget ...xpi`; `unar ...xpi`; `cat */manifest.json | jq '.browser_specific_settings.gecko.id'`
-        browserpass-extension = {
-          # package = addon "browserpass-ce" "browserpass@maximbaz.com" "sha256-sXgUBbRvMnRpeIW1MTkmTcoqtW/8RDXAkxAq1evFkpc=";
-          package = localAddon pkgs.browserpass-extension;
-          enable = lib.mkDefault true;
-        };
-
-        # TODO: build bypass-paywalls from source? it's mysteriously disappeared from the Mozilla store.
-        # bypass-paywalls-clean.package = addon "bypass-paywalls-clean" "{d133e097-46d9-4ecc-9903-fa6a722a6e0e}" "sha256-oUwdqdAwV3DezaTtOMx7A/s4lzIws+t2f08mwk+324k=";
-        # bypass-paywalls-clean.enable = lib.mkDefault true;
-
-        # TODO: give these update scripts, make them reachable via `pkgs`
-        ether-metamask = {
-          package = addon "ether-metamask" "webextension@metamask.io" "sha256-UI83wUUc33OlQYX+olgujeppoo2D2PAUJ+Wma5mH2O0=";
-          enable = lib.mkDefault true;
-        };
-        i2p-in-private-browsing = {
-          package = addon "i2p-in-private-browsing" "i2ppb@eyedeekay.github.io" "sha256-dJcJ3jxeAeAkRvhODeIVrCflvX+S4E0wT/PyYzQBQWs=";
-          enable = lib.mkDefault config.services.i2p.enable;
-        };
-        sidebery = {
-          package = addon "sidebery" "{3c078156-979c-498b-8990-85f7987dd929}" "sha256-YONfK/rIjlsrTgRHIt3km07Q7KnpIW89Z9r92ZSCc6w=";
-          enable = lib.mkDefault true;
-        };
-        sponsorblock = {
-          package = addon "sponsorblock" "sponsorBlocker@ajay.app" "sha256-b/OTFmhSEUZ/CYrYCE4rHVMQmY+Y78k8jSGMoR8vsZA=";
-          enable = lib.mkDefault true;
-        };
-        ublacklist = {
-          package = addon "ublacklist" "@ublacklist" "sha256-NZ2FmgJiYnH7j2Lkn0wOembxaEphmUuUk0Ytmb0rNWo=";
-          enable = lib.mkDefault true;
-        };
-        ublock-origin = {
-          package = addon "ublock-origin" "uBlock0@raymondhill.net" "sha256-EGGAA+cLUow/F5luNzFG055rFfd3rEyh8hTaL/23pbM=";
-          enable = lib.mkDefault true;
-        };
-      };
-    })
-    ({
-      sane.programs.web-browser = {
-        inherit package;
-
-        # env.BROWSER = "${package}/bin/${cfg.browser.libName}";
-        env.BROWSER = cfg.browser.libName;  # used by misc tools like xdg-email, as fallback
-
-        # uBlock filter list configuration.
-        # specifically, enable the GDPR cookie prompt blocker.
-        # data.toOverwrite.filterLists is additive (i.e. it supplements the default filters)
-        # this configuration method is documented here:
-        # - <https://github.com/gorhill/uBlock/issues/2986#issuecomment-364035002>
-        # the specific attribute path is found via scraping ublock code here:
-        # - <https://github.com/gorhill/uBlock/blob/master/src/js/storage.js>
-        # - <https://github.com/gorhill/uBlock/blob/master/assets/assets.json>
-        fs."${cfg.browser.dotDir}/managed-storage/uBlock0@raymondhill.net.json".symlink.text = ''
-          {
-           "name": "uBlock0@raymondhill.net",
-           "description": "ignored",
-           "type": "storage",
-           "data": {
-              "toOverwrite": "{\"filterLists\": [\"fanboy-cookiemonster\"]}"
-           }
-          }
-        '';
-        # TODO: this is better suited in `extraPrefs` during `wrapFirefox` call
-        fs."${cfg.browser.dotDir}/${cfg.browser.libName}.overrides.cfg".symlink.text = ''
-          // if we can't query the revocation status of a SSL cert because the issuer is offline,
-          // treat it as unrevoked.
-          // see: <https://librewolf.net/docs/faq/#im-getting-sec_error_ocsp_server_error-what-can-i-do>
-          defaultPref("security.OCSP.require", false);
-        '';
-        fs."${cfg.browser.dotDir}/default".dir = {};
-        # instruct Firefox to put the profile in a predictable directory (so we can do things like persist just it).
-        # XXX: the directory *must* exist, even if empty; Firefox will not create the directory itself.
-        fs."${cfg.browser.dotDir}/profiles.ini".symlink.text = ''
-          [Profile0]
-          Name=default
-          IsRelative=1
-          Path=default
-          Default=1
-
-          [General]
-          StartWithLastProfile=1
-        '';
-      };
-    })
-    (mkIf config.sane.programs.web-browser.enabled {
-      # TODO: move the persistence into the sane.programs API (above)
-      # flush the cache to disk to avoid it taking up too much tmp
-      sane.user.persist.byPath."${cfg.browser.cacheDir}" = lib.mkIf (cfg.persistCache != null) {
-        store = cfg.persistCache;
-      };
-
-      sane.user.persist.byPath."${cfg.browser.dotDir}/default" = lib.mkIf (cfg.persistData != null) {
-        store = cfg.persistData;
-      };
-    })
-  ];
-}
--- a/hosts/common/programs/wireshark.nix
+++ b/hosts/common/programs/wireshark.nix
@@ -1,5 +0,0 @@
-{ config, ... }:
-{
-  sane.programs.wireshark = {};
-  programs.wireshark.enable = config.sane.programs.wireshark.enabled;
-}
--- a/hosts/common/programs/zeal.nix
+++ b/hosts/common/programs/zeal.nix
@@ -1,55 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  inherit (builtins) map;
-  inherit (lib) mkIf mkOption optionalString types;
-  cfg = config.sane.programs.docsets.config;
-  configOpts = types.submodule {
-    options = {
-      rustPkgs = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-      };
-    };
-  };
-in {
-  sane.programs.zeal = {
-    package = pkgs.zeal-qt5;
-    persist.plaintext = [
-      ".cache/Zeal"
-      ".local/share/Zeal"
-    ];
-    fs.".local/share/Zeal/Zeal/docsets/system".symlink.target = "/run/current-system/sw/share/docset";
-    suggestedPrograms = [ "docsets" ];
-  };
-
-  sane.programs.docsets = {
-    configOption = mkOption {
-      type = configOpts;
-      default = {};
-    };
-    package = pkgs.symlinkJoin {
-      name = "docsets";
-      # build each package with rust docs
-      paths = map (name:
-        let
-          orig = pkgs."${name}";
-          withDocs = orig.overrideAttrs (upstream: {
-            nativeBuildInputs = upstream.nativeBuildInputs or [] ++ [
-              pkgs.cargoDocsetHook
-            ];
-          });
-        in
-        "${toString withDocs}/share/docset"
-      ) cfg.rustPkgs;
-      # link only the docs (not any binaries)
-      postBuild = optionalString (cfg.rustPkgs != []) ''
-        mkdir -p $out/share/docset
-        mv $out/*.docset $out/share/docset
-      '';
-    };
-  };
-
-  environment.pathsToLink = mkIf config.sane.programs.zeal.enabled [
-    "/share/docset"
-  ];
-}
--- a/hosts/common/programs/zsh/default.nix
+++ b/hosts/common/programs/zsh/default.nix
@@ -1,193 +0,0 @@
-# zsh files/init order
-# - see `man zsh` => "STARTUP/SHUTDOWN FILES"
-# - /etc/zshenv
-# - $ZDOTDIR/.zshenv
-# - if login shell:
-#   - /etc/zprofile
-#   - $ZDOTDIR/.zprofile
-# - if interactive:
-#   - /etc/zshrc
-#   - $ZDOTDIR/.zshrc
-# - if login (again):
-#   - /etc/zlogin
-#   - ZDOTDIR/.zlogin
-# - at exit:
-#   - $ZDOTDIR/.zlogout
-#   - /etc/zlogout
-
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf mkMerge mkOption types;
-  cfg = config.sane.zsh;
-  # powerlevel10k prompt config
-  # p10k.zsh is the auto-generated config, and i overwrite those defaults here, below.
-  p10k-overrides = ''
-    # powerlevel10k launches a gitstatusd daemon to accelerate git prompt queries.
-    # this keeps open file handles for any git repo i touch for 60 minutes (by default).
-    # that prevents unmounting whatever device the git repo is on -- particularly problematic for ~/private.
-    # i can disable gitstatusd and get slower fallback git queries:
-    # - either universally
-    # - or selectively by path
-    # see: <https://github.com/romkatv/powerlevel10k/issues/246>
-    typeset -g POWERLEVEL9K_VCS_DISABLED_DIR_PATTERN='(/home/colin/private/*|/home/colin/knowledge/*)'
-    # typeset -g POWERLEVEL9K_DISABLE_GITSTATUS=true
-
-    # show user@host also when logged into the current machine.
-    # default behavior is to show it only over ssh.
-    typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_CONTENT_EXPANSION='$P9K_CONTENT'
-  '';
-
-  prezto-init = ''
-    source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-    source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-    source ${pkgs.zsh-prezto}/share/zsh-prezto/init.zsh
-  '';
-in
-{
-  options = {
-    sane.zsh = {
-      showDeadlines = mkOption {
-        type = types.bool;
-        default = true;
-        description = "show upcoming deadlines (from my PKM) upon shell init";
-      };
-    };
-  };
-
-  config = mkMerge [
-    ({
-      sane.programs.zsh = {
-        persist.private = [
-          # we don't need to full zsh dir -- just the history file --
-          # but zsh will sometimes backup the history file and symlinking just the file messes things up
-          ".local/share/zsh"
-        ];
-        persist.plaintext = [
-          # cache gitstatus otherwise p10k fetches it from the net EVERY BOOT
-          ".cache/gitstatus"
-        ];
-
-        fs.".config/zsh/.zshrc".symlink.text = ''
-          # zsh/prezto complains if zshrc doesn't exist or is empty;
-          # preserve this comment to prevent that from ever happening.
-        '' + lib.optionalString cfg.showDeadlines ''
-          ${pkgs.sane-scripts.deadlines}/bin/sane-deadlines
-        '' + ''
-          # auto-cd into any of these dirs by typing them and pressing 'enter':
-          hash -d 3rd="/home/colin/dev/3rd"
-          hash -d dev="/home/colin/dev"
-          hash -d knowledge="/home/colin/knowledge"
-          hash -d nixos="/home/colin/nixos"
-          hash -d nixpkgs="/home/colin/dev/3rd/nixpkgs"
-          hash -d ref="/home/colin/ref"
-          hash -d secrets="/home/colin/knowledge/secrets"
-          hash -d tmp="/home/colin/tmp"
-          hash -d uninsane="/home/colin/dev/uninsane"
-          hash -d Videos="/home/colin/Videos"
-        '';
-
-        # prezto = oh-my-zsh fork; controls prompt, auto-completion, etc.
-        # see: https://github.com/sorin-ionescu/prezto
-        # this file is auto-sourced by the prezto init.zsh script.
-        # TODO: i should work to move away from prezto:
-        # - it's FUCKING SLOW to initialize (that might also be powerlevel10k tho)
-        # - it messes with my other `setopt`s
-        fs.".config/zsh/.zpreztorc".symlink.text = ''
-          zstyle ':prezto:*:*' color 'yes'
-          zstyle ':prezto:module:utility' correct 'no'  # prezto: don't setopt CORRECT
-
-          # modules (they ship with prezto):
-          # ENVIRONMENT: configures jobs to persist after shell exit; other basic niceties
-          # TERMINAL: auto-titles terminal (e.g. based on cwd)
-          # EDITOR: configures shortcuts like Ctrl+U=undo, Ctrl+L=clear
-          # HISTORY: `history-stat` alias, setopts for good history defaults
-          # DIRECTORY: sets AUTO_CD, adds `d` alias to list directory stack, and `1`-`9` to cd that far back the stack. also overrides CLOBBER and some other options
-          # SPECTRUM: helpers for term colors and styling. used by prompts? might be unnecessary
-          # UTILITY: configures aliases like `ll`, `la`, disables globbing for things like rsync
-          #   adds aliases like `get` to fetch a file. also adds `http-serve` alias??
-          # COMPLETION: tab completion. requires `utility` module prior to loading
-          zstyle ':prezto:load' pmodule \
-            'environment' \
-            'terminal' \
-            'editor' \
-            'history' \
-            'spectrum' \
-            'utility' \
-            'completion' \
-            'prompt'
-
-          # default keymap. try also `vicmd` (vim normal mode, AKA "cmd mode") or `vi`.
-          zstyle ':prezto:module:editor' key-bindings 'emacs'
-
-          zstyle ':prezto:module:prompt' theme 'powerlevel10k'
-
-          # disable `mv` confirmation (and `rm`, too, unfortunately)
-          zstyle ':prezto:module:utility' safe-ops 'no'
-        '';
-      };
-    })
-    (mkIf config.sane.programs.zsh.enabled {
-      # enable zsh completions
-      environment.pathsToLink = [ "/share/zsh" ];
-
-      programs.zsh = {
-        enable = true;
-        histFile = "$HOME/.local/share/zsh/history";
-        shellAliases = {
-          ":q" = "exit";
-          # common typos
-          "cd.." = "cd ..";
-          "cd../" = "cd ../";
-        };
-        setOptions = [
-          # docs: `man zshoptions`
-          # nixos defaults:
-          "HIST_FCNTL_LOCK"
-          "HIST_IGNORE_DUPS"
-          "SHARE_HISTORY"
-          # customizations:
-          "AUTO_CD"  # type directory name to go there
-          "AUTO_MENU"  # show auto-complete menu on double-tab
-          "CDABLE_VARS"  # allow auto-cd to use my `hash` aliases -- not just immediate subdirs
-          "CLOBBER"  # allow `foo > bar.txt` to overwrite bar.txt
-          "NO_CORRECT"  # don't try to correct commands
-          "PIPE_FAIL"  # when `cmd_a | cmd_b`, make $? be non-zero if *any* of cmd_a or cmd_b fail
-          "RM_STAR_SILENT"  # disable `rm *` confirmations
-        ];
-
-        # .zshenv config:
-        shellInit = ''
-          ZDOTDIR=$HOME/.config/zsh
-        '';
-
-        # system-wide .zshrc config:
-        interactiveShellInit =
-          (builtins.readFile ./p10k.zsh)
-        + p10k-overrides
-        + prezto-init
-        + ''
-          # zmv is a way to do rich moves/renames, with pattern matching/substitution.
-          # see for an example: <https://filipe.kiss.ink/zmv-zsh-rename/>
-          autoload -Uz zmv
-
-          HISTORY_IGNORE='(sane-shutdown *|sane-reboot *|rm *|nixos-rebuild.* switch)'
-
-          # extra aliases
-          # TODO: move to `shellAliases` config?
-          function nd() {
-            mkdir -p "$1";
-            pushd "$1";
-          }
-        '';
-
-        syntaxHighlighting.enable = true;
-        vteIntegration = true;
-      };
-
-      # enable a command-not-found hook to show nix packages that might provide the binary typed.
-      # programs.nix-index.enableZshIntegration = true;
-      programs.command-not-found.enable = false;
-    })
-  ];
-}
--- a/hosts/common/secrets.nix
+++ b/hosts/common/secrets.nix
@@ -1,53 +1,38 @@
-# SOPS configuration:
-#   docs: https://github.com/Mic92/sops-nix
-#
-# for each new user you want to edit sops files:
-# create a private age key from ssh key:
-#   $ mkdir -p ~/.config/sops/age; ssh-to-age -private-key -i ~/.ssh/id_ed25519 > ~/.config/sops/age/keys.txt; chmod 600 ~/.config/sops/age/keys.txt
-#   if the private key was password protected, then first decrypt it:
-#     $ cp ~/.ssh/id_ed25519 /tmp/id_ed25519
-#     $ ssh-keygen -p -N "" -f /tmp/id_ed25519
-#
-# for each user you want to decrypt secrets:
-#   $ cat ~/.ssh/id_ed25519.pub | ssh-to-age
-#   add the result to .sops.yaml
-#   since we specify ssh pubkeys in the nix config, you can just grep for `ssh-ed25519` here and use those instead
-#
-# for each host you want to decrypt secrets:
-#   $ cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
-#   add the result to .sops.yaml
-#   $ sops updatekeys secrets/example.yaml
-#
-# to create a new secret:
-#   $ sops secrets/example.yaml
-#   control access below (sops.secret.<x>.owner = ...)
-#
-# to read a secret:
-#   $ cat /run/secrets/example_key
+{ config, ... }:

-{ config, lib, sane-lib, ... }:
-
-let
-  inherit (lib.strings) hasSuffix removeSuffix;
-  secretsForHost = host: let
-    extraAttrsForPath = path: lib.optionalAttrs (sane-lib.path.isChild "guest" path) {
-      owner = "guest";
-    };
-  in sane-lib.joinAttrsets (
-    map
-      (path: lib.optionalAttrs (hasSuffix ".bin" path) (sane-lib.nameValueToAttrs {
-        name = removeSuffix ".bin" path;
-        value = {
-          sopsFile = ../../secrets/${host}/${path};
-          format = "binary";
-        } // (extraAttrsForPath path);
-      }))
-      (sane-lib.enumerateFilePaths ../../secrets/${host})
-  );
-in
 {
+  # SOPS configuration:
+  #   docs: https://github.com/Mic92/sops-nix
+  #
+  # for each new user you want to edit sops files:
+  # create a private age key from ssh key:
+  #   $ mkdir -p ~/.config/sops/age; ssh-to-age -private-key -i ~/.ssh/id_ed25519 > ~/.config/sops/age/keys.txt; chmod 600 ~/.config/sops/age/keys.txt
+  #   if the private key was password protected, then first decrypt it:
+  #     $ cp ~/.ssh/id_ed25519 /tmp/id_ed25519
+  #     $ ssh-keygen -p -N "" -f /tmp/id_ed25519
+  #
+  # for each user you want to decrypt secrets:
+  #   $ cat ~/.ssh/id_ed25519.pub | ssh-to-age
+  #   add the result to .sops.yaml
+  #   since we specify ssh pubkeys in the nix config, you can just grep for `ssh-ed25519` here and use those instead
+  #
+  # for each host you want to decrypt secrets:
+  #   $ cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
+  #   add the result to .sops.yaml
+  #   $ sops updatekeys secrets/example.yaml
+  #
+  # to create a new secret:
+  #   $ sops secrets/example.yaml
+  #   control access below (sops.secret.<x>.owner = ...)
+  #
+  # to read a secret:
+  #   $ cat /run/secrets/example_key

  # sops.age.sshKeyPaths = [ "/home/colin/.ssh/id_ed25519_dec" ];
+  # This will add secrets.yaml to the nix store
+  # You can avoid this by adding a string to the full path instead, i.e.
+  # sops.defaultSopsFile = "/root/.sops/secrets/example.yaml";
+  sops.defaultSopsFile = ../../secrets/universal.yaml;
  sops.gnupg.sshKeyPaths = [];  # disable RSA key import
  # This is using an age key that is expected to already be in the filesystem
  # sops.age.keyFile = "/home/colin/.ssh/age.pub";
@@ -60,16 +45,80 @@ in
  # };
  # sops.secrets."myservice/my_subdir/my_secret" = {};

-  sops.secrets = lib.mkMerge [
-    (secretsForHost "common")
-    (secretsForHost config.networking.hostName)
-    {
-      "jackett_apikey".owner = config.users.users.colin.name;
-      "mx-sanebot-env".owner = config.users.users.colin.name;
-      "snippets".owner = config.users.users.colin.name;
-      "transmission_passwd".owner = config.users.users.colin.name;
-    }
-  ];
+  ## universal secrets
+  # TODO: glob these?
+
+  sops.secrets."jackett_apikey" = {
+    sopsFile = ../../secrets/universal.yaml;
+    owner = config.users.users.colin.name;
+  };
+  sops.secrets."router_passwd" = {
+    sopsFile = ../../secrets/universal.yaml;
+  };
+  sops.secrets."wg_ovpnd_us_privkey" = {
+    sopsFile = ../../secrets/universal.yaml;
+  };
+  sops.secrets."wg_ovpnd_us-atl_privkey" = {
+    sopsFile = ../../secrets/universal.yaml;
+  };
+  sops.secrets."wg_ovpnd_us-mi_privkey" = {
+    sopsFile = ../../secrets/universal.yaml;
+  };
+  sops.secrets."wg_ovpnd_ukr_privkey" = {
+    sopsFile = ../../secrets/universal.yaml;
+  };
+
+  sops.secrets."snippets" = {
+    sopsFile = ../../secrets/universal/snippets.bin;
+    format = "binary";
+    owner = config.users.users.colin.name;
+  };
+
+  sops.secrets."bt/car" = {
+    sopsFile = ../../secrets/universal/bt/car.bin;
+    format = "binary";
+  };
+  sops.secrets."bt/earbuds" = {
+    sopsFile = ../../secrets/universal/bt/earbuds.bin;
+    format = "binary";
+  };
+  sops.secrets."bt/portable-speaker" = {
+    sopsFile = ../../secrets/universal/bt/portable-speaker.bin;
+    format = "binary";
+  };
+
+  sops.secrets."iwd/community-university.psk" = {
+    sopsFile = ../../secrets/universal/net/community-university.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/friend-libertarian-dod.psk" = {
+    sopsFile = ../../secrets/universal/net/friend-libertarian-dod.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/friend-rationalist-empathist.psk" = {
+    sopsFile = ../../secrets/universal/net/friend-rationalist-empathist.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-bedroom.psk" = {
+    sopsFile = ../../secrets/universal/net/home-bedroom.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-shared-24G.psk" = {
+    sopsFile = ../../secrets/universal/net/home-shared-24G.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/home-shared.psk" = {
+    sopsFile = ../../secrets/universal/net/home-shared.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/iphone" = {
+    sopsFile = ../../secrets/universal/net/iphone.psk.bin;
+    format = "binary";
+  };
+  sops.secrets."iwd/parents" = {
+    sopsFile = ../../secrets/universal/net/parents.psk.bin;
+    format = "binary";
+  };
 }


--- a/hosts/common/ssh.nix
+++ b/hosts/common/ssh.nix
@@ -1,54 +1,24 @@
 { config, lib, sane-data, sane-lib, ... }:

-let
-  inherit (builtins) attrValues head map mapAttrs tail;
-  inherit (lib) concatStringsSep mkMerge reverseList;
-in
 {
  sane.ssh.pubkeys =
  let
    # path is a DNS-style path like [ "org" "uninsane" "root" ]
    keyNameForPath = path:
      let
-        rev = reverseList path;
-        name = head rev;
-        host = concatStringsSep "." (tail rev);
+        rev = lib.reverseList path;
+        name = builtins.head rev;
+        host = lib.concatStringsSep "." (builtins.tail rev);
      in
      "${name}@${host}";

    # [{ path :: [String], value :: String }] for the keys we want to install
    globalKeys = sane-lib.flattenAttrs sane-data.keys;
-
-    keysForHost = hostCfg: sane-lib.mapToAttrs
-      (name: {
-        inherit name;
-        value = {
-          colin = hostCfg.ssh.user_pubkey;
-          root = hostCfg.ssh.host_pubkey;
-        };
-      })
-      hostCfg.names
-    ;
-    domainKeys = sane-lib.flattenAttrs (
-      sane-lib.joinAttrsets (
-        map keysForHost (builtins.attrValues config.sane.hosts.by-name)
-      )
-    );
-  in mkMerge (map
+    localKeys = sane-lib.flattenAttrs sane-data.keys.org.uninsane.local;
+  in lib.mkMerge (builtins.map
    ({ path, value }: {
-      "${keyNameForPath path}" = lib.mkIf (value != null) value;
+      "${keyNameForPath path}" = value;
    })
-    (globalKeys ++ domainKeys)
+    (globalKeys ++ localKeys)
  );
-
-  services.openssh = {
-    enable = true;
-    settings.PermitRootLogin = "no";
-    settings.PasswordAuthentication = false;
-  };
-  sane.ports.ports."22" = {
-    protocol = [ "tcp" ];
-    visibleTo.lan = true;
-    description = lib.mkDefault "colin-ssh";
-  };
 }
--- a/hosts/common/users.nix
+++ b/hosts/common/users.nix
@@ -0,0 +1,132 @@
+{ config, pkgs, lib, sane-lib, ... }:
+
+# installer docs: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/profiles/installation-device.nix
+with lib;
+let
+  cfg = config.sane.users;
+  fs = sane-lib.fs;
+in
+{
+  options = {
+    sane.users.guest.enable = mkOption {
+      default = false;
+      type = types.bool;
+    };
+  };
+
+  config = {
+    # Users are exactly these specified here;
+    # old ones will be deleted (from /etc/passwd, etc) upon upgrade.
+    users.mutableUsers = false;
+
+    # docs: https://nixpkgs-manual-sphinx-markedown-example.netlify.app/generated/options-db.xml.html#users-users
+    users.users.colin = {
+      # sets group to "users" (?)
+      isNormalUser = true;
+      home = "/home/colin";
+      createHome = true;
+      homeMode = "0700";
+      # i don't get exactly what this is, but nixos defaults to this non-deterministically
+      # in /var/lib/nixos/auto-subuid-map and i don't want that.
+      subUidRanges = [
+        { startUid=100000; count=1; }
+      ];
+      group = "users";
+      extraGroups = [
+        "wheel"
+        "nixbuild"
+        "networkmanager"
+        # phosh/mobile. XXX colin: unsure if necessary
+        "video"
+        "feedbackd"
+        "dialout" # required for modem access
+      ];
+
+      # initial password is empty, in case anything goes wrong.
+      # if `colin-passwd` (a password hash) is successfully found/decrypted, that becomes the password at boot.
+      initialPassword = lib.mkDefault "";
+      passwordFile = lib.mkIf (config.sops.secrets ? "colin-passwd") config.sops.secrets.colin-passwd.path;
+
+      shell = pkgs.zsh;
+
+      # mount encrypted stuff at login
+      # some other nix pam users:
+      # - <https://github.com/g00pix/nixconf/blob/32c04f6fa843fed97639dd3f09e157668d3eea1f/profiles/sshfs.nix>
+      # - <https://github.com/lourkeur/distro/blob/11173454c6bb50f7ccab28cc2c757dca21446d1d/nixos/profiles/users/louis-full.nix>
+      # - <https://github.com/dnr/sample-nix-code/blob/03494480c1fae550c033aa54fd96aeb3827761c5/nixos/laptop.nix>
+      pamMount = let
+        priv = config.fileSystems."/home/colin/private";
+      in {
+        fstype = priv.fsType;
+        path = priv.device;
+        mountpoint = priv.mountPoint;
+        options = builtins.concatStringsSep "," priv.options;
+      };
+    };
+
+    security.pam.mount.enable = true;
+
+    # ensure ~ perms are known to sane.fs module.
+    # TODO: this is generic enough to be lifted up into sane.fs itself.
+    sane.fs."/home/colin".dir.acl = {
+      user = "colin";
+      group = config.users.users.colin.group;
+      mode = config.users.users.colin.homeMode;
+    };
+
+    sane.persist.home.plaintext = [
+      "archive"
+      "dev"
+      # TODO: records should be private
+      "records"
+      "ref"
+      "tmp"
+      "use"
+      "Music"
+      "Pictures"
+      "Videos"
+
+      ".cargo"
+      ".rustup"
+    ];
+
+    # convenience
+    sane.fs."/home/colin/knowledge" = fs.wantedSymlinkTo "/home/colin/private/knowledge";
+    sane.fs."/home/colin/nixos" = fs.wantedSymlinkTo "/home/colin/dev/nixos";
+    sane.fs."/home/colin/Videos/servo" = fs.wantedSymlinkTo "/mnt/servo-media/Videos";
+    sane.fs."/home/colin/Videos/servo-incomplete" = fs.wantedSymlinkTo "/mnt/servo-media/incomplete";
+    sane.fs."/home/colin/Music/servo" = fs.wantedSymlinkTo "/mnt/servo-media/Music";
+
+    # used by password managers, e.g. unix `pass`
+    sane.fs."/home/colin/.password-store" = fs.wantedSymlinkTo "/home/colin/knowledge/secrets/accounts";
+
+    sane.persist.sys.plaintext = mkIf cfg.guest.enable [
+      # intentionally allow other users to write to the guest folder
+      { directory = "/home/guest"; user = "guest"; group = "users"; mode = "0775"; }
+    ];
+    users.users.guest = mkIf cfg.guest.enable {
+      isNormalUser = true;
+      home = "/home/guest";
+      subUidRanges = [
+        { startUid=200000; count=1; }
+      ];
+      group = "users";
+      initialPassword = lib.mkDefault "";
+      shell = pkgs.zsh;
+      openssh.authorizedKeys.keys = [
+        # TODO: insert pubkeys that should be allowed in
+      ];
+    };
+
+    security.sudo = {
+      enable = true;
+      wheelNeedsPassword = false;
+    };
+
+    services.openssh = {
+      enable = true;
+      permitRootLogin = "no";
+      passwordAuthentication = false;
+    };
+  };
+}
--- a/hosts/common/users/colin.nix
+++ b/hosts/common/users/colin.nix
@@ -1,93 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  # docs: https://nixpkgs-manual-sphinx-markedown-example.netlify.app/generated/options-db.xml.html#users-users
-  users.users.colin = {
-    # sets group to "users" (?)
-    isNormalUser = true;
-    home = "/home/colin";
-    createHome = true;
-    homeMode = "0700";
-    # i don't get exactly what this is, but nixos defaults to this non-deterministically
-    # in /var/lib/nixos/auto-subuid-map and i don't want that.
-    subUidRanges = [
-      { startUid=100000; count=1; }
-    ];
-    group = "users";
-    extraGroups = [
-      "dialout"  # required for modem access (moby)
-      "feedbackd"
-      "input"  # for /dev/input/<xyz>: sxmo
-      "networkmanager"
-      "nixbuild"
-      "transmission"  # servo, to admin /var/lib/uninsane/media
-      "video"  # phosh/mobile. XXX colin: unsure if necessary
-      "wheel"
-      "wireshark"
-    ];
-
-    # initial password is empty, in case anything goes wrong.
-    # if `colin-passwd` (a password hash) is successfully found/decrypted, that becomes the password at boot.
-    initialPassword = lib.mkDefault "";
-    passwordFile = lib.mkIf (config.sops.secrets ? "colin-passwd") config.sops.secrets.colin-passwd.path;
-
-    shell = pkgs.zsh;
-
-    # mount encrypted stuff at login
-    # some other nix pam users:
-    # - <https://github.com/g00pix/nixconf/blob/32c04f6fa843fed97639dd3f09e157668d3eea1f/profiles/sshfs.nix>
-    # - <https://github.com/lourkeur/distro/blob/11173454c6bb50f7ccab28cc2c757dca21446d1d/nixos/profiles/users/louis-full.nix>
-    # - <https://github.com/dnr/sample-nix-code/blob/03494480c1fae550c033aa54fd96aeb3827761c5/nixos/laptop.nix>
-    pamMount = let
-      priv = config.fileSystems."/home/colin/private";
-    in {
-      fstype = priv.fsType;
-      path = priv.device;
-      mountpoint = priv.mountPoint;
-      options = builtins.concatStringsSep "," priv.options;
-    };
-  };
-
-  security.pam.mount.enable = true;
-
-  sane.users.colin = {
-    default = true;
-    # ensure ~ perms are known to sane.fs module.
-    # TODO: this is generic enough to be lifted up into sane.fs itself.
-    fs."/".dir.acl = {
-      user = "colin";
-      group = config.users.users.colin.group;
-      mode = config.users.users.colin.homeMode;
-    };
-
-    persist.plaintext = [
-      "archive"
-      "dev"
-      # TODO: records should be private
-      "records"
-      "ref"
-      "tmp"
-      "use"
-      "Music"
-      "Pictures"
-      "Videos"
-
-      ".cache/nix"
-
-      # ".cargo"
-      # ".rustup"
-    ];
-
-    # convenience
-    fs."knowledge".symlink.target = "private/knowledge";
-    fs."nixos".symlink.target = "dev/nixos";
-    fs."Books/servo".symlink.target = "/mnt/servo-media/Books";
-    fs."Videos/servo".symlink.target = "/mnt/servo-media/Videos";
-    fs."Videos/servo-incomplete".symlink.target = "/mnt/servo-media/incomplete";
-    fs."Music/servo".symlink.target = "/mnt/servo-media/Music";
-    fs."Pictures/servo-macros".symlink.target = "/mnt/servo-media/Pictures/macros";
-
-    # used by password managers, e.g. unix `pass`
-    fs.".password-store".symlink.target = "knowledge/secrets/accounts";
-  };
-}
--- a/hosts/common/users/default.nix
+++ b/hosts/common/users/default.nix
@@ -1,17 +0,0 @@
-{ config, pkgs, lib, sane-lib, ... }:
-
-{
-  imports = [
-    ./colin.nix
-    ./guest.nix
-  ];
-
-  # Users are exactly these specified here;
-  # old ones will be deleted (from /etc/passwd, etc) upon upgrade.
-  users.mutableUsers = false;
-
-  security.sudo = {
-    enable = true;
-    wheelNeedsPassword = false;
-  };
-}
--- a/hosts/common/users/guest.nix
+++ b/hosts/common/users/guest.nix
@@ -1,33 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  cfg = config.sane.guest;
-in
-{
-  options = with lib; {
-    sane.guest.enable = mkOption {
-      default = false;
-      type = types.bool;
-    };
-  };
-
-  config = {
-    users.users.guest = lib.mkIf cfg.enable {
-      isNormalUser = true;
-      home = "/home/guest";
-      subUidRanges = [
-        { startUid=200000; count=1; }
-      ];
-      group = "users";
-      initialPassword = lib.mkDefault "";
-      shell = pkgs.zsh;
-    };
-
-    sane.users.guest.fs.".ssh/authorized_keys".symlink.target = config.sops.secrets."guest/authorized_keys".path or "/dev/null";
-
-    sane.persist.sys.plaintext = lib.mkIf cfg.enable [
-      # intentionally allow other users to write to the guest folder
-      { directory = "/home/guest"; user = "guest"; group = "users"; mode = "0775"; }
-    ];
-  };
-}
--- a/hosts/common/vpn.nix
+++ b/hosts/common/vpn.nix
@@ -11,7 +11,7 @@ let
  def-ovpn = name: { endpoint, publicKey, address }: {
    networking.wg-quick.interfaces."ovpnd-${name}" = {
      inherit address;
-      privateKeyFile = config.sops.secrets."wg/ovpnd_${name}_privkey".path;
+      privateKeyFile = config.sops.secrets."wg_ovpnd_${name}_privkey".path;
      dns = [
        "46.227.67.134"
        "192.165.9.158"
--- a/hosts/by-name/desko/default.nix
+++ b/hosts/by-name/desko/default.nix
@@ -4,28 +4,13 @@
    ./fs.nix
  ];

-  sane.guest.enable = true;
-
-  # TODO: make sure this plays nice with impermanence
-  services.distccd.enable = true;
-  sane.programs.distcc.enableFor.user.guest = true;
-
-  sops.secrets.colin-passwd.neededForUsers = true;
-
-  sane.roles.build-machine.enable = true;
-  sane.roles.ac = true;
-  sane.roles.client = true;
-  sane.roles.dev-machine = true;
-  sane.services.wg-home.enable = true;
-  sane.services.wg-home.ip = config.sane.hosts.by-name."desko".wg-home.ip;
-  sane.services.duplicity.enable = true;
-  sane.services.nixserve.secretKeyFile = config.sops.secrets.nix_serve_privkey.path;
+  # sane.packages.enableDevPkgs = true;

  sane.gui.sway.enable = true;
-  sane.programs.iphoneUtils.enableFor.user.colin = true;
-
-  sane.programs.guiApps.suggestedPrograms = [ "desktopGuiApps" ];
-  sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" ];
+  sane.services.duplicity.enable = true;
+  sane.services.nixserve.enable = true;
+  sane.services.nixserve.sopsFile = ../../secrets/desko.yaml;
+  sane.persist.enable = true;

  boot.loader.efi.canTouchEfiVariables = false;
  sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
@@ -33,6 +18,11 @@
  # needed to use libimobiledevice/ifuse, for iphone sync
  services.usbmuxd.enable = true;

+  sops.secrets.colin-passwd = {
+    sopsFile = ../../secrets/desko.yaml;
+    neededForUsers = true;
+  };
+
  # don't enable wifi by default: it messes with connectivity.
  systemd.services.iwd.enable = false;

@@ -43,9 +33,15 @@
  services.snapper.configs.nix = {
    # TODO: for the impermanent setup, we'd prefer to just do /nix/persist,
    # but that also requires setting up the persist dir as a subvol
-    SUBVOLUME = "/nix";
+    subvolume = "/nix";
    # TODO: ALLOW_USERS doesn't seem to work. still need `sudo snapper -c nix list`
-    ALLOW_USERS = [ "colin" ];
+    extraConfig = ''
+      ALLOW_USERS = "colin";
+    '';
+  };
+
+  sops.secrets.duplicity_passphrase = {
+    sopsFile = ../../secrets/desko.yaml;
  };

  programs.steam = {
@@ -54,7 +50,7 @@
    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
  };
-  sane.user.persist.plaintext = [
+  sane.persist.home.plaintext = [
    ".steam"
    ".local/share/Steam"
  ];
--- a/hosts/by-name/desko/fs.nix
+++ b/hosts/by-name/desko/fs.nix
--- a/hosts/instantiate.nix
+++ b/hosts/instantiate.nix
@@ -1,18 +1,23 @@
 # trampoline from flake.nix into the specific host definition, while doing a tiny bit of common setup

-# args from flake-level `import`
 { hostName, localSystem }:
-
-# module args
-{ lib, ... }:
+{ ... }:

 {
  imports = [
-    ./by-name/${hostName}
+    ./${hostName}
    ./common
-    ./modules
  ];

  networking.hostName = hostName;
-  nixpkgs.buildPlatform = lib.mkIf (localSystem != null) localSystem;
+
+  nixpkgs.overlays = [
+    (next: prev: {
+      # for local != target we by default just emulate the target while building.
+      # provide a `pkgs.cross.<pkg>` alias that consumers can use instead of `pkgs.<foo>`
+      # to explicitly opt into non-emulated cross compilation for any specific package.
+      # this is most beneficial for large packages with few pre-requisites -- like Linux.
+      cross = next.crossFrom."${localSystem}";
+    })
+  ];
 }
--- a/hosts/by-name/lappy/default.nix
+++ b/hosts/by-name/lappy/default.nix
@@ -1,27 +1,22 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
  imports = [
    ./fs.nix
-    ./polyfill.nix
  ];

-  sane.roles.client = true;
-  sane.roles.dev-machine = true;
-  sane.services.wg-home.enable = true;
-  sane.services.wg-home.ip = config.sane.hosts.by-name."lappy".wg-home.ip;
+  # sane.packages.enableDevPkgs = true;

-  # sane.guest.enable = true;
+  # sane.users.guest.enable = true;
  sane.gui.sway.enable = true;
+  sane.persist.enable = true;
+  sane.nixcache.enable = true;
  boot.loader.efi.canTouchEfiVariables = false;
  sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];

-  sane.programs.guiApps.suggestedPrograms = [
-    "desktopGuiApps"
-    "stepmania"
-  ];
-  sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" ];
-
-  sops.secrets.colin-passwd.neededForUsers = true;
+  sops.secrets.colin-passwd = {
+    sopsFile = ../../secrets/lappy.yaml;
+    neededForUsers = true;
+  };

  # default config: https://man.archlinux.org/man/snapper-configs.5
  # defaults to something like:
@@ -30,8 +25,7 @@
  services.snapper.configs.nix = {
    # TODO: for the impermanent setup, we'd prefer to just do /nix/persist,
    # but that also requires setting up the persist dir as a subvol
-    SUBVOLUME = "/nix";
-    ALLOW_USERS = [ "colin" ];
+    subvolume = "/nix";
  };

  # TODO: only here for debugging
--- a/hosts/by-name/lappy/fs.nix
+++ b/hosts/by-name/lappy/fs.nix
--- a/hosts/moby/default.nix
+++ b/hosts/moby/default.nix
@@ -0,0 +1,89 @@
+{ config, pkgs, lib, ... }:
+{
+  imports = [
+    ./firmware.nix
+    ./fs.nix
+    ./kernel.nix
+  ];
+
+  # cross-compiled documentation is *slow*.
+  # no obvious way to natively compile docs (2022/09/29).
+  # entrypoint is nixos/modules/misc/documentation.nix
+  # doc building happens in nixos/doc/manual/default.nix
+  # TODO: we could *maybe* inject pkgs.buildPackages.xyz = cross.buildPackages.xyz?
+  documentation.nixos.enable = false;
+
+  # 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";
+  services.getty.autologinUser = "root";  # allows for emergency maintenance?
+
+  sops.secrets.colin-passwd = {
+    sopsFile = ../../secrets/moby.yaml;
+    neededForUsers = true;
+  };
+
+  # usability compromises
+  sane.web-browser.persistCache = "private";
+  sane.web-browser.persistData = "private";
+  sane.persist.home.plaintext = [
+    ".config/pulse"  # persist pulseaudio volume
+  ];
+
+  # sane.packages.enableGuiPkgs = false;  # XXX faster builds/imaging for debugging
+  sane.packages.extraUserPkgs = [
+    pkgs.plasma5Packages.konsole  # terminal
+  ];
+
+  sane.nixcache.enable = true;
+  sane.persist.enable = true;
+  sane.gui.phosh.enable = true;
+
+  boot.loader.efi.canTouchEfiVariables = false;
+  # /boot space is at a premium. default was 20.
+  # even 10 can be too much
+  # TODO: compress moby kernels!
+  boot.loader.generic-extlinux-compatible.configurationLimit = 8;
+  # mobile.bootloader.enable = false;
+  # mobile.boot.stage-1.enable = false;
+  # boot.initrd.systemd.enable = false;
+  # boot.initrd.services.swraid.enable = false;  # attempt to fix dm_mod stuff
+  # disable proximity sensor.
+  # the filtering/calibration is bad that it causes the screen to go fully dark at times.
+  boot.blacklistedKernelModules = [ "stk3310" ];
+
+  # without this some GUI apps fail: `DRM_IOCTL_MODE_CREATE_DUMB failed: Cannot allocate memory`
+  # this is because they can't allocate enough video ram.
+  # the default CMA seems to be 32M. we could probably get by with as little as 64M, and safely with 128M.
+  # `cat /proc/meminfo` to see CmaTotal/CmaFree if interested in tuning this.
+  boot.kernelParams = [ "cma=256M" ];
+
+  # mobile-nixos' /lib/firmware includes:
+  #   rtl_bt          (bluetooth)
+  #   anx7688-fw.bin  (USB-C -> HDMI bridge)
+  #   ov5640_af.bin   (camera module)
+  # hardware.firmware = [ config.mobile.device.firmware ];
+  hardware.firmware = [ pkgs.rtl8723cs-firmware ];
+
+  system.stateVersion = "21.11";
+
+  # defined: https://www.freedesktop.org/software/systemd/man/machine-info.html
+  # XXX colin: not sure which, if any, software makes use of this
+  environment.etc."machine-info".text = ''
+    CHASSIS="handset"
+  '';
+
+  # enable rotation sensor
+  hardware.sensor.iio.enable = true;
+
+  # from https://gitlab.manjaro.org/manjaro-arm/packages/community/phosh/alsa-ucm-pinephone
+  # mobile-nixos does this same thing, with *slightly different settings*.
+  # i trust manjaro more because the guy maintaining that is actively trying to upstream into alsa-ucm-conf.
+  # an alternative may be to build a custom alsa with the PinePhone config patch applied:
+  # - <https://github.com/alsa-project/alsa-ucm-conf/pull/134>
+  # that would make this be not device-specific
+  environment.variables.ALSA_CONFIG_UCM2 = "${./ucm2}";
+  systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";
+
+  hardware.opengl.driSupport = true;
+}
--- a/hosts/by-name/moby/firmware.nix
+++ b/hosts/by-name/moby/firmware.nix
--- a/hosts/by-name/moby/fs.nix
+++ b/hosts/by-name/moby/fs.nix
--- a/hosts/moby/kernel.nix
+++ b/hosts/moby/kernel.nix
@@ -0,0 +1,143 @@
+{ lib, pkgs, ... }:
+let
+  # use the last commit on the 5.18 branch (5.18.14)
+  # manjaro's changes between kernel patch versions tend to be minimal if any.
+  manjaroBase = "https://gitlab.manjaro.org/manjaro-arm/packages/core/linux/-/raw/25bd828cd47b1c6e09fcbcf394a649b89d2876dd";
+  manjaroPatch = name: sha256: {
+    inherit name;
+    patch = pkgs.fetchpatch {
+      inherit name;
+      url = "${manjaroBase}/${name}?inline=false";
+      inherit sha256;
+    };
+  };
+
+  # the idea for patching off Manjaro's kernel comes from jakewaksbaum:
+  # - https://git.sr.ht/~jakewaksbaum/pi/tree/af20aae5653545d6e67a459b59ee3e1ca8a680b0/item/kernel/default.nix
+  # - he later abandoned this, i think because he's using the Pinephone Pro which received mainline support.
+  manjaroPatches = [
+    (manjaroPatch
+      "1001-arm64-dts-allwinner-add-hdmi-sound-to-pine-devices.patch"
+      "sha256-DApd791A+AxB28Ven/MVAyuyVphdo8KQDx8O7oxVPnc="
+    )
+    # these patches below are critical to enable wifi (RTL8723CS)
+    # - the alternative is a wholly forked kernel by megi/megous:
+    #   - https://xnux.eu/howtos/build-pinephone-kernel.html#toc-how-to-build-megi-s-pinehpone-kernel
+    # - i don't know if these patches are based on megi's or original
+    (manjaroPatch
+      "2001-Bluetooth-Add-new-quirk-for-broken-local-ext-features.patch"
+      "sha256-CExhJuUWivegxPdnzKINEsKrMFx/m/1kOZFmlZ2SEOc="
+    )
+    (manjaroPatch
+      "2002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch"
+      "sha256-dDdvOphTcP/Aog93HyH+L9m55laTgtjndPSE4/rnzUA="
+    )
+    (manjaroPatch
+      "2004-arm64-dts-allwinner-enable-bluetooth-pinetab-pinepho.patch"
+      "sha256-o43P3WzXyHK1PF+Kdter4asuyGAEKO6wf5ixcco2kCQ="
+    )
+    # XXX: this one has a Makefile, which hardcodes /sbin/depmod:
+    # - drivers/staging/rtl8723cs/Makefile
+    # - not sure if this is problematic?
+    (manjaroPatch
+      "2005-staging-add-rtl8723cs-driver.patch"
+      "sha256-6ywm3dQQ5JYl60CLKarxlSUukwi4QzqctCj3tVgzFbo="
+    )
+  ];
+
+  # pinephone uses the linux dtb at arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+  # - this includes sun50i-a64.dtsi
+  # - and sun50i-a64-cpu-opp.dtsi
+  # - no need to touch the allwinner-h6 stuff: that's the SBC pine product
+  # - i think it's safe to ignore sun9i stuff, but i don't know what it is
+  kernelConfig = with lib.kernel; {
+    # NB: nix adds the CONFIG_ prefix to each of these.
+    # if you add the prefix yourself nix will IGNORE YOUR CONFIG.
+    RTL8723CS = module;
+    BT_HCIUART_3WIRE = yes;
+    BT_HCIUART_RTL = yes;
+    RTL8XXXU_UNTESTED = yes;
+    BT_BNEP_MC_FILTER = yes;
+    BT_BNEP_PROTO_FILTER = yes;
+    BT_HS = yes;
+    BT_LE = yes;
+    # relevant configs inherited from nixos defaults (or above additions):
+    # CONFIG_BT=m
+    # CONFIG_BT_BREDR=y
+    # CONFIG_BT_RFCOMM=m
+    # CONFIG_BT_RFCOMM_TTY=y
+    # CONFIG_BT_BNEP=m
+    # CONFIG_BT_HIDP=m
+    # CONFIG_BT_RTL=m
+    # CONFIG_BT_HCIBTUSB=m
+    # CONFIG_BT_HCIBTUSB_BCM=y
+    # CONFIG_BT_HCIBTUSB_RTL=y
+    # CONFIG_BT_HCIUART=m
+    # CONFIG_BT_HCIUART_SERDEV=y
+    # CONFIG_BT_HCIUART_H4=y
+    # CONFIG_BT_HCIUART_LL=y
+    # CONFIG_RTL_CARDS=m
+    # CONFIG_RTLWIFI=m
+    # CONFIG_RTLWIFI_PCI=m
+    # CONFIG_RTLWIFI_USB=m
+    # CONFIG_RTLWIFI_DEBUG=y
+    # CONFIG_RTL8723_COMMON=m
+    # CONFIG_RTLBTCOEXIST=m
+    # CONFIG_RTL8XXXU=m
+    # CONFIG_RTLLIB=m
+    # consider adding (from mobile-nixos):
+    # maybe: CONFIG_BT_HCIUART_3WIRE=y
+    # maybe: CONFIG_BT_HCIUART_RTL=y
+    # maybe: CONFIG_RTL8XXXU_UNTESTED=y
+    # consider adding (from manjaro):
+    # CONFIG_BT_6LOWPAN=m  (not listed as option in nixos kernel)
+    # these are referenced in the rtl8723 source, but not known to config (and not in mobile-nixos config
+    # maybe: CONFIG_RTL_ODM_WLAN_DRIVER
+    # maybe: CONFIG_RTL_TRIBAND_SUPPORT
+    # maybe: CONFIG_SDIO_HCI
+    # maybe: CONFIG_USB_HCI
+  };
+
+  # create a kernelPatch which overrides nixos' defconfig with extra options
+  patchDefconfig = config: {
+    # defconfig options. this method comes from here:
+    # - https://discourse.nixos.org/t/the-correct-way-to-override-the-latest-kernel-config/533/9
+    name = "sane-moby-defconfig";
+    patch = null;
+    extraStructuredConfig = config;
+  };
+in
+{
+  # use Megi's kernel:
+  # even with the Manjaro patches, stock 5.18 has a few issues on Pinephone:
+  # - no battery charging
+  # - phone rotation sensor is off by 90 degrees
+  # - ambient light sensor causes screen brightness to be shakey
+  # - phosh greeter may not appear after wake from sleep
+  boot.kernelPackages = pkgs.cross.linuxPackagesFor pkgs.cross.linux-megous;
+
+  boot.kernelPatches = [
+    (patchDefconfig (kernelConfig //
+      (with lib.kernel; {
+        # disabling the sun5i_eink driver avoids this compilation error:
+        # CC [M]  drivers/video/fbdev/sun5i-eink-neon.o
+        # aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfloat-abi=softfp'
+        # aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfpu=neon'
+        # make[3]: *** [../scripts/Makefile.build:289: drivers/video/fbdev/sun5i-eink-neon.o] Error 1
+        FB_SUN5I_EINK = no;
+      })
+    ))
+  ];
+
+  # alternatively, use nixos' kernel and add the stuff we want:
+  # # cross-compilation optimization:
+  # boot.kernelPackages =
+  #   let p = (import nixpkgs { localSystem = "x86_64-linux"; });
+  #   in p.pkgsCross.aarch64-multiplatform.linuxPackages_5_18;
+  # # non-cross:
+  # # boot.kernelPackages = pkgs.linuxPackages_5_18;
+
+  # boot.kernelPatches = manjaroPatches ++ [
+  #   (patchDefconfig kernelConfig)
+  # ];
+}
--- a/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/HiFi.conf
+++ b/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/HiFi.conf
--- a/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/PinePhone.conf
+++ b/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/PinePhone.conf
--- a/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/VoiceCall.conf
+++ b/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/VoiceCall.conf
--- a/pkgs/additional/alsa-ucm-conf-sane/ucm2/ucm.conf
+++ b/pkgs/additional/alsa-ucm-conf-sane/ucm2/ucm.conf
--- a/hosts/modules/default.nix
+++ b/hosts/modules/default.nix
@@ -1,16 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./derived-secrets.nix
-    ./gui
-    ./hardware
-    ./hostnames.nix
-    ./hosts.nix
-    ./nixcache.nix
-    ./roles
-    ./services
-    ./wg-home.nix
-    ./yggdrasil.nix
-  ];
-}
--- a/hosts/modules/derived-secrets.nix
+++ b/hosts/modules/derived-secrets.nix
@@ -1,47 +0,0 @@
-{ config, lib, ... }:
-
-let
-  inherit (builtins) toString;
-  inherit (lib) mapAttrs mkOption types;
-  cfg = config.sane.derived-secrets;
-  secret = types.submodule {
-    options = {
-      len = mkOption {
-        type = types.int;
-      };
-      encoding = mkOption {
-        type = types.enum [ "base64" ];
-      };
-    };
-  };
-in
-{
-  options = {
-    sane.derived-secrets = mkOption {
-      type = types.attrsOf secret;
-      default = {};
-      description = ''
-        fs path => secret options.
-        for each entry, we create an item at the given path whose value is deterministic,
-        but also pseudo-random and not predictable by anyone without root access to the machine.
-        as PRNG source we use the host ssh key, and derived secrets are salted based on the destination path.
-      '';
-    };
-  };
-
-  config = {
-    sane.fs = mapAttrs (path: c: {
-      generated.script.script = ''
-        echo "$1" | cat /dev/stdin /etc/ssh/host_keys/ssh_host_ed25519_key \
-          | sha512sum \
-          | cut -c 1-${toString (c.len * 2)} \
-          | tr a-z A-Z \
-          | basenc -d --base16 \
-          | basenc --${c.encoding} \
-          > "$1"
-      '';
-      generated.script.scriptArgs = [ path ];
-      generated.acl.mode = "0600";
-    }) cfg;
-  };
-}
--- a/hosts/modules/gui/default.nix
+++ b/hosts/modules/gui/default.nix
@@ -1,17 +0,0 @@
-{ lib, config, ... }:
-
-let
-  inherit (lib) mkDefault mkIf mkOption types;
-  cfg = config.sane.gui;
-in
-{
-  imports = [
-    ./gnome.nix
-    ./gtk.nix
-    ./phosh.nix
-    ./plasma.nix
-    ./plasma-mobile.nix
-    ./sway
-    ./sxmo.nix
-  ];
-}
--- a/Show More
+++ b/Show More