wired private fleet modules into the fleet #72

Merged
jan-leila merged 4 commits from private-fleet into main 2026-10-03 16:28:43 -05:00
Owner

Lets the private repo define fleet modules that this fleet picks up:

  • modules.fleet.fleetModules (modules/parts.nix) joins fleet-modules-all with the private repo's modules.fleet.services, the way nixosModules already joins in its programs.
  • nixosModules also imports the private repo's modules.nixos.fleet-adaptors.
  • the archipelago fleet is built from fleetModules and imports the private repo's archipelagoPrivateConfiguration as a module of the same fleet, so it reaches for handles and the tailnet filter like the public config does.

With the private hooks empty, defiant instantiates to the identical derivation as main.

Depends on nix-config-private#1 (fleet module hooks): merge that first, then npins update private here before merging, since the currently pinned private has none of the three attributes. The per-service private PRs (#2 through #8) need nothing more from this side.

Lets the private repo define fleet modules that this fleet picks up: - `modules.fleet.fleetModules` (modules/parts.nix) joins `fleet-modules-all` with the private repo's `modules.fleet.services`, the way `nixosModules` already joins in its programs. - `nixosModules` also imports the private repo's `modules.nixos.fleet-adaptors`. - the archipelago fleet is built from `fleetModules` and imports the private repo's `archipelagoPrivateConfiguration` as a module of the same fleet, so it reaches for handles and the tailnet filter like the public config does. With the private hooks empty, defiant instantiates to the identical derivation as main. Depends on nix-config-private#1 (fleet module hooks): merge that first, then `npins update private` here before merging, since the currently pinned private has none of the three attributes. The per-service private PRs (#2 through #8) need nothing more from this side.
feat: wired private fleet modules into the fleet
Some checks failed
build build-all-hosts failed: no output
15ac98c571
feat: bumped private pin
All checks were successful
build PR #72: checks passed
751b6a228f
Merge branch 'main' into private-fleet
Some checks are pending
build PR #72: queued
646fe1ab77
feat: update npin
All checks were successful
build PR #72: checks passed
461586e4c8
jan-leila scheduled this pull request to auto merge when all checks succeed 2026-10-03 16:18:41 -05:00
jan-leila deleted branch private-fleet 2026-10-03 16:28:43 -05:00
Sign in to join this conversation.
No reviewers
No labels
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.

Dependencies

No dependencies set.

Reference
jan-leila/nix-config!72
No description provided.