metis: import desktop-env bundles (ADR-028 slice 3d)#60
Merged
Conversation
First commit that imports the slice-3 desktop bundles into a real host. Two-line addition to hosts/metis/default.nix: - modules/core/nixos/bundles/desktop-env.nix added to `imports` (alongside bundles/remote-access.nix). - home/core/nixos/bundles/desktop-env.nix added to hostContext.extraHomeModules (after the shared theming bundle, before standalones). This is the integration test for the four merged slice-3 PRs: - #42 (3a) — flake inputs - #44 (3b) — system bundle scaffold (niri + greetd + fonts + DMS bridge) - #55 (3c) — home bundle scaffold (niri binds + foot + DMS) - #57 (3b.5) — niri.cachix.org substituter in nix.settings …plus the CI-side half currently in flight at #59 (extra_nix_config in flake-check workflow). This branch is stacked on desktop-env/ci-niri-cache-trust so the CI workflow trust is in place when CI evaluates this PR. Closure delta on metis (expected): niri (from niri.cachix.org), greetd + tuigreet, Quickshell + Qt6 + matugen + DMS deps, xdg-desktop-portal-gnome, polkit-kde-agent-1, gnome-keyring, Inter, Noto Color Emoji, foot. No regression expected on mercury or nixos-vm — neither imports the bundles. Local build verification not possible — dbf is not in nix's trusted-users, so runtime substituter additions are rejected. The integration test fires in CI where the GH Actions runner is trusted and the workflow already declares extra-substituters via #59 (which this branch inherits). No `nh os switch` here; that's slice 5. Peer-reviewed (8 checkpoints: bundle placement, no auto-discovery, closure delta sanity, eval-without-cache, CI matrix arch scoping, CI ordering / branch base, merge-order safety, edge cases including HM module order, Stylix font conflicts, pre-commit hooks). Per ADR-028 §Implementation slice 3.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
First commit that imports the slice-3 desktop bundles into a real host. Two-line addition to
hosts/metis/default.nix:modules/core/nixos/bundles/desktop-env.nix→imports.home/core/nixos/bundles/desktop-env.nix→hostContext.extraHomeModules.This is the integration test for the five prior slice-3 PRs:
CI now trusts
niri.cachix.org(via #59 on main), so this PR's flake-check actually exercises the desktop-env closure with the cache as substituter — no source-build of niri, no crates.io 403 cascade.Expected closure delta on metis
niri (from
niri.cachix.org), greetd + tuigreet, Quickshell + Qt6 + matugen + DMS deps, xdg-desktop-portal-gnome, polkit-kde-agent-1, gnome-keyring, Inter, Noto Color Emoji, foot. No regression expected on mercury or nixos-vm — neither imports the bundles.Local verification caveat
dbfis not in nix'strusted-userson the operator's machine, so runtime substituter additions are rejected withwarning: ignoring untrusted substituter. Localnix build .#nixosConfigurations.metis...would source-build niri. The integration test fires in CI where the GH Actions runner is trusted and the workflow declaresextra-substituters.No
nh os switchhere — that's slice 5.Peer review
Reviewed against 8 checkpoints:
nix flake check --no-buildsucceeds independent of cache trust (eval doesn't require fetching).Test plan
nix flake check --no-buildsucceeds (eval).niri.cachix.org; DMS + Quickshell + Qt6 closure built; foot + greetd added.Closes the ADR-028 slice 3 implementation. Slice 4 (DMS↔Stylix theme wiring) is tracked at #34; slice 5 (first activation on metis) at #35.
Refs: #33, ADR-028.
🤖 Generated with Claude Code