builder2 removed — retired host. Dropped the dangling network.json entry and the empty home/hosts/builder2/default.nix stub. Its old IP (10.42.1.17) already belongs to pve4, no conflict.
Ceph module removed — abandoned. No host enables services.ceph-benaco; deleted modules/nixos/ceph.nix and the plaintext (unencrypted) keyring files under secrets/home*.keyring that had no live use.
Darwin host identity normalized — IVR and Lithic are the only two physical Darwin machines. Every other name under darwin/hosts/ is now a symlink to whichever real machine it represents, matching whatever DHCP hostname nix-darwin sees on a given network:
gregory -> ivr
gregory.hellings-mbp -> ivr
MacBook-Prolocal -> ivr
gregs-MacBook-Pro-16-inch-Nov-2024 -> lithic
li -> lithic (pre-existing, unchanged)
This keeps one canonical config per physical machine while nix-darwin switch still resolves correctly no matter which network-derived hostname is currently active.
Note: Joel/pve1/OPNsense normalization (item raised alongside this) was already merged in #32/#33 — confirmed no residual joel/opnsense references remain in the tree.
Addresses three cleanup items:
1. **builder2 removed** — retired host. Dropped the dangling `network.json` entry and the empty `home/hosts/builder2/default.nix` stub. Its old IP (10.42.1.17) already belongs to pve4, no conflict.
2. **Ceph module removed** — abandoned. No host enables `services.ceph-benaco`; deleted `modules/nixos/ceph.nix` and the plaintext (unencrypted) keyring files under `secrets/home*.keyring` that had no live use.
3. **Darwin host identity normalized** — IVR and Lithic are the only two physical Darwin machines. Every other name under `darwin/hosts/` is now a symlink to whichever real machine it represents, matching whatever DHCP hostname nix-darwin sees on a given network:
- `gregory` -> `ivr`
- `gregory.hellings-mbp` -> `ivr`
- `MacBook-Prolocal` -> `ivr`
- `gregs-MacBook-Pro-16-inch-Nov-2024` -> `lithic`
- `li` -> `lithic` (pre-existing, unchanged)
This keeps one canonical config per physical machine while `nix-darwin switch` still resolves correctly no matter which network-derived hostname is currently active.
Note: Joel/pve1/OPNsense normalization (item raised alongside this) was already merged in #32/#33 — confirmed no residual `joel`/`opnsense` references remain in the tree.
- Remove builder2 (retired host): dangling network.json entry and
empty home/hosts/builder2 stub. Its old IP (10.42.1.17) is already
correctly owned by pve4.
- Remove the abandoned Ceph module (modules/nixos/ceph.nix) and its
unencrypted plaintext keyring files under secrets/. No host ever
enabled services.ceph-benaco; the keyrings were dead, unencrypted
credentials sitting in the repo.
- Normalize Darwin host identity: IVR and Lithic are the only two
physical Darwin machines. All other darwin/hosts/* names are now
symlinks to whichever of the two they represent, matching the DHCP
name variations nix-darwin sees depending on network:
gregory -> ivr
gregory.hellings-mbp -> ivr
MacBook-Prolocal -> ivr
gregs-MacBook-Pro-16-inch-Nov-2024 -> lithic
li -> lithic (pre-existing)
This lets each machine's config be maintained once regardless of
what hostname it currently advertises.
greg
merged commit 7aa91491e4 into main2026-08-09 21:36:36 +00:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Addresses three cleanup items:
builder2 removed — retired host. Dropped the dangling
network.jsonentry and the emptyhome/hosts/builder2/default.nixstub. Its old IP (10.42.1.17) already belongs to pve4, no conflict.Ceph module removed — abandoned. No host enables
services.ceph-benaco; deletedmodules/nixos/ceph.nixand the plaintext (unencrypted) keyring files undersecrets/home*.keyringthat had no live use.Darwin host identity normalized — IVR and Lithic are the only two physical Darwin machines. Every other name under
darwin/hosts/is now a symlink to whichever real machine it represents, matching whatever DHCP hostname nix-darwin sees on a given network:gregory->ivrgregory.hellings-mbp->ivrMacBook-Prolocal->ivrgregs-MacBook-Pro-16-inch-Nov-2024->lithicli->lithic(pre-existing, unchanged)This keeps one canonical config per physical machine while
nix-darwin switchstill resolves correctly no matter which network-derived hostname is currently active.Note: Joel/pve1/OPNsense normalization (item raised alongside this) was already merged in #32/#33 — confirmed no residual
joel/opnsensereferences remain in the tree.- Remove builder2 (retired host): dangling network.json entry and empty home/hosts/builder2 stub. Its old IP (10.42.1.17) is already correctly owned by pve4. - Remove the abandoned Ceph module (modules/nixos/ceph.nix) and its unencrypted plaintext keyring files under secrets/. No host ever enabled services.ceph-benaco; the keyrings were dead, unencrypted credentials sitting in the repo. - Normalize Darwin host identity: IVR and Lithic are the only two physical Darwin machines. All other darwin/hosts/* names are now symlinks to whichever of the two they represent, matching the DHCP name variations nix-darwin sees depending on network: gregory -> ivr gregory.hellings-mbp -> ivr MacBook-Prolocal -> ivr gregs-MacBook-Pro-16-inch-Nov-2024 -> lithic li -> lithic (pre-existing) This lets each machine's config be maintained once regardless of what hostname it currently advertises.