docs(editor): document nvim-cmp completion menu keybindings

Add a completion-menu table to KEYBINDINGS.md covering the new cmp
mappings (Tab/S-Tab and C-n/C-p to move, C-Space to open, Enter to
confirm, C-e to dismiss), and reword the Neovim summary accordingly.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.editorconfig

@@ -8,6 +8,12 @@ indent_size = 2
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.{nix,yaml,yml,json,md,sh,toml}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+
 # Markdown uses trailing whitespace for hard line breaks.
 [*.md]
 trim_trailing_whitespace = false

.gitignore

@@ -1,7 +1,4 @@
-modules/firmware/*
+system/modules/firmware/*
 
 # vim swap files
 *.swp
-
-# Local scratch project, not part of this flake.
-tf-inspect/

CLAUDE.md

@@ -1,63 +0,0 @@
-# Working on this flake
-
-Project notes for changes to this repository. Persona and memory rules live in
-the user-global config; this file is about the flake's checks and conventions.
-
-## Before you commit: run the formatter
-
-Formatting and linting are driven by the flake. CI (`.gitea/workflows/ci.yaml`)
-runs `nix flake check`, which fails the build if any file is unformatted or trips
-a lint. From the repo root:
-
-- `nix fmt` — format the whole tree (writes changes).
-- `nix flake check` — run every check read-only (what CI runs).
-- `nix develop` — dev shell; its `shellHook` installs the git pre-commit hooks so
-  the same gates run on `git commit`.
-
-Never commit with `--no-verify`. A bypassed commit ships unformatted content and
-turns CI red on the next push to `main` (see "Docs are checked too").
-
-## What gets checked
-
-Defined in `flake.nix` (the `treefmt`, `pre-commit`, and `checks` blocks) and
-`statix.toml`:
-
-| Check        | Tool                              | Covers                                                  |
-| ------------ | --------------------------------- | ------------------------------------------------------- |
-| `formatting` | treefmt → `nixfmt`                | all `*.nix`                                             |
-| `formatting` | treefmt → `shfmt`                 | shell scripts                                           |
-| `formatting` | treefmt → `prettier`              | **Markdown, YAML, JSON** (incl. `README.md`, this file) |
-| `deadnix`    | deadnix                           | dead Nix bindings (`--no-lambda-pattern-names`)         |
-| `statix`     | statix                            | Nix antipatterns (config in `statix.toml`)              |
-| pre-commit   | nixfmt-rfc-style, deadnix, statix | the same gates, run on commit                           |
-
-Excluded from formatting: `*/hardware-configuration.nix` (generated by
-`nixos-generate-config`) and `flake.lock`. Editor defaults (indent, EOL, final
-newline) are in `.editorconfig`; note Markdown keeps trailing whitespace, which
-encodes hard line breaks.
-
-## Docs are checked too — the common trap
-
-prettier formats `*.md`, so **documentation edits must be run through `nix fmt`**
-exactly like code. prettier re-aligns Markdown tables in particular; hand-editing
-a table almost always leaves it non-conformant and fails the `formatting` check.
-
-Beware a false green: the CI `detect` step skips the heavy checks on a pull
-request that touches **no** `.nix`, `flake.lock`, or the workflow file — so a
-docs-only PR reports success without ever running prettier. The failure then
-surfaces on the push-to-`main` run (which always runs the full check) or on the
-next unrelated PR that does touch Nix. Run `nix flake check` locally before
-merging a docs change, regardless of what the PR check shows.
-
-## Host evaluation
-
-CI also evaluates every `nixosConfigurations` / `darwinConfigurations` host's
-toplevel (eval only, no build) on an x86_64 runner, so eval errors fail cheaply.
-Reproduce locally:
-
-```sh
-nix eval --raw ".#nixosConfigurations.<host>.config.system.build.toplevel.drvPath"
-```
-
-Host lists are discovered from the flake, so adding or removing a host needs no
-change to the workflow.

README.md

@@ -7,111 +7,21 @@ single flake.
 
 Defined in the host table in [`flake.nix`](./flake.nix):
 
-| Configuration         | System           | Machine                                                                                                     |
+| Configuration         | System           | Machine                                                                                                              |
-| --------------------- | ---------------- | ----------------------------------------------------------------------------------------------------------- |
+| --------------------- | ---------------- | -------------------------------------------------------------------------------------------------------------------- |
-| `lyrathorpe-mbp`      | `aarch64-linux`  | MacBook Pro (Apple Silicon, Asahi)                                                                          |
+| `lyrathorpe-mbp`      | `aarch64-linux`  | MacBook Pro (Apple Silicon, Asahi)                                                                                   |
-| `lyrathorpe-t400`     | `x86_64-linux`   | ThinkPad T400 — [install notes](./hosts/T400/README.md)                                                     |
+| `lyrathorpe-t400`     | `x86_64-linux`   | ThinkPad T400 — [install notes](./system/machine/T400/README.md)                                                     |
-| `lyrathorpe-macpro31` | `x86_64-linux`   | Mac Pro 3,1, desktop — [install notes](./hosts/MacPro31/README.md)                                          |
+| `lyrathorpe-macpro31` | `x86_64-linux`   | Mac Pro 3,1, desktop — [install notes](./system/machine/MacPro31/README.md)                                          |
-| `emmathorpe-edaas`    | `x86_64-linux`   | Work WSL box (NixOS-WSL) — [notes](./hosts/EDaaS/README.md)                                                 |
+| `emmathorpe-edaas`    | `x86_64-linux`   | Work WSL box (NixOS-WSL)                                                                                             |
-| `lyrathorpe-rpi5`     | `aarch64-linux`  | Raspberry Pi 5 headless server: Docker host + nginx reverse proxy — [install notes](./hosts/RPi5/README.md) |
+| `lyrathorpe-rpi5`     | `aarch64-linux`  | Raspberry Pi 5 headless server: Docker host + nginx reverse proxy — [install notes](./system/machine/RPi5/README.md) |
-| `lyrathorpe-mac`      | `aarch64-darwin` | macOS (nix-darwin) — [notes](./hosts/Darwin/README.md)                                                      |
+| `lyrathorpe-mac`      | `aarch64-darwin` | macOS (nix-darwin)                                                                                                   |
 
-Shared layers: `home` (home-manager: shell, git, editor),
+Shared layers: `lyrathorpe/home` (home-manager: shell, git, editor),
-`modules/common-nixos.nix` (all NixOS hosts: fonts, nix-ld, caches),
+`system/modules/common-nixos.nix` (all NixOS hosts: fonts, nix-ld, caches),
-`modules/workstation.nix` (physical graphical hosts: audio, thermald,
+`system/modules/workstation.nix` (physical graphical hosts: audio, thermald,
-earlyoom, fwupd), `modules/laptop.nix` (laptops: Wi-Fi, Bluetooth, power,
+earlyoom, fwupd), `system/modules/laptop.nix` (laptops: Wi-Fi, Bluetooth, power,
-lid), `modules/desktop.nix` (wired desktops: NetworkManager), and
+lid), and `system/modules/ssh.nix` (key-only sshd). The x86 hosts also pull
-`modules/ssh.nix` (key-only sshd). The x86 hosts also pull `nixos-hardware`
+`nixos-hardware` profiles.
-profiles. The full module catalogue is below.
-
-## Repository layout
-
-```
-flake.nix              # inputs, mkHost/mkDarwinHost, the host tables, dev shell + checks
-flake.lock             # pinned input revisions (Renovate keeps this fresh)
-modules/               # reusable NixOS system modules (see "Module catalogue")
-home/                  # home-manager profile: shell, git, editor, claude, desktop, sway
-users/                 # identity registry + per-user home extras (see "Users")
-hosts/<Name>/          # per-machine config: configuration.nix + hardware-configuration.nix
-lib/                   # small pure helpers (currently the Catppuccin Mocha palette)
-.gitea/workflows/      # CI (nix flake check + per-host eval)
-statix.toml            # lint config (house-style lints disabled)
-.editorconfig          # base whitespace style
-tf-inspect/            # UNRELATED scratch project (gitignored, its own git repo);
-                       #   RouterOS / home-services Terraform, not part of this flake
-```
-
-Each `nixosConfiguration` / `darwinConfiguration` is assembled in `flake.nix`
-from three layers: the shared `baseModules` (or `darwinBaseModules`), the
-per-form-factor and `nixos-hardware` modules listed in the host table, and the
-per-machine `hosts/<Name>/configuration.nix`. Home-manager is wired in as a
-system module; each user's home is composed from the `homeModules` list in that
-host's table entry.
-
-## Module catalogue
-
-Reusable NixOS modules under [`modules/`](./modules). "Imported by" says how a
-module reaches a host: **baseModules** (every NixOS host, via `flake.nix`),
-**host table** (listed explicitly per host in `flake.nix`), or **transitively**
-(pulled in by another module's `imports`).
-
-| Module               | Imported by                             | What it does / when to use it                                                                                                                                                                    |
-| -------------------- | --------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `common-nixos.nix`   | baseModules (all NixOS)                 | Timezone/locale, store hygiene (auto-optimise, big download buffer, **no** auto-GC), the nix-community binary cache, `nix-ld`, base CLI (`git`, `fastfetch`), and the fleet-wide font stack.     |
-| `users.nix`          | baseModules (all NixOS)                 | Builds `users.users` from the registry for the host's `hostUsers`; enables zsh; enables Firefox + Thunderbird **only** when `features.swayDesktop.enable` is on. Applies per-user `linger`.       |
-| `features.nix`       | baseModules (all NixOS)                 | Declares feature-flag options (currently `features.swayDesktop.enable`) so any host can read/set them without importing the heavy implementation module.                                          |
-| `workstation.nix`    | transitively (via laptop/desktop)       | Form-factor-agnostic base for physical graphical hosts: turns on `swayDesktop`, Dvorak console, PipeWire, firewall (default-deny), fstrim, earlyoom, fwupd, thermald (x86), redistributable fw.  |
-| `laptop.nix`         | host table (MBP, T400)                  | `imports` workstation.nix, then adds the portable bits: iwd Wi-Fi, lid suspend/lock, Bluetooth + blueman.                                                                                        |
-| `desktop.nix`        | host table (Mac Pro)                    | `imports` workstation.nix, then swaps Wi-Fi for wired NetworkManager. Pair with `portable = false` in the host table.                                                                            |
-| `sway.nix`           | host table (graphical hosts)            | Implementation of `features.swayDesktop`: the system Sway package, the greetd/ReGreet (cage) greeter forced to Dvorak, xdg-portal, Wayland utility packages. Home-side Sway config is in `home/sway.nix`. |
-| `ssh.nix`            | host table (T400, Mac Pro, RPi5)        | Enables sshd, opens port 22, enforces a key-only policy (no password / keyboard-interactive, no root). Authorized keys come from the registry via `users.nix`.                                    |
-| `firmware/`          | referenced by MBP host config           | Committed Apple peripheral firmware blobs for the Asahi MBP (see "MacBook (Asahi) firmware").                                                                                                     |
-
-Form-factor decision: a **laptop** imports `laptop.nix` (default
-`portable = true`); a **wired desktop** imports `desktop.nix` and sets
-`portable = false`; a **headless server** imports neither (leaves
-`features.swayDesktop.enable` at its default `false`) and adds only what it
-serves. `portable` is threaded through to `home/sway.nix`, which drops the
-battery block and brightness keys on desktops.
-
-## Users
-
-Identity is data, kept separate from the reusable modules:
-
-- [`users/registry.nix`](./users/registry.nix) — one entry per user (display
-  name, email, supplementary groups, authorized + signing keys). This is the
-  single source of identity; no user data is hardcoded in the modules.
-- Each host's table entry declares a `users` set keyed by username; every entry
-  lists that user's home-module composition (the shared `./home` bundle plus any
-  per-user modules, e.g. [`users/emmathorpe/work.nix`](./users/emmathorpe/work.nix))
-  and optional per-host-user system bits such as `linger`.
-- `mkHost` builds each account from the registry and injects the matching
-  identity into that user's home config as the `identity` module arg. A host can
-  therefore declare any number of users.
-
-Per-user home extras live under `users/<name>/`:
-
-- [`users/lyrathorpe/home.nix`](./users/lyrathorpe/home.nix) — personal extras
-  (an ssh host shortcut, gammastep coordinates); imported on Lyra's hosts.
-- [`users/emmathorpe/work.nix`](./users/emmathorpe/work.nix) — the work
-  toolchain (kubectl/helm/az/etc.), work-only LSP servers, and the corporate ssh
-  handling; imports
-  [`users/emmathorpe/renovate-review.nix`](./users/emmathorpe/renovate-review.nix),
-  the daily headless Renovate-PR review timer (EDaaS only).
-
-### Portable home (off-NixOS / external consumers)
-
-The home config is also exposed for use beyond these hosts:
-
-- `homeConfigurations."<user>@<system>"` — a standalone home-manager profile
-  (the portable subset: shell + git + editor + claude) that can be activated on a
-  machine this flake does **not** manage:
-  `home-manager switch --flake .#"lyrathorpe@x86_64-linux"`. The desktop/sway
-  modules are intentionally excluded (they rely on a NixOS-provided Sway/Firefox
-  binary).
-- `homeModules` — the reusable modules exported so another flake can import them
-  (`inputs.<this>.homeModules.default`). Consumers must supply the module args
-  these expect: `inputs` always, `identity` for git/desktop, `portable` for sway.
 
 ## Applying
 
@@ -122,58 +32,28 @@ sudo nixos-rebuild switch --flake .#<configuration>
 darwin-rebuild switch --flake .#lyrathorpe-mac
 ```
 
-On a host whose `networking.hostName` matches its flake attribute (the WSL box
-and the Pi are set up this way), `nh os switch` resolves the configuration from
-the hostname with no `--flake`/`-H` flag.
-
-## Adding a new host
-
-1. **Create `hosts/<Name>/`.** Add `configuration.nix` with the host-specific
-   bits only: `networking.hostName`, bootloader (firmware-specific — it is
-   deliberately not set in the shared modules), and any per-machine hardware
-   quirks. Keep anything reusable in `modules/` instead.
-2. **Hardware config.** Generate `hardware-configuration.nix` on the real
-   machine with `nixos-generate-config` and commit it. If the machine does not
-   exist yet, commit a clearly-labelled placeholder so the host still evaluates
-   in CI (see the existing T400 / RPi5 placeholders), and replace it at install.
-   These files are excluded from the formatter and linters.
-3. **Add a host-table entry in `flake.nix`.** Under `hosts` (NixOS) or
-   `darwinHosts` (macOS), set `system`, the `modules` list (host config + form
-   factor + any `nixos-hardware` profiles), and the `users` map (each user's
-   `homeModules`). Choose the form factor per the decision note above; a headless
-   host imports neither `laptop.nix` nor `desktop.nix`.
-4. **Users.** If the host introduces a new person, add them to
-   `users/registry.nix` first; otherwise reference an existing username.
-5. **Verify.** `nix flake check` formats, lints, and evaluates every host —
-   including the new one — so a broken entry fails locally before CI. Then
-   `sudo nixos-rebuild switch --flake .#<configuration>` on the machine.
-
-No change to CI is needed: the host-eval step discovers hosts from the flake
-(`attrNames` of the configuration sets), so a new entry is picked up
-automatically.
-
 ## Shell environment & keybindings
 
 - Interactive shell features (zsh, tmux, git, ssh, CLI tools, auto-tmux):
-  [`home/README.md`](./home/README.md).
+  [`lyrathorpe/home/README.md`](./lyrathorpe/home/README.md).
 - All Sway / tmux / foot / zsh keyboard shortcuts:
-  [`home/KEYBINDINGS.md`](./home/KEYBINDINGS.md).
+  [`lyrathorpe/home/KEYBINDINGS.md`](./lyrathorpe/home/KEYBINDINGS.md).
 
 ## Login / greeter
 
 Graphical (Sway) hosts log in through a Wayland greeter — `greetd` running
 ReGreet inside the `cage` kiosk compositor — implemented in
-[`modules/sway.nix`](./modules/sway.nix), gated on
+[`lyrathorpe/swaywm.nix`](./lyrathorpe/swaywm.nix), gated on
 `features.swayDesktop.enable` (the option is declared in
-[`modules/features.nix`](./modules/features.nix), so headless hosts
+[`system/modules/features.nix`](./system/modules/features.nix), so headless hosts
-can leave it off without importing `modules/sway.nix`). The greeter is forced to Dvorak
+can leave it off without importing `swaywm.nix`). The greeter is forced to Dvorak
 to match the console and Sway session. Headless hosts (the WSL work box and the
 Raspberry Pi server) keep plain TTY login. The target account needs a password
 (`passwd <user>`) before it can log in.
 
 ## MacBook (Asahi) firmware
 
-The MBP host references `modules/firmware/` for Apple peripheral
+The MBP host references `system/modules/firmware/` for Apple peripheral
 firmware (Wi-Fi/Bluetooth). These blobs are **committed** (tracked) even though
 `.gitignore` lists the directory: the flake is `git+file`, so it only sees
 tracked files — untracking them breaks `lyrathorpe-mbp` evaluation (and the CI
@@ -183,7 +63,7 @@ redistributable; the repo is private.
 To refresh them, copy the firmware extracted during the Asahi install (from
 `/etc/nixos/firmware`, or re-extract per the
 [Asahi NixOS docs](https://github.com/tpwrules/nixos-apple-silicon)) into
-`modules/firmware/` and commit with `git add -f`.
+`system/modules/firmware/` and commit with `git add -f`.
 
 ## Development
 
@@ -202,7 +82,4 @@ A dev shell and a formatting/lint gate are wired through the flake:
 
 [`.gitea/workflows/ci.yaml`](./.gitea/workflows/ci.yaml) runs `nix flake check`
 (formatting, `deadnix`, `statix`, the pre-commit hooks) and evaluates every
-NixOS and Darwin host configuration on push/PR. It always runs (no `paths:`
+NixOS and Darwin host configuration on push/PR.
-filter) so the required check never hangs pending; the heavy Nix steps are
-skipped when a PR touches no `.nix`/lockfile/workflow file, and the job still
-reports green.

flake.lock

@@ -191,22 +191,6 @@
         "type": "github"
       }
     },
-    "kube-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1779714285,
-        "narHash": "sha256-l1wjg2ReWKCI7h/K11vvX2ykYTs/mVD+tfz/mQsjn/E=",
-        "owner": "jonmosco",
-        "repo": "kube-tmux",
-        "rev": "8b7e1d127c16b6dc87ff5743f4d775b245198b69",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jonmosco",
-        "repo": "kube-tmux",
-        "type": "github"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -389,7 +373,6 @@
         "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager",
-        "kube-tmux": "kube-tmux",
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
         "nix-index-database": "nix-index-database",

flake.nix

@@ -23,7 +23,7 @@
     # Provides mkFlake: the systems/perSystem scaffolding used below.
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
-    # Declarative Firefox add-ons (e.g. the Catppuccin theme); see modules/users.nix.
+    # Declarative Firefox add-ons (e.g. the Catppuccin theme); see lyrathorpe/user.nix.
     firefox-addons = {
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -46,7 +46,7 @@
       url = "github:cachix/git-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # Declarative Neovim (the editor; see home/editor.nix). Release
+    # Declarative Neovim (the editor; see lyrathorpe/home/editor.nix). Release
     # branch matched to the pinned nixpkgs (26.05); follows our nixpkgs to keep a
     # single nixpkgs in the closure. editor.nix sets programs.nixvim.nixpkgs.source
     # to this same input so the home module doesn't warn about the pin.
@@ -60,13 +60,6 @@
       url = "github:NixOS/nixos-hardware";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # kube-tmux: kube context/namespace for the tmux status line on the work
-    # host. Not in nixpkgs and not a flake -- pinned here as a plain source so
-    # the script is always in the store (no manual checkout). See work.nix.
-    kube-tmux = {
-      url = "github:jonmosco/kube-tmux";
-      flake = false;
-    };
   };
 
   outputs =
@@ -100,11 +93,10 @@
         # Unfree packages permitted to be built (replaces blanket allowUnfree).
         unfreePackages = [
           "claude-code"
+          "lens"
+          "lens-desktop"
         ];
 
-        # Per-user identity, keyed by username. See README "Users".
-        userRegistry = import ./users/registry.nix;
-
         # nixpkgs + nix-daemon settings shared by NixOS and Darwin hosts.
         commonModule = {
           nixpkgs.overlays = overlays;
@@ -120,9 +112,9 @@
 
         # Shared scaffolding for every NixOS host: common user, settings, home-manager.
         baseModules = [
-          ./modules/users.nix
+          ./lyrathorpe/user.nix
-          ./modules/common-nixos.nix
+          ./system/modules/common-nixos.nix
-          ./modules/features.nix
+          ./system/modules/features.nix
           commonModule
           home-manager.nixosModules.home-manager
           {
@@ -134,13 +126,18 @@
           }
         ];
 
-        # Build one NixOS host. `users` is an attrset keyed by username (home
+        # mkHost :: { system, username, fullName, modules, homeModules } -> nixosSystem
-        # modules + optional per-user system bits). See README "Users".
+        # Builds one machine by appending its host-specific modules to the shared
+        # baseModules. The user identity (username/fullName) is threaded through
+        # specialArgs so user.nix and the home modules stay host-agnostic, and the
+        # home-manager profile is keyed by the host's username.
         mkHost =
           {
             system,
+            username,
+            fullName,
             modules,
-            users,
+            homeModules,
             # Host form factor. Laptops inherit the default; a desktop host sets
             # `portable = false` to drop mobile components (battery block,
             # brightness keys) from the home-manager Sway config.
@@ -151,7 +148,8 @@
             specialArgs = {
               inherit
                 inputs
-                userRegistry
+                username
+                fullName
                 portable
                 ;
             };
@@ -159,15 +157,16 @@
               baseModules
               ++ modules
               ++ [
-                { _module.args.hostUsers = users; }
                 {
-                  home-manager.extraSpecialArgs = { inherit inputs portable; };
+                  home-manager.extraSpecialArgs = {
-                  home-manager.users = lib.mapAttrs (name: spec: {
+                    inherit
-                    imports = spec.homeModules;
+                      inputs
-                    _module.args.identity = userRegistry.${name} // {
+                      username
-                      username = name;
+                      fullName
-                    };
+                      portable
-                  }) users;
+                      ;
+                  };
+                  home-manager.users.${username}.imports = homeModules;
                 }
               ];
           };
@@ -186,17 +185,19 @@
           }
         ];
 
-        # Darwin counterpart of mkHost: single-user (macOS owns the account),
+        # mkDarwinHost :: { system, username, fullName, modules, homeModules } -> darwinSystem
-        # identity still from the registry. See README "Users".
+        # Darwin counterpart of mkHost. macOS already owns the login user, so we
+        # only attach the platform and home-manager; no NixOS user module here.
         mkDarwinHost =
           {
             system,
             username,
+            fullName,
             modules,
             homeModules,
           }:
           nix-darwin.lib.darwinSystem {
-            specialArgs = { inherit inputs username; };
+            specialArgs = { inherit inputs username fullName; };
             modules =
               darwinBaseModules
               ++ modules
@@ -205,41 +206,40 @@
                   nixpkgs.hostPlatform = system;
                   # macOS owns the account; point home-manager at its home dir.
                   users.users.${username}.home = "/Users/${username}";
-                  home-manager.extraSpecialArgs = { inherit inputs; };
+                  home-manager.extraSpecialArgs = { inherit inputs username fullName; };
-                  home-manager.users.${username} = {
+                  home-manager.users.${username}.imports = homeModules;
-                    imports = homeModules;
-                    _module.args.identity = userRegistry.${username} // {
-                      inherit username;
-                    };
-                  };
                 }
               ];
           };
 
-        # Host table — one entry per machine, realised into a nixosConfiguration
+        # Host table — declarative registry of every machine. To add a host:
-        # of the same name below. See README "Hosts" / "Users".
+        # give it a name, its `system`, the owning user, and the module lists.
+        # mapAttrs below turns each entry into a nixosConfiguration of the same name.
         hosts = {
           lyrathorpe-mbp = {
             system = "aarch64-linux";
+            username = "lyrathorpe";
+            fullName = "Lyra Thorpe";
             modules = [
-              ./hosts/MBP-Asahi/configuration.nix
+              ./system/machine/MBP-Asahi/configuration.nix
-              ./modules/laptop.nix
+              ./system/modules/laptop.nix
               nixos-apple-silicon.nixosModules.default
-              ./modules/sway.nix
+              ./lyrathorpe/swaywm.nix
             ];
-            users.lyrathorpe.homeModules = [
+            homeModules = [
-              ./home
+              ./lyrathorpe/home
-              ./users/lyrathorpe/home.nix
+              ./lyrathorpe/home/desktop.nix
-              ./home/desktop.nix
             ];
           };
 
           lyrathorpe-t400 = {
             system = "x86_64-linux";
+            username = "lyrathorpe";
+            fullName = "Lyra Thorpe";
             modules = [
-              ./hosts/T400/configuration.nix
+              ./system/machine/T400/configuration.nix
-              ./modules/laptop.nix
+              ./system/modules/laptop.nix
-              ./modules/ssh.nix
+              ./system/modules/ssh.nix
               # No t400-specific profile exists; compose the generic ThinkPad +
               # laptop/SSD/Intel building blocks (tp_smapi/acpi_call for battery
               # thresholds, SSD + microcode defaults).
@@ -247,82 +247,78 @@
               inputs.nixos-hardware.nixosModules.common-pc-laptop
               inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
               inputs.nixos-hardware.nixosModules.common-cpu-intel
-              ./modules/sway.nix
+              ./lyrathorpe/swaywm.nix
             ];
-            users.lyrathorpe.homeModules = [
+            homeModules = [
-              ./home
+              ./lyrathorpe/home
-              ./users/lyrathorpe/home.nix
+              ./lyrathorpe/home/desktop.nix
-              ./home/desktop.nix
             ];
           };
 
           lyrathorpe-macpro31 = {
             system = "x86_64-linux";
+            username = "lyrathorpe";
+            fullName = "Lyra Thorpe";
             portable = false;
             modules = [
-              ./hosts/MacPro31/configuration.nix
+              ./system/machine/MacPro31/configuration.nix
-              ./modules/desktop.nix
+              ./system/modules/desktop.nix
-              ./modules/ssh.nix
+              ./system/modules/ssh.nix
               inputs.nixos-hardware.nixosModules.common-pc-ssd
               inputs.nixos-hardware.nixosModules.common-cpu-intel
-              ./modules/sway.nix
+              ./lyrathorpe/swaywm.nix
             ];
-            users.lyrathorpe.homeModules = [
+            homeModules = [
-              ./home
+              ./lyrathorpe/home
-              ./users/lyrathorpe/home.nix
+              ./lyrathorpe/home/desktop.nix
-              ./home/desktop.nix
             ];
           };
 
           emmathorpe-edaas = {
             system = "x86_64-linux";
+            username = "emmathorpe";
+            fullName = "Emma Thorpe";
             modules = [
-              ./hosts/EDaaS/configuration.nix
+              ./system/machine/EDaaS/configuration.nix
               nixos-wsl.nixosModules.default
-              ./modules/sway.nix
+              ./lyrathorpe/swaywm.nix
+            ];
+            homeModules = [
+              ./lyrathorpe/home
+              ./lyrathorpe/home/work.nix
             ];
-            users.emmathorpe = {
-              homeModules = [
-                ./home
-                ./users/emmathorpe/work.nix
-              ];
-              # Keep the systemd --user instance alive without a login session so
-              # the renovate-review home timer fires on schedule.
-              linger = true;
-            };
           };
 
           lyrathorpe-rpi5 = {
             system = "aarch64-linux";
+            username = "lyrathorpe";
+            fullName = "Lyra Thorpe";
             portable = false;
-            # Headless server: Docker host + nginx reverse proxy. No sway.nix
+            # Headless server: Docker host + nginx reverse proxy. No swaywm.nix
             # (no desktop); the raspberry-pi-5 profile supplies kernel/firmware,
             # ssh.nix adds key-only sshd.
             modules = [
-              ./hosts/RPi5/configuration.nix
+              ./system/machine/RPi5/configuration.nix
               inputs.nixos-hardware.nixosModules.raspberry-pi-5
-              ./modules/ssh.nix
+              ./system/modules/ssh.nix
-            ];
-            users.lyrathorpe.homeModules = [
-              ./home
-              ./users/lyrathorpe/home.nix
             ];
+            homeModules = [ ./lyrathorpe/home ];
           };
         };
 
         # Darwin host table — macOS machines built via mkDarwinHost. The shared
-        # ./home bundle (shell, git, editor) is reused directly; the Linux-only
+        # ./lyrathorpe/home modules (shell, git, editor) are reused; the Linux-only
         # desktop/sway modules are intentionally left out.
         darwinHosts = {
           lyrathorpe-mac = {
             system = "aarch64-darwin";
             username = "lyrathorpe";
+            fullName = "Lyra Thorpe";
             modules = [
-              ./hosts/Darwin/configuration.nix
+              ./system/machine/Darwin/configuration.nix
             ];
             homeModules = [
-              ./home
+              ./lyrathorpe/home
-              ./users/lyrathorpe/home.nix
             ];
           };
         };
@@ -413,59 +409,6 @@
         # Realise the host tables: each entry becomes a {nixos,darwin}Configuration.
         flake.nixosConfigurations = lib.mapAttrs (_name: mkHost) hosts;
         flake.darwinConfigurations = lib.mapAttrs (_name: mkDarwinHost) darwinHosts;
-
-        # Reusable home modules, exported for use off these hosts. See README
-        # "Portable home" for the consumer module-arg expectations.
-        flake.homeModules = {
-          default = ./home;
-          shell = ./home/shell.nix;
-          git = ./home/git.nix;
-          editor = ./home/editor.nix;
-          claude = ./home/claude.nix;
-          desktop = ./home/desktop.nix;
-          sway = ./home/sway.nix;
-        };
-
-        # Standalone home-manager configs (portable bundle) for machines not
-        # managed by this flake. See README "Portable home".
-        flake.homeConfigurations =
-          let
-            mkHome =
-              {
-                system,
-                name,
-              }:
-              home-manager.lib.homeManagerConfiguration {
-                pkgs = import nixpkgs {
-                  inherit system overlays;
-                  config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) unfreePackages;
-                };
-                extraSpecialArgs = {
-                  inherit inputs;
-                  portable = true;
-                  identity = userRegistry.${name} // {
-                    username = name;
-                  };
-                };
-                modules = [
-                  ./home
-                  {
-                    home.username = name;
-                    home.homeDirectory = "/home/${name}";
-                  }
-                ];
-              };
-          in
-          {
-            "lyrathorpe@x86_64-linux" = mkHome {
-              system = "x86_64-linux";
-              name = "lyrathorpe";
-            };
-            "lyrathorpe@aarch64-linux" = mkHome {
-              system = "aarch64-linux";
-              name = "lyrathorpe";
-            };
-          };
       }
     );
 }

home/claude/memory/nix_shell_tooling.md

@@ -1,23 +0,0 @@
----
-name: nix-shell-tooling
-description: "Any nixpkgs tool can be run ad hoc via nix run / nix shell — a missing command is never a dead end during development"
-metadata:
-  node_type: memory
-  type: feedback
-  originSessionId: dfb56b58-518b-4daf-b531-7119bb4a9534
----
-
-Any tool in nixpkgs can be run without installing it into the environment. If a
-command is missing during development, pull it from nixpkgs on the fly instead
-of working around its absence or reporting the tool as unavailable.
-
-**Why:** Lyra runs NixOS; the ambient PATH is deliberately minimal, but the full
-nixpkgs set is always one command away. "command not found" is not a blocker.
-
-**How to apply:**
-
-- One-off run: `nix run nixpkgs#<pkg> -- <args>` (e.g. `nix run nixpkgs#jq -- .`).
-- Tools on PATH for a session: `nix shell nixpkgs#<pkg> [nixpkgs#<pkg2> ...]`,
-  then run commands normally.
-- Legacy form also works: `nix-shell -p <pkg> --run '<cmd>'`.
-- Prefer this over hand-rolling a substitute for a tool that exists in nixpkgs.

hosts/Darwin/README.md

@@ -1,51 +0,0 @@
-# macOS (nix-darwin) — `lyrathorpe-mac`
-
-Flake host: `lyrathorpe-mac` (`aarch64-darwin`). Apple Silicon Mac managed by
-**nix-darwin** from this same flake. Built via `mkDarwinHost` (single-user —
-macOS owns the account; identity still comes from the registry). Files:
-`configuration.nix`.
-
-## What this host is
-
-A macOS workstation. The interactive user environment (shell, git, editor,
-Claude) is the **shared `../../home` bundle** — the same modules the Linux hosts
-use — so the terminal experience matches. The Linux-only `desktop.nix`/`sway.nix`
-are intentionally left out. This host config covers the macOS-specific layer:
-system packages, Homebrew, and macOS UI defaults.
-
-## Package sourcing
-
-- **nixpkgs** (`environment.systemPackages`) for CLI tooling and libraries.
-- **Homebrew**, owned declaratively by `nix-homebrew` (Rosetta enabled for
-  x86_64 formulae). The `brews`/`casks` lists are **authoritative**:
-  `onActivation.cleanup = "zap"` uninstalls anything not declared. GUI apps are
-  casks (nixpkgs darwin GUI support is unreliable); a few version-pinned
-  toolchains and the PWA host stay on brew for continuity.
-- **Mac App Store** apps are **not** declarative: nix-darwin 26.05 runs
-  activation as root, and `mas` cannot reach the App Store session from root.
-  Install them by hand with `mas install <id>` from a GUI Terminal (the `mas`
-  CLI is in `environment.systemPackages`).
-
-## macOS integration
-
-- `security.pam.services.sudo_local` — **Touch ID for sudo** (and
-  `darwin-rebuild`'s sudo prompt), kept in `sudo_local` so it survives OS
-  updates. `reattach` pulls in `pam_reattach` so Touch ID works inside tmux
-  (which the terminals auto-start).
-- `system.defaults` — declarative dock / finder / global / trackpad preferences,
-  applied on activation and reversible. This is the main reason to run nix-darwin
-  beyond package management.
-- The JetBrainsMono Nerd Font is installed to `/Library/Fonts`; set it in
-  iTerm2 (Settings → Profiles → Text → Font) so the tmux statusline glyphs
-  render.
-
-## stateVersion
-
-`system.stateVersion = 5` (the nix-darwin state version, an integer — not a
-NixOS release string). Read `darwin-rebuild changelog` before changing it.
-
-## Apply
-
-```sh
-darwin-rebuild switch --flake .#lyrathorpe-mac
-```

hosts/EDaaS/README.md

@@ -1,53 +0,0 @@
-# Work WSL box — `emmathorpe-edaas`
-
-Flake host: `emmathorpe-edaas` (`x86_64-linux`). NixOS running under
-**NixOS-WSL** on the corporate Windows machine. Headless: no Sway desktop
-(`features.swayDesktop.enable = false`), plain WSL shell login. Files:
-`configuration.nix`.
-
-## What this host is
-
-The day-to-day work environment. It layers the corporate Kubernetes / Helm /
-Terraform / cloud toolchain and a couple of work-only editor language servers on
-top of the shared home profile. The system config here is thin — it is mostly
-WSL plumbing; the user-facing tooling lives in
-[`../../users/emmathorpe/work.nix`](../../users/emmathorpe/work.nix).
-
-## WSL specifics
-
-- `wsl.enable`, default user `emmathorpe`, Windows PATH interop and start-menu
-  launchers on. `/etc/hosts` generation is off (`generateHosts = false`).
-- **Docker Desktop integration**, not the native daemon as the primary path:
-  `wsl.extraBin` shims the coreutils/`groupadd`/`usermod` binaries Docker
-  Desktop's `wsl-distro-proxy` expects, and `docker-desktop-proxy.script` is
-  patched to the real proxy path. The native `virtualisation.docker` is also
-  enabled (with `enableOnBoot` + `autoPrune`).
-- `programs.ssh.systemd-ssh-proxy.enable = false` — the NixOS-WSL store is a
-  read-only VHD owned by `nobody`, and OpenSSH rejects the generated
-  `ssh-proxy` Include as "Bad owner or permissions", which would break ssh/git
-  for every command. The vsock proxy it provides is unused under WSL.
-- `networking.hostName = "emmathorpe-edaas"` matches the flake attribute so
-  `nh os switch` resolves without `-H`.
-
-## Renovate review timer
-
-The host-table entry sets `users.emmathorpe.linger = true` so the user's
-`systemd --user` instance stays alive without an open login session. That keeps
-the daily headless **Renovate PR review** timer firing — defined in
-[`../../users/emmathorpe/renovate-review.nix`](../../users/emmathorpe/renovate-review.nix)
-(imported only from `work.nix`, so it exists on this machine alone). See that
-file's header for the auth (Vertex AI ADC), triage policy, and caveats.
-
-## stateVersion
-
-`system.stateVersion = "24.11"` — the release this box was first installed on.
-Leave it; it freezes stateful defaults and is not meant to track the current
-nixpkgs.
-
-## Apply
-
-```sh
-sudo nixos-rebuild switch --flake .#emmathorpe-edaas
-# or, since the hostname matches the attribute:
-nh os switch
-```

lyrathorpe/catppuccin-mocha.nix

@@ -1,6 +1,6 @@
 # Catppuccin Mocha palette. Raw 6-digit hex (no leading "#"); consumers add a
 # "#" where their format needs it. Shared by the Sway desktop theming
-# (home/sway.nix) and the ReGreet greeter (modules/sway.nix) so the two stay in sync.
+# (home/sway.nix) and the ReGreet greeter (swaywm.nix) so the two stay in sync.
 {
   base = "1e1e2e";
   mantle = "181825";

lyrathorpe/home/README.md

@@ -15,10 +15,8 @@ Keyboard shortcuts have their own reference: [`KEYBINDINGS.md`](./KEYBINDINGS.md
 | GUI apps, GTK/Firefox theming, cursor  | [`desktop.nix`](./desktop.nix) (graphical hosts only) |
 
 Shared by every host via [`default.nix`](./default.nix); the work box also layers
-[`work.nix`](../users/emmathorpe/work.nix) on top (its own ssh config, extra
+[`work.nix`](./work.nix) on top (work email, its own ssh config, extra packages,
-packages, and the C#/Helm language servers). The committer identity (name, email,
+and the C#/Helm language servers).
-signing key) comes from the user registry
-([`../users/registry.nix`](../users/registry.nix)), not this module.
 
 ---
 
@@ -57,7 +55,7 @@ signing key) comes from the user registry
 | `hyperfine` / `sd`      | command-line benchmarking; saner find-and-replace than sed                                                                                                                                                                          |
 
 **Theming:** `fzf`, `bat`, `btop`, `lazygit` and `git`'s `delta` pager are all
-Catppuccin Mocha, driven from the shared `../lib/catppuccin-mocha.nix` palette / the
+Catppuccin Mocha, driven from the shared `../catppuccin-mocha.nix` palette / the
 catppuccin upstream themes.
 
 **Env & defaults:** `xdg.enable` on; `PAGER`/`MANPAGER` (bat) set in `default.nix`
@@ -110,23 +108,23 @@ declaratively with **nixvim**, so the same plugins and config are baked in on
 every host. Migrated from plain vim; the practical gain is a real LSP stack in
 place of the old (inert) ALE.
 
-| Feature        | Notes                                                                                     |
+| Feature        | Notes                                                                                  |
-| -------------- | ----------------------------------------------------------------------------------------- |
+| -------------- | -------------------------------------------------------------------------------------- |
-| Colorscheme    | Catppuccin Mocha (matches the terminal and the rest of the desktop)                       |
+| Colorscheme    | Catppuccin Mocha (matches the terminal and the rest of the desktop)                    |
-| File tree      | nvim-tree, toggled with `,,` (comma twice; was nerdtree)                                  |
+| File tree      | nvim-tree, toggled with `,,` (comma twice; was nerdtree)                               |
-| Fuzzy finder   | telescope (+fzf-native): `<leader>ff` files, `<leader>fg` grep, `<leader>fb` buffers      |
+| Fuzzy finder   | telescope (+fzf-native): `<leader>ff` files, `<leader>fg` grep, `<leader>fb` buffers   |
-| Format on save | conform-nvim (nixfmt, stylua, ruff, shfmt, prettier, gofumpt; LSP fallback otherwise)     |
+| Format on save | conform-nvim (nixfmt, stylua, ruff, shfmt, prettier, gofumpt; LSP fallback otherwise)  |
-| Git            | fugitive (`:Git …`) + gitsigns gutter signs/blame                                         |
+| Git            | fugitive (`:Git …`) + gitsigns gutter signs/blame                                      |
-| Diagnostics    | inline + trouble list (`<leader>xx`)                                                      |
+| Diagnostics    | inline + trouble list (`<leader>xx`)                                                   |
-| Completion     | nvim-cmp (LSP/buffer/path) with luasnip snippet expansion                                 |
+| Completion     | nvim-cmp (LSP/buffer/path) with luasnip snippet expansion                              |
-| Indent guides  | indent-blankline, on by default (was vim-indent-guides)                                   |
+| Indent guides  | indent-blankline, on by default (was vim-indent-guides)                                |
-| Statusline     | lualine (Catppuccin theme)                                                                |
+| Statusline     | lualine (Catppuccin theme)                                                             |
-| Editing        | which-key hints, comment (`gc`/`gcc`), autopairs, treesitter textobjects                  |
+| Editing        | which-key hints, comment (`gc`/`gcc`), autopairs, treesitter textobjects               |
-| Pane nav       | vim-tmux-navigator — `Ctrl`+`h/j/k/l` moves across vim splits and tmux panes              |
+| Pane nav       | vim-tmux-navigator — `Ctrl`+`h/j/k/l` moves across vim splits and tmux panes           |
-| Syntax         | tree-sitter (nix, lua, bash, markdown, groovy, c#, python, terraform, yaml)               |
+| Syntax         | tree-sitter (nix, lua, bash, markdown, groovy, c#, python, terraform, yaml)            |
-| LSP            | nvim-cmp completion + servers `nil_ls` (Nix), `lua_ls`, `pyright` (Python), `terraformls` |
+| LSP            | nvim-cmp completion + servers `nil` (Nix), `lua_ls`, `pyright` (Python), `terraformls` |
-| Indentation    | 2-wide hard tabs (`noexpandtab`, `tabstop`/`shiftwidth` = 2); line numbers on             |
+| Indentation    | 2-wide hard tabs (`noexpandtab`, `tabstop`/`shiftwidth` = 2); line numbers on          |
-| Filetypes      | `*Jenkinsfile` → groovy                                                                   |
+| Filetypes      | `*Jenkinsfile` → groovy                                                                |
 
 Leader is `Space`. LSP keymaps (`gd`, `gr`, `K`, `<leader>rn`, `<leader>ca`) and
 the file-tree toggle are listed in
@@ -149,17 +147,17 @@ current (`gc`/`fetch.writeCommitGraph`) so `lg` stays fast.
 | `lg`                     | graph log, all branches                                            |
 | `cz` `cc`                | `git cz <sub>` (e.g. `git cz c`) and `git cc` → commitizen prompt  |
 
-| Behaviour      |                                                                                                                                                                                                                |
+| Behaviour      |                                                                                                                                                                          |
-| -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Pulls          | rebase, with autostash + autosquash                                                                                                                                                                            |
+| Pulls          | rebase, with autostash + autosquash                                                                                                                                      |
-| Fetch          | prune deleted remote branches                                                                                                                                                                                  |
+| Fetch          | prune deleted remote branches                                                                                                                                            |
-| Conflicts      | `zdiff3` (shows the common ancestor)                                                                                                                                                                           |
+| Conflicts      | `zdiff3` (shows the common ancestor)                                                                                                                                     |
-| Diffs          | histogram algorithm, colour-moved                                                                                                                                                                              |
+| Diffs          | histogram algorithm, colour-moved                                                                                                                                        |
-| `rerere`       | remembers + replays conflict resolutions                                                                                                                                                                       |
+| `rerere`       | remembers + replays conflict resolutions                                                                                                                                 |
-| Commit editor  | full diff shown (`commit.verbose`)                                                                                                                                                                             |
+| Commit editor  | full diff shown (`commit.verbose`)                                                                                                                                       |
-| Misc           | branches sorted by date, `column.ui = auto`, `help.autocorrect = prompt`, `push.autoSetupRemote`                                                                                                               |
+| Misc           | branches sorted by date, `column.ui = auto`, `help.autocorrect = prompt`, `push.autoSetupRemote`                                                                         |
-| Global ignores | `result`, `result-*`, `.direnv`, `*.swp`, `.DS_Store`                                                                                                                                                          |
+| Global ignores | `result`, `result-*`, `.direnv`, `*.swp`, `.DS_Store`                                                                                                                    |
-| Signing        | SSH commit + tag signing (`mkDefault`, so a host without the key in its agent can disable it). Name, email and signing key all come from the per-user `identity` (the user registry, `../users/registry.nix`). |
+| Signing        | SSH commit + tag signing (`mkDefault`, so a host without the key in its agent can disable it). Personal email `iam@emmathe.dev`; the work box overrides email + signing. |
 
 ## ssh
 

lyrathorpe/home/claude/memory/MEMORY.md

@@ -9,4 +9,3 @@
 - [Review and comments workflow](workflow_review_and_comments.md) — show PR body and non-trivial Jira comments before posting; terse IaC code comments; PR body content rules
 - [Sandbox prompts](feedback_sandbox_prompts.md) — don't prompt for sandbox-disable or routine read-only shell ops; broaden permissions instead
 - [Dev clusters disposable](dev_clusters_disposable.md) — Lyra's dev clusters are recreatable; mutate/break freely, no confirmation needed
-- [Nix shell tooling](nix_shell_tooling.md) — any nixpkgs tool runs ad hoc via `nix run`/`nix shell nixpkgs#<pkg>`; a missing command is never a dead end

lyrathorpe/home/desktop.nix

@@ -1,13 +1,12 @@
 # Graphical desktop layer: GUI apps, Wayland session env, and cursor theme.
 # Imported only on hosts that run Sway (MBP, T400, Mac Pro); never pulled onto
 # the headless WSL host. Login (and the Sway session launch) is handled by the
-# greetd/ReGreet greeter -- see ../modules/sway.nix -- so there is no tty1
+# greetd/ReGreet greeter -- see ../swaywm.nix -- so there is no tty1 autostart.
-# autostart.
 {
   pkgs,
   config,
   inputs,
-  identity,
+  username,
   ...
 }:
 {
@@ -90,7 +89,7 @@
   };
 
   # Firefox is themed at the browser level (it does not follow the GTK theme).
-  # The system installs the binary (programs.firefox in ../modules/users.nix); here
+  # The system installs the binary (programs.firefox in ../user.nix); here
   # home-manager owns only the profile, hence package = null. Apply the
   # Catppuccin Mocha theme add-on (only the mauve accent is packaged upstream;
   # the rest of the desktop uses blue) and make content + UI dark.
@@ -102,7 +101,7 @@
     # stateVersion<26.05 default-change warning (the new XDG path depends on
     # Firefox's own profile support).
     configPath = ".mozilla/firefox";
-    profiles.${identity.username} = {
+    profiles.${username} = {
       id = 0;
       isDefault = true;
       extensions = {

lyrathorpe/home/git.nix

@@ -1,13 +1,13 @@
-# Version control: git + delta + commitizen + lazygit. Committer identity comes
+# Version control: git + delta pager + commitizen + lazygit. The work host
-# from the per-user `identity` arg (the registry). See README "Users".
+# layers commit signing and an email override on top (see work.nix).
 {
   pkgs,
   lib,
-  identity,
+  fullName,
   ...
 }:
 let
-  ctp = import ../lib/catppuccin-mocha.nix;
+  ctp = import ../catppuccin-mocha.nix;
 in
 {
   home.packages = [
@@ -18,9 +18,10 @@ in
     enable = true;
     package = pkgs.gitFull;
     settings = {
-      user.name = identity.fullName;
+      user.name = fullName;
-      # mkDefault so a host-specific module can still override it.
+      # Personal identity. mkDefault so the work module overrides it on the work
-      user.email = lib.mkDefault identity.email;
+      # host (and to merge cleanly with that plain definition there).
+      user.email = lib.mkDefault "iam@emmathe.dev";
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
 
@@ -76,10 +77,14 @@ in
         cc = "!cz commit";
       };
 
-      # SSH signing, key from the registry. mkDefault so a host lacking the key
+      # SSH commit signing. This personal key is the default; the work module
-      # in its agent can set gpgsign = false instead of failing every commit.
+      # (work.nix) overrides it with the work key on the EDaaS host, the same way
+      # user.email is overridden -- so mkDefault here lets that plain definition
+      # win instead of conflicting. gpgsign is mkDefault too, so a host without
+      # the key in its ssh-agent can override it to false rather than fail every
+      # commit.
       gpg.format = "ssh";
-      user.signingkey = lib.mkDefault identity.signingKey;
+      user.signingkey = lib.mkDefault "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDxHvdMTOzpFWUFMtCP7C/4tIOUO3GIO2QPvaifSnWH lyrathorpe@Lyra-MBA";
       commit.gpgsign = lib.mkDefault true;
       tag.gpgsign = lib.mkDefault true;
     };

lyrathorpe/home/shell.nix

@@ -8,7 +8,7 @@
 }:
 let
   # Shared Catppuccin Mocha palette: raw 6-hex strings, no leading "#".
-  ctp = import ../lib/catppuccin-mocha.nix;
+  ctp = import ../catppuccin-mocha.nix;
 in
 {
   imports = [

lyrathorpe/home/sway.nix

@@ -2,7 +2,7 @@
 # Imported via ./desktop.nix, so only graphical hosts get it.
 #
 # The compositor binary, PAM and the polkit *daemon* come from the system-level
-# programs.sway (see ../modules/sway.nix); package = null below reuses it instead of
+# programs.sway (see ../swaywm.nix); package = null below reuses it instead of
 # pulling a second Sway. The polkit authentication *agent* (the thing that draws
 # the GUI auth dialog) is a user service started here. home-manager owns the user
 # config (~/.config/sway) and wires the systemd user session (sway-session.target),
@@ -20,7 +20,7 @@ let
   # Catppuccin Mocha (shared with the ReGreet greeter). Raw hex; prefix "#"
   # where a consumer needs it -- Sway/i3status/dunst want "#", foot/swaylock do
   # not.
-  ctp = import ../lib/catppuccin-mocha.nix;
+  ctp = import ../catppuccin-mocha.nix;
 
   # Focused-window screenshot -> swappy editor (the dotfiles' grimshot.sh logic).
   # Full store paths so it needs nothing on PATH.
@@ -334,12 +334,13 @@ in
     ];
   };
 
-  # Night light. Manual location (no geoclue dependency); warmer at night,
+  # Night light. Manual location (no geoclue dependency); adjust the coordinates
-  # neutral by day. Coordinates come from the per-user module (e.g.
+  # to taste. Warmer at night, neutral by day.
-  # users/lyrathorpe/home.nix), not this shared module.
   services.gammastep = {
     enable = true;
     provider = "manual";
+    latitude = 51.5;
+    longitude = -0.13; # London-ish; set to your actual location
     temperature = {
       day = 6500;
       night = 3700;

lyrathorpe/home/work.nix

@@ -1,11 +1,6 @@
-# Work (EDaaS/WSL) home profile: corporate toolchain + tmux tweaks. Git identity
+# Home-manager module for the work (EDaaS/WSL) profile: corporate git signing,
-# comes from the registry (users/registry.nix), not here.
+# work toolchain packages and tmux tweaks. Imported only by the work host.
-{
+{ pkgs, lib, ... }:
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
 
 {
   # Host-scoped extras for this machine only (the EDaaS/WSL host).
@@ -17,6 +12,15 @@
   # programs.ssh (shell.nix) take it over. The ssh-agent below still runs.
   programs.ssh.enable = lib.mkForce false;
 
+  programs.git = {
+    settings = {
+      commit.gpgsign = true;
+      tag.gpgsign = true;
+      gpg.format = "ssh";
+      user.signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJMVgeRKnfX1G8coU3nAobI485aeUpGTMqH7+zbKI8o emma.thorpe@cloud.com";
+      user.email = "emma.thorpe@citrix.com";
+    };
+  };
   home.packages = [
     pkgs.kubectl
     pkgs.argo-rollouts
@@ -29,6 +33,7 @@
     pkgs.powershell
     pkgs.nuget
     pkgs.gedit
+    pkgs.lens
     pkgs.python3
     pkgs.gnumake
     pkgs.gcc
@@ -52,10 +57,8 @@
     docker = "/run/current-system/sw/bin/docker";
   };
   programs.tmux = {
-    # kube context/namespace in the status line. kube-tmux is pinned as a flake
-    # input (it is not in nixpkgs), so the script is always present in the store.
     extraConfig = ''
-      set -g status-right "#(${pkgs.bash}/bin/bash ${inputs.kube-tmux}/kube.tmux 250 red black)"
+      			set -g status-right "#(/run/current-system/sw/bin/bash $HOME/code/kube-tmux/kube.tmux 250 red black)"		
     '';
   };
   programs.go = {
@@ -63,7 +66,7 @@
   };
 
   # LSP servers only relevant to work: C# (omnisharp) and Helm charts (helm_ls).
-  # The shared editor (home/editor.nix) carries the universal ones;
+  # The shared editor (lyrathorpe/home/editor.nix) carries the universal ones;
   # these are gated to this host so the heavy omnisharp closure stays off the
   # personal machines. Tree-sitter grammars (highlighting) remain global there.
   programs.nixvim.plugins.lsp.servers = {

lyrathorpe/swaywm.nix

@@ -7,8 +7,8 @@
 
 let
   cfg = config.features.swayDesktop;
-  # Catppuccin Mocha (shared with the Sway desktop, see home/sway.nix).
+  # Catppuccin Mocha (shared with the Sway desktop, see lyrathorpe/home/sway.nix).
-  ctp = import ../lib/catppuccin-mocha.nix;
+  ctp = import ./catppuccin-mocha.nix;
 in
 {
   # The features.swayDesktop.enable option is declared in

lyrathorpe/user.nix

@@ -0,0 +1,28 @@
+{
+  config,
+  pkgs,
+  lib,
+  username,
+  fullName,
+  ...
+}:
+
+{
+  programs.zsh.enable = true;
+  users.users.${username} = {
+    isNormalUser = true;
+    home = "/home/${username}";
+    description = fullName;
+    extraGroups = [
+      "wheel"
+      "docker"
+    ];
+    shell = pkgs.zsh;
+  };
+  programs.firefox = lib.mkIf (config.features.swayDesktop.enable == true) {
+    enable = true;
+  };
+  programs.thunderbird = lib.mkIf (config.features.swayDesktop.enable == true) {
+    enable = true;
+  };
+}

modules/ssh.nix

@@ -1,14 +0,0 @@
-# sshd for the hosts that run it (T400, Mac Pro, RPi5): enable the daemon, open
-# port 22, and apply a key-only policy. Authorized keys are owned per-user by the
-# registry (modules/users.nix), not here.
-{ ... }:
-{
-  services.openssh.enable = true;
-  networking.firewall.allowedTCPPorts = [ 22 ];
-
-  services.openssh.settings = {
-    PasswordAuthentication = false; # keys only
-    KbdInteractiveAuthentication = false; # no keyboard-interactive fallback
-    PermitRootLogin = "no";
-  };
-}

modules/users.nix

@@ -1,38 +0,0 @@
-# System user accounts, built from the registry (users/registry.nix) for the
-# host's `hostUsers` set. See README "Users".
-{
-  config,
-  pkgs,
-  lib,
-  hostUsers,
-  userRegistry,
-  ...
-}:
-
-{
-  programs.zsh.enable = true;
-
-  users.users = lib.mapAttrs (
-    name: spec:
-    let
-      id = userRegistry.${name};
-    in
-    {
-      isNormalUser = true;
-      home = "/home/${name}";
-      description = id.fullName;
-      inherit (id) extraGroups;
-      openssh.authorizedKeys.keys = id.sshAuthorizedKeys;
-      shell = pkgs.zsh;
-    }
-    # linger opt-in (host table); left unmanaged when unset.
-    // lib.optionalAttrs (spec ? linger) { inherit (spec) linger; }
-  ) hostUsers;
-
-  programs.firefox = lib.mkIf (config.features.swayDesktop.enable == true) {
-    enable = true;
-  };
-  programs.thunderbird = lib.mkIf (config.features.swayDesktop.enable == true) {
-    enable = true;
-  };
-}

system/machine/Darwin/configuration.nix

@@ -1,5 +1,5 @@
 # Default nix-darwin host. Minimal macOS baseline; the user environment
-# (shell, git, editor) is carried by the shared ./home modules,
+# (shell, git, editor) is carried by the shared ./lyrathorpe/home modules,
 # the same ones used by the Linux hosts. nixpkgs.hostPlatform is set by
 # mkDarwinHost in flake.nix.
 { pkgs, username, ... }:
@@ -97,7 +97,6 @@
       "llvm@21"
       "lld@21"
       "python@3.14"
-      "dosbox-staging"
     ];
     # GUI applications. macOS app bundles are managed as casks; nixpkgs darwin
     # GUI support is unreliable, so these stay on brew for continuity.

system/machine/EDaaS/configuration.nix

@@ -19,7 +19,9 @@
     defaultUser = "emmathorpe";
     wslConf.automount.root = "/mnt";
     wslConf.interop.appendWindowsPath = true;
+    wslConf.interop.register = true;
     wslConf.interop.enabled = true;
+    wslConf.interop.includePath = true;
     wslConf.network.generateHosts = false;
     startMenuLaunchers = true;
     docker-desktop.enable = false;
@@ -62,11 +64,12 @@
 
   features.swayDesktop.enable = false;
 
-  # NOTE: this user's systemd --user lingering -- so the home-manager renovate
+  # Keep this user's systemd --user instance running without an open login
-  # timer fires without an open login session -- is enabled from the host table
+  # session, so the home-manager user timer (renovate-review.nix) fires on
-  # in flake.nix (users.emmathorpe.linger = true) and applied by
+  # schedule even when no terminal is attached. On WSL the timer still only runs
-  # modules/users.nix.
+  # while the distro itself is up; Persistent=true catches up a missed run at
-
+  # next start.
+  users.users.emmathorpe.linger = true;
   # programs.nix-ld is enabled for all NixOS hosts in common-nixos.nix.
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions

system/machine/MacPro31/README.md

@@ -48,7 +48,7 @@ gigabit ports.
 ## Login
 
 Graphical login via a Wayland greeter — `greetd` running ReGreet inside the
-`cage` kiosk compositor — configured centrally in `../../modules/sway.nix` for
+`cage` kiosk compositor — configured centrally in `lyrathorpe/swaywm.nix` for
 every Sway host (gated on `features.swayDesktop.enable`). The greeter is forced
 to the Dvorak layout to match the console and Sway session. Set the user
 password (`passwd lyrathorpe`) after install, or the greeter cannot

system/machine/MacPro31/configuration.nix

@@ -26,8 +26,10 @@
   # workstation.nix is the backstop).
   zramSwap.enable = true;
 
-  # sshd (daemon, port 22, key-only policy) comes from ../../modules/ssh.nix;
+  # This host accepts SSH, so open 22 (the firewall itself is enabled in
-  # the firewall itself is enabled in workstation.nix with a default-deny policy.
+  # workstation.nix with a default-deny policy).
+  services.openssh.enable = true;
+  networking.firewall.allowedTCPPorts = [ 22 ];
 
   # Dual Harpertown Xeon microcode. Redistributable firmware (GPU/NIC blobs) is
   # enabled in workstation.nix.
@@ -40,7 +42,7 @@
   #   - ATI Radeon HD 2600 XT -> "radeon" (older) or "amdgpu" KMS
   #   - NVIDIA GeForce 8800 GT -> "nouveau" KMS
   # These come up automatically via the in-tree drivers + KMS, and the graphics
-  # stack itself is enabled by modules/sway.nix. If a card needs to be forced, add it
+  # stack itself is enabled by swaywm.nix. If a card needs to be forced, add it
   # here, e.g. `services.xserver.videoDrivers = [ "radeon" ];` (or "nouveau"),
   # and/or `boot.initrd.kernelModules = [ "radeon" ];` in
   # hardware-configuration.nix for early KMS.

system/machine/RPi5/README.md

@@ -15,7 +15,7 @@ Headless `aarch64-linux` server with two roles:
    ```sh
    nixos-generate-config --root /mnt
    # copy /mnt/etc/nixos/hardware-configuration.nix over
-   # hosts/RPi5/hardware-configuration.nix in this repo, then commit
+   # system/machine/RPi5/hardware-configuration.nix in this repo, then commit
    ```
    `hardware-configuration.nix` in this directory is a **placeholder** committed
    only so the host evaluates in CI. The machine will not boot correctly until it
@@ -28,8 +28,7 @@ Headless `aarch64-linux` server with two roles:
    nh os switch
    ```
 4. Give the login user a password (`passwd lyrathorpe`) and confirm the key in
-   the user registry (`../../users/registry.nix`, applied by
+   `system/modules/ssh.nix` is the one you will connect with.
-   `../../modules/ssh.nix`) is the one you will connect with.
 
 ## Docker socket (security)
 

system/machine/RPi5/configuration.nix

@@ -15,7 +15,7 @@
   # (which selects by the local hostname) resolves without an explicit -H flag.
   networking.hostName = "lyrathorpe-rpi5";
 
-  # Headless server: the Sway desktop is intentionally not set up. modules/sway.nix is
+  # Headless server: the Sway desktop is intentionally not set up. swaywm.nix is
   # not imported and features.swayDesktop.enable defaults to false (declared in
   # system/modules/features.nix), so this host keeps plain TTY/SSH login.
 
@@ -25,12 +25,15 @@
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
 
-  # Remote administration: the daemon, port 22 and key-only policy all come from
+  # Remote administration. Key-only policy and the authorized key come from
-  # ../../modules/ssh.nix.
+  # ../../modules/ssh.nix; here we just enable the daemon and open the port.
+  services.openssh.enable = true;
 
-  # Default-deny inbound; the Docker and nginx submodules open their own ports
+  # Default-deny inbound. Open only SSH here; the Docker and nginx submodules
-  # (Docker via a source-restricted nftables rule, nginx via 80/443).
+  # open their own ports (Docker via a source-restricted nftables rule, nginx
+  # via 80/443). List-valued, so these merge with the submodule definitions.
   networking.firewall.enable = true;
+  networking.firewall.allowedTCPPorts = [ 22 ];
 
   # See `man configuration.nix` / the stateVersion docs before changing.
   system.stateVersion = "26.05";

system/machine/RPi5/docker.nix

@@ -8,10 +8,6 @@
 # secure upgrade path is mutual TLS on 2376 (--tlsverify with client certs);
 # that needs out-of-band cert provisioning and is intentionally not wired here.
 { ... }:
-let
-  # LAN allowed to reach the unauthenticated Docker TCP socket (see SECURITY above).
-  trustedSubnet = "10.187.1.0/24";
-in
 {
   virtualisation.docker.enable = true;
 
@@ -33,6 +29,6 @@ in
   # CIDR to match the LAN that should reach the Docker API.
   networking.nftables.enable = true;
   networking.firewall.extraInputRules = ''
-    ip saddr ${trustedSubnet} tcp dport 2375 accept
+    ip saddr 10.187.1.0/24 tcp dport 2375 accept
   '';
 }

system/machine/T400/README.md

@@ -35,7 +35,7 @@ change and `radeon` stays idle.
 ## Login
 
 Graphical login via a Wayland greeter — `greetd` running ReGreet inside the
-`cage` kiosk compositor — configured centrally in `../../modules/sway.nix` for
+`cage` kiosk compositor — configured centrally in `lyrathorpe/swaywm.nix` for
 every Sway host (gated on `features.swayDesktop.enable`). The greeter is forced
 to the Dvorak layout to match the console and Sway session. Set the user
 password (`passwd lyrathorpe`) after install, or the greeter cannot

system/machine/T400/configuration.nix

@@ -21,8 +21,10 @@
   # Low-RAM host (4 GiB max): a compressed RAM swap reduces disk paging.
   zramSwap.enable = true;
 
-  # sshd (daemon, port 22, key-only policy) comes from ../../modules/ssh.nix;
+  # This host accepts SSH, so open 22 (the firewall itself is enabled in
-  # the firewall itself is enabled in laptop.nix with a default-deny policy.
+  # laptop.nix with a default-deny policy).
+  services.openssh.enable = true;
+  networking.firewall.allowedTCPPorts = [ 22 ];
 
   # Intel Core 2 (Penryn) microcode. Redistributable firmware (enabled in
   # workstation.nix) supplies the iwlwifi blobs (Intel WiFi Link 5100/5300) and

system/modules/desktop.nix

@@ -2,7 +2,7 @@
 # shared ./workstation.nix base and swaps the mobile Wi-Fi backend for wired
 # NetworkManager. A desktop host also sets `portable = false` in its host-table
 # entry (flake.nix), which drops the battery block and brightness keybindings
-# from the Sway bar -- see home/sway.nix.
+# from the Sway bar -- see lyrathorpe/home/sway.nix.
 { ... }:
 {
   imports = [ ./workstation.nix ];

system/modules/features.nix

@@ -2,9 +2,9 @@
 # baseModules in flake.nix). Declaring the flags here -- rather than inside the
 # module that implements them -- means a host can read or set a flag without
 # importing the (often large) implementation module. In particular,
-# features.swayDesktop.enable is read by modules/users.nix on every host, but a
+# features.swayDesktop.enable is read by lyrathorpe/user.nix on every host, but a
 # headless host (e.g. the Pi) must be able to leave it at its default without
-# pulling in modules/sway.nix. The implementation lives in modules/sway.nix,
+# pulling in lyrathorpe/swaywm.nix. The implementation lives in swaywm.nix,
 # gated on this flag.
 { lib, ... }:
 {

system/modules/laptop.nix

@@ -2,7 +2,7 @@
 # flake.nix. Shared graphical-workstation settings live in ./workstation.nix;
 # the only laptop-specific bit is the Wi-Fi backend. Mobile home-manager
 # components (battery block, brightness keys) are gated by the `portable` flag
-# threaded through mkHost -- see home/sway.nix.
+# threaded through mkHost -- see lyrathorpe/home/sway.nix.
 { ... }:
 {
   imports = [ ./workstation.nix ];

system/modules/ssh.nix

@@ -0,0 +1,19 @@
+# Key-only SSH hardening, imported by the hosts that run sshd (T400, Mac Pro).
+# The host config still does `services.openssh.enable = true` and opens port 22
+# next to where it documents the listening service; this module only tightens
+# the policy and installs the authorized key, so a host opting into sshd cannot
+# accidentally ship password/root login.
+{ username, ... }:
+{
+  services.openssh.settings = {
+    PasswordAuthentication = false; # keys only
+    KbdInteractiveAuthentication = false; # no keyboard-interactive fallback
+    PermitRootLogin = "no";
+  };
+
+  # The key permitted to log in as the primary user. Add more entries here as
+  # new client machines are provisioned.
+  users.users.${username}.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDxHvdMTOzpFWUFMtCP7C/4tIOUO3GIO2QPvaifSnWH lyrathorpe@Lyra-MBA"
+  ];
+}

users/lyrathorpe/home.nix

@@ -1,17 +0,0 @@
-# Lyra's personal home extras, imported on her hosts (not the work box). Keeps
-# personal data out of the shared home/ modules. See README "Users".
-{ pkgs, lib, ... }:
-{
-  # Personal ssh host shortcut.
-  programs.ssh.settings."dockerpi.inf.cbg.emmaisvery.gay" = {
-    User = "emmathorpe";
-  };
-
-  # Night-light location for gammastep (the service itself is enabled by
-  # home/sway.nix on graphical hosts). Linux-guarded so Darwin, which imports
-  # this module but has no gammastep, skips it.
-  services.gammastep = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
-    latitude = 51.5;
-    longitude = -0.13;
-  };
-}

users/registry.nix

@@ -1,28 +0,0 @@
-# User identity registry -- pure data, keyed by username. See README "Users".
-# (`identity.username` is injected by mkHost, so it is not repeated here.)
-{
-  lyrathorpe = {
-    fullName = "Lyra Thorpe";
-    email = "iam@emmathe.dev";
-    extraGroups = [
-      "wheel"
-      "docker"
-    ];
-    sshAuthorizedKeys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDxHvdMTOzpFWUFMtCP7C/4tIOUO3GIO2QPvaifSnWH lyrathorpe@Lyra-MBA"
-    ];
-    signingKey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDxHvdMTOzpFWUFMtCP7C/4tIOUO3GIO2QPvaifSnWH lyrathorpe@Lyra-MBA";
-  };
-
-  emmathorpe = {
-    fullName = "Emma Thorpe";
-    email = "emma.thorpe@citrix.com";
-    extraGroups = [
-      "wheel"
-      "docker"
-    ];
-    # No personal key on file yet; add one if SSH login as emmathorpe is wanted.
-    sshAuthorizedKeys = [ ];
-    signingKey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJMVgeRKnfX1G8coU3nAobI485aeUpGTMqH7+zbKI8o emma.thorpe@cloud.com";
-  };
-}