reorganization #92

Merged
lament merged 1 commit from refactor into main 2026-07-17 00:20:10 -05:00
Owner
  • services/ and system/ regrouped into subdirs by concern - import-tree auto-discovers, so this is pure jj mv, zero reference churn (module names decouple from paths)
    • services/: edge/ (caddy/acme/mailserver), web/ (the proxied *.lament.gay apps), dns/ (knot/kresd/tsig), data/ (postgres)
    • system/: base/ (boot/core/nix/secrets substrate, incl. the guest bases pulled over from hardware/), net/ (networking/sshd/fail2ban), builder/ (buildMachines + forgejo-runner), backup/ (borgbackup)
  • dropped services/gollum.nix - dead since the wiki moved to wiki-js in #85, nothing references it anymore
  • just fetch now forgets every merged feature bookmark, not just the current commit's
    • revset walks bookmarks() & ::main and filters main out by name, so a bookmark co-located with main after a fast-forward still counts
    • loops over the matches with jj bookmark forget --include-remotes - clears the name@origin orphans too
  • jj fix nixfmt: pass - so nixfmt reads stdin (it was silently no-op'ing without the explicit arg)
  • README caught up to the layout
    • new "where does everything actually go?" section pitching directory.nix as the fleet register
    • structure tree redrawn for the new services/+system/ subgroups and the current four-host fleet
  • left for later: rsync alongside borg under system/backup/ if a second backup path ever lands
- `services/` and `system/` regrouped into subdirs by concern - import-tree auto-discovers, so this is pure `jj mv`, zero reference churn (module names decouple from paths) - `services/`: `edge/` (`caddy`/`acme`/`mailserver`), `web/` (the proxied `*.lament.gay` apps), `dns/` (`knot`/`kresd`/`tsig`), `data/` (`postgres`) - `system/`: `base/` (boot/core/nix/secrets substrate, incl. the guest bases pulled over from `hardware/`), `net/` (`networking`/`sshd`/`fail2ban`), `builder/` (`buildMachines` + `forgejo-runner`), `backup/` (`borgbackup`) - dropped `services/gollum.nix` - dead since the wiki moved to `wiki-js` in #85, nothing references it anymore - `just fetch` now forgets *every* merged feature bookmark, not just the current commit's - revset walks `bookmarks() & ::main` and filters `main` out by name, so a bookmark co-located with `main` after a fast-forward still counts - loops over the matches with `jj bookmark forget --include-remotes` - clears the `name@origin` orphans too - `jj fix` nixfmt: pass `-` so nixfmt reads stdin (it was silently no-op'ing without the explicit arg) - README caught up to the layout - new "where does everything actually *go*?" section pitching `directory.nix` as the fleet register - structure tree redrawn for the new `services/`+`system/` subgroups and the current four-host fleet - left for later: `rsync` alongside `borg` under `system/backup/` if a second backup path ever lands
reorganization
Some checks failed
CI / check (pull_request) Successful in 2m25s
CI / deploy (pull_request) Has been skipped
CI / dry-activate (pull_request) Has been cancelled
CI / build (pull_request) Has been cancelled
e9f05e6ca1
lament force-pushed refactor from e9f05e6ca1
Some checks failed
CI / check (pull_request) Successful in 2m25s
CI / deploy (pull_request) Has been skipped
CI / dry-activate (pull_request) Has been cancelled
CI / build (pull_request) Has been cancelled
to 73dec1ae28
All checks were successful
CI / check (pull_request) Successful in 50s
CI / deploy (pull_request) Has been skipped
CI / build (pull_request) Successful in 2m45s
CI / dry-activate (pull_request) Successful in 39s
CI / check (push) Has been skipped
CI / build (push) Has been skipped
CI / dry-activate (push) Has been skipped
CI / deploy (push) Successful in 2m21s
2026-07-17 00:15:16 -05:00
Compare
lament merged commit 73dec1ae28 into main 2026-07-17 00:20:10 -05:00
lament deleted branch refactor 2026-07-17 00:20:10 -05:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Reference
lament/pantheon!92
No description provided.