refactor(flake): user registry, multi-user hosts, and portable home outputs #49

2026-06-29T12:30:53+01:00

lyrathorpe commented

2026-06-29 12:30:53 +01:00

Summary

Separates user identity (data) from the reusable Nix modules and lets a host declare any number of users, replacing the previous one-user-per-host structure. Also restructures the tree and exposes the home config for use off these hosts.

Changes

User registry (users/registry.nix): per-user identity (name, email, groups, authorized + signing keys) as the single source of truth; no user data hardcoded in modules.
Multi-user mkHost: a host declares a users set keyed by username; per-user identity is injected into each home config via the identity module arg.
Restructured layout: users/, home/, modules/, hosts/, lib/ replace the former lyrathorpe/ and system/ trees.
Portable outputs: standalone homeConfigurations."<user>@<system>" (the portable subset — shell, git, editor, claude) plus an exported homeModules for use on machines not managed by this flake, or as an input to other flakes.
Docs (README.md, home/README.md) and .gitignore updated for the new paths.

Fixes

Closes #46 — shared user module authorized one user's SSH key for every account.
Closes #47 — git committer identity hardcoded as defaults instead of per-user.
Closes #48 — EDaaS systemd linger hardcoded to a literal username.

Verification

nix flake check passes: treefmt, deadnix, statix, pre-commit, and evaluation of all NixOS hosts + Darwin + homeConfigurations.
Derivation-path comparison vs main: lyrathorpe-mbp and emmathorpe-edaas are byte-identical; lyrathorpe-t400, lyrathorpe-macpro31 and lyrathorpe-rpi5 differ only by de-duplicating a repeated authorized_keys entry (confirmed with nix-diff — no other change).
Standalone homeConfigurations."lyrathorpe@x86_64-linux".activationPackage builds.

Notes

emmathorpe has no personal authorized key yet (it previously inherited Lyra's key via the bug in #46); the registry entry is intentionally empty — add a real key if SSH login as emmathorpe is wanted (moot on the WSL host).
A two-repo (public dotfiles / private systems) split is deferred by design; this internal restructure is the prerequisite for it.

## Summary Separates user identity (data) from the reusable Nix modules and lets a host declare any number of users, replacing the previous one-user-per-host structure. Also restructures the tree and exposes the home config for use off these hosts. ## Changes - **User registry** (`users/registry.nix`): per-user identity (name, email, groups, authorized + signing keys) as the single source of truth; no user data hardcoded in modules. - **Multi-user `mkHost`**: a host declares a `users` set keyed by username; per-user identity is injected into each home config via the `identity` module arg. - **Restructured layout**: `users/`, `home/`, `modules/`, `hosts/`, `lib/` replace the former `lyrathorpe/` and `system/` trees. - **Portable outputs**: standalone `homeConfigurations."<user>@<system>"` (the portable subset — shell, git, editor, claude) plus an exported `homeModules` for use on machines not managed by this flake, or as an input to other flakes. - Docs (`README.md`, `home/README.md`) and `.gitignore` updated for the new paths. ## Fixes - Closes #46 — shared user module authorized one user's SSH key for every account. - Closes #47 — git committer identity hardcoded as defaults instead of per-user. - Closes #48 — EDaaS systemd linger hardcoded to a literal username. ## Verification - `nix flake check` passes: treefmt, deadnix, statix, pre-commit, and evaluation of all NixOS hosts + Darwin + homeConfigurations. - Derivation-path comparison vs `main`: `lyrathorpe-mbp` and `emmathorpe-edaas` are byte-identical; `lyrathorpe-t400`, `lyrathorpe-macpro31` and `lyrathorpe-rpi5` differ only by de-duplicating a repeated `authorized_keys` entry (confirmed with nix-diff — no other change). - Standalone `homeConfigurations."lyrathorpe@x86_64-linux".activationPackage` builds. ## Notes - `emmathorpe` has no personal authorized key yet (it previously inherited Lyra's key via the bug in #46); the registry entry is intentionally empty — add a real key if SSH login as `emmathorpe` is wanted (moot on the WSL host). - A two-repo (public dotfiles / private systems) split is deferred by design; this internal restructure is the prerequisite for it.

lyrathorpe added 2 commits 2026-06-29 12:30:53 +01:00

refactor(flake): add user registry and multi-user host support 10cc6cceed

Separate user identity (data) from the reusable modules, and let a host
declare any number of users instead of exactly one.

- users/registry.nix: per-user identity (name, email, groups, authorized
  and signing keys) as the single source of identity; no user data is
  hardcoded in the modules.
- mkHost takes a `users` set keyed by username; per-user identity is
  injected into each home config via the `identity` module arg
  (extraSpecialArgs is per-host, so it cannot carry per-user data).
- modules/users.nix builds accounts from the registry; modules/ssh.nix no
  longer defines authorized keys (the registry owns them); home/git.nix
  and home/desktop.nix read `identity`; users/emmathorpe/work.nix drops
  its now-redundant git identity override.
- Restructure the tree: users/, home/, modules/, hosts/, lib/ replace the
  former lyrathorpe/ and system/ layout.
- Add standalone homeConfigurations (the portable subset: shell, git,
  editor, claude) and an exported homeModules output for use on machines
  not managed by this flake, or as an input to other flakes.

Behaviour-preserving for existing hosts: lyrathorpe-mbp and
emmathorpe-edaas evaluate to identical derivations; lyrathorpe-t400,
lyrathorpe-macpro31 and lyrathorpe-rpi5 differ only by de-duplicating a
repeated authorized_keys entry. Fixes the SSH authorized-key leak (one
user's key was applied to every account), the hardcoded default git
identity, and the hardcoded EDaaS linger setting.

docs: update READMEs and .gitignore for the restructured layout

CI / flake (pull_request) Successful in 3m25s

Details

ea3e75e0af

Point all path references at the new users/, home/, modules/, hosts/, lib/
locations, and document the user registry, the multi-user host model, and
the portable homeConfigurations / homeModules outputs.

lyrathorpe added 1 commit 2026-06-29 12:41:24 +01:00

docs: simplify code comments, keep the detail in the README

CI / flake (pull_request) Successful in 3m27s

Details

f7ae46f462

The registry / multi-user / portable-home rationale lives in the README
(Users, Hosts, Portable home); the corresponding code comments are reduced
to one-liners that point there. No functional change (host derivations are
unchanged).

lyrathorpe added 1 commit 2026-06-29 13:02:42 +01:00

refactor(home): move personal data out of the shared home modules

CI / flake (pull_request) Successful in 3m33s

Details

d7a1930650

The dockerpi ssh host shortcut (home/shell.nix) and the gammastep
night-light coordinates (home/sway.nix) were hardcoded in shared modules,
so every host inherited them. Move both into a per-user module
(users/lyrathorpe/home.nix) imported on Lyra's hosts only, not the work
box; the gammastep block is Linux-guarded so Darwin skips it.

No build change on existing hosts: the generated configs are byte-identical
(verified by drvPath), the data is simply no longer in shared modules.

lyrathorpe scheduled this pull request to auto merge when all checks succeed 2026-06-29 13:04:17 +01:00

lyrathorpe merged commit 128deca2e3 into main

2026-06-29 13:06:24 +01:00

lyrathorpe deleted branch refactor/user-registry-and-portable-home

2026-06-29 13:06:26 +01:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: lyrathorpe/nixfiles#49