From 00a0303f0eaf825c43bae8d0ab96144d19f841da Mon Sep 17 00:00:00 2001 From: dannyfaris Date: Thu, 28 May 2026 23:27:07 +1200 Subject: [PATCH] metis: import desktop-env bundles (ADR-028 slice 3d) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- hosts/metis/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/metis/default.nix b/hosts/metis/default.nix index ad0c697..8314220 100644 --- a/hosts/metis/default.nix +++ b/hosts/metis/default.nix @@ -23,6 +23,7 @@ # Capability bundles. ../../modules/core/nixos/bundles/remote-access.nix + ../../modules/core/nixos/bundles/desktop-env.nix # Standalone system modules. ../../modules/core/nixos/boot-systemd.nix @@ -75,6 +76,7 @@ ../../home/core/shared/bundles/cli-tooling.nix ../../home/core/shared/bundles/git-personal.nix ../../home/core/shared/bundles/theming.nix + ../../home/core/nixos/bundles/desktop-env.nix ../../home/core/shared/ssh.nix ../../home/core/nixos/macchina.nix ../../home/core/shared/agent-clis.nix