Repository navigation
feat(config): install Dakota's and GNOME OS's config subpackages - #1297
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hanthor The full list of commands accepted by this bot can be found here. Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@hanthor this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (6 waiting): fixes are handed out before new work as soon as you have capacity. |
Danathar
left a comment
There was a problem hiding this comment.
Stand-in review (the hive's reviewers are out of quota). Approving, with merge ordering. At factory pin 0b0664cb every dakota-config-* and gnome-os-config-* package here is published, so the "blocked on publish" note is stale once this is rebased on #1248. Before merging:
06-dakota-keybindingssets custom0's command to/usr/bin/xdg-terminal-exec, andtests/common/features/common_dconf.feature:76-85(@common @bluefin, runs on Utah) expects exactly'xdg-terminal-exec'. testsuite#1249 accepts both values; it has to merge and the testsuite pin move first.- The firstboot-date
.pathunit waits for/run/systemd/timesync/synchronized, which chrony never creates, so this needs timesyncd, which is now in #1309 (which also hand-copies the same units, so expect a conflict). - Dakota's
ublue-booted-image-syncalso bind-mounts a rewrittenimage-info.jsonover/usr/share/ublue-os/image-info.json, which Utah's old helper didn't do, and it hasn't been booted under Utah's SELinux.ujust changelogsreads that file.
New behaviour worth a release note: persistent journal, hidraw uaccess for Logitech devices, /etc/resolv.conf as a symlink to the resolved stub, the Tailscale Setup app (pkexec, auth_admin), and the one-shot bluefin-remove-installer (flatpak uninstall --unused).
Hummingbird's 99-default-disable.preset turns off every unit no preset names; GNOME OS has no catch-all disable, so a booted Dakota runs what it installs. 98-utah-enable-default.preset outranks Hummingbird's catch-all with GNOME OS's and Dakota's explicit disables, the Utah-only units that must stay off, then `enable *`. 85-utah-desktop.preset shrinks to the units Hummingbird's own 80/90 presets decide differently. configure-services.sh drops its per-unit enable list and runs `systemctl preset-all`, so the image carries the first-boot state and the desktop contract checks it. Tests resolve every contract unit against the preset files the way systemd does. Closes #1233 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
GNOME OS and Dakota sync time with systemd-timesyncd. Utah drops Hummingbird's chrony (base.toml [excluded]) and the chrony.conf pool fallback, enables timesyncd over Hummingbird's 90-default disable, and ships GNOME OS's fallback server as a timesyncd.conf.d drop-in (gnome-build-meta core-deps/systemd-base.bst fallback-ntp-servers: gnome.pool.ntp.org). Hummingbird's compiled-in pool does not resolve publicly (#594). The install-date stamp now uses Dakota's files/firstboot units: the .path waits for /run/systemd/timesync/synchronized, so the date written is a synced one. Closes #1228 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Dakota ships fish from GNOME OS and no zsh. fish leaves [unavailable] (the factory builds it; it was a deliberate exclusion, #419) so base.toml's entry installs, and zsh leaves the base manifest. Common's /etc/zsh files stay, unused, exactly as on Dakota. The repo gate keeps its deliberate-exclusion mechanism with an empty set; its tests use a stand-in. Closes #1230 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copy Dakota's elements/bluefin/zswap-config.bst (20-zswap.toml kargs, 60-zswap.conf sysctls) and swapfile.bst (bluefin-swapfile-init, its oneshot unit, var-swap-swapfile.swap and the static swap.target.wants link), and drop zram-generator(-defaults). Two Utah-only pieces Dakota does not need: - Hummingbird's kernel builds zstd as a module (CONFIG_CRYPTO_ZSTD=m) and zswap resolves zswap.compressor=zstd during kernel init, so a dracut drop-in adds zstd to the initramfs and regenerate-initramfs.sh fails the build if a modular zstd is missing from it. - Utah keeps SELinux: a one-line CIL module labels /var/swap/swapfile swapfile_t (installed into the /usr/lib/selinux store at build time and checked with matchpathcon), and the init script restorecons the file before writing it. Closes #1224 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
/home becomes an empty directory in the image and Dakota's home.mount (files/bindmounts/home.mount) binds /var/home over it, so /home/<user> is the real path rather than a symlink into /var. Dakota's bluefin-migrate-var-home-passwd rewrites legacy /var/home/<user> passwd fields; Utah's copy fixes the fast-path regex that kept Dakota's from ever matching a user entry (projectbluefin/dakota#1491). The build fails if anything lands in the image's /home, home.mount skips when /var/home is missing, and the live ISO writes liveuser's files under /var/home and points its passwd field at /home/liveuser. Closes #1234 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…op containerd Install qemu-kvm, qemu-guest-agent, spice-vdagent, open-vm-tools, hyperv-daemons and toolbox (systemd-container was already in), all published by the factory. libvirt and virtiofsd are pending factory imports (utah-packages#1021, #1147) and go in [unavailable] so check-repos flags them once published. Dakota's presets are already carried: 80-libvirt.preset's disables live in 98-utah-enable-default.preset and its guest-agent enables follow from enable-by-default; the contract now asserts vmtoolsd and qemu-guest-agent enabled and libvirt's sockets off. `ujust setup-virtualization` and `manage-virtualization` run Dakota's files/just-overrides/devmode.py, shipped verbatim as /usr/libexec/dakota-devmode, and explain the missing libvirt until it lands. containerd and runc are excluded; podman runs on crun. Closes #1232 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace Common's default.just, system.just and flutter.just with Dakota's (files/just-overrides at bf271777), plus the two Brewfiles system.just reads. Issue links and rebase-helper target Utah; recipes that drive Dakota's signed systemd-boot chain point at #1225, and toggle-network-monitoring explains the missing nethogs mount. Utah's enroll-secure-boot-key override is dropped in favour of the vendored stub. The ujust test harness now loads the shipped files instead of a mock default.just, and covers the stubs and the Utah issue links. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Enable authselect's with-systemd-homed so pam_systemd_home is in system-auth and password-auth, as in freedesktop-sdk's PAM stack on Dakota. Drop systemd-homed-firstboot from the enable-by-default disables so it runs on first boot. A drop-in sets SYSTEMD_HOME_FIRSTBOOT_OVERRIDE=0: homectl firstboot still applies home.create.*/home.register.* credentials, but does not prompt on the console for a first user ahead of gnome-initial-setup, which owns account creation. The contract asserts the feature, the PAM and nsswitch lines, the drop-in and both units. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Dakota ships freedesktop-sdk's git-lfs, whose integration command appends a [filter "lfs"] stanza to /etc/gitconfig. Hummingbird's git-lfs writes the same four keys from its %post (git lfs install --system), so Utah installs the package and asserts the stanza in the desktop contract instead of overlaying a copy. Closes #1259 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Dakota ships ifuse (elements/bluefin/ifuse.bst, 1.2.1). The factory builds the same version, so request it in [parity] and assert its factory release in [factory].parity. Closes #1261 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…akota Dakota ships opensc 0.27.1 (freedesktop-sdk-extra components/opensc.bst) and GNOME OS's files/opensc/opensc.module, whose disable-in list keeps goa-daemon, gsd-smartcard, the Evolution data-server factories and gnome-shell from holding a smart card open. The factory builds the same opensc; Utah ships the module config in /etc/pkcs11/modules, which p11-kit reads in place of the RPM's same-named /usr/share/p11-kit/modules copy. pam-pkcs11, which Dakota ships preset-disabled, follows once the factory publishes it (projectbluefin/utah-packages#1030). Closes #1257 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The Containerfile removed /etc/dconf/db/distro.d/05-bluefin-searchlight- extension, which the pinned Common (sha256:9faad517) no longer ships, so the rm and its comment were dead. Utah's copy of pipewire-pulse.conf.d/50-bluefin-bt-switch.conf only added `pulse.cmd = [ ]`, which Common's copy now carries itself; drop the override and pin Common's line in the desktop contract so a Common regression fails the build. Utah keeps tracking Common's latest digest through Renovate rather than Dakota's release tag; the containerfile skill records why. Closes #1267 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* feat(common): apply Dakota's edits to common Match what Dakota's elements/bluefin/common.bst actually ships (#1266): - Ship both monthly-wallpaper units (ublue-wallpaper-month from wallpaper-month.bst, bluefin-wallpaper-month and its sync helper from files/wallpaper-month) and enable them. zz0 keeps common's value, because Dakota's repoint sed matches nothing (projectbluefin/dakota#1902). A guarded check fails the build if common ever names 12-bluefin.xml. - Drop common's weekly-stats fastfetch lines as patch 0006 does, and retire bluefin-stats-refresh, its user and its fastfetch rewrite. - Ghostty skel follows light/dark (patch 0002). - os-release LOGO=img-logo-icon, plus the four img-logo-icon*.svg wordmarks from projectbluefin/artwork, byte-identical to Dakota's pins. Closes #1266 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: James Reilly <jreilly1821@gmail.com> * feat(input): kanata and ydotool replace input-remapper, as on Dakota (#1303) * feat(input): kanata and ydotool replace input-remapper, as on Dakota Dakota remaps keys with kanata (bluefin/kanata.bst) and ships ydotool (bluefin/ydotool.bst); it has no input-remapper. Install the factory's kanata and ydotool and drop input-remapper with its enablement and contract entry. kanata.service stays opt-in, as Dakota's 80-kanata.preset keeps it: Utah's preset, configure-services.sh and the contract's disabled list agree, and the e2e checks the unit loads without failing. Closes #1222 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: James Reilly <jreilly1821@gmail.com> * fix(uupd): promote dakota-config-uupd config over Common's copy Common already ships /etc/uupd/config.json, so rpm wrote the package's copy as .rpmnew and the desktop contract failed on bat-min-percent. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
There was a problem hiding this comment.
Summary: This change makes Utah install ready-made configuration packages from Dakota (the reference Bluefin image) instead of hand-copied files. Since the last review, the earlier problem with the update tool's settings file is fixed. The branch now also carries two other finished changes that were merged into it (monthly wallpaper, logo and fastfetch tweaks, and swapping the key-remapping tool), but the description does not mention them, so one of their tracking issues will stay open after this lands.
What I need from you: Update the PR description to cover the two merged-in changes and add Closes #1266.
Re-review of delta d4b9108d..42cc9997 (one commit: the squash of #1302, which itself carries #1303).
Prior finding - fixed: [correctness] Common's /etc/uupd/config.json pre-empting dakota-config-uupd's %config(noreplace) copy. scripts/configure-services.sh:424-428 now moves /etc/uupd/config.json.rpmnew over the Common file. It runs after the package transaction (Containerfile:377) and before the contract check (Containerfile:380), and contracts/bluefin-desktop.toml:340-342 pins Dakota's "bat-min-percent": 20. So the build fails if Common's file ever wins again.
intent-alignment
-
The PR body describes only #1265; the head also ships #1266 and #1222 (low, in-scope). The delta is the squash of #1302 (
Closes #1266) and #1303 (#1222). Both were merged into this branch, not intomain. As a result, this PR now also does the following, and the body says nothing about any of it:- It adds two monthly-wallpaper units and a sync helper (
system_files/shared/usr/lib/systemd/system/{ublue,bluefin}-wallpaper-month.service,system_files/shared/usr/libexec/bluefin-wallpaper-month-sync). - It drops the weekly-stats fastfetch lines and
bluefin-stats-refresh(scripts/configure-services.sh:145-170). - It changes the Ghostty dual theme (
scripts/configure-services.sh:172-185) and the os-release logo (Containerfile:73-79). - It replaces
input-remapperwithkanata/ydotool(packages/base.toml:70,packages/utah.toml:425-430,scripts/configure-services.sh:281-283).
Closing keywords do not fire on merges into non-default branches. #1266 is still OPEN and is not named here, so it will not close when this PR lands. #1222 already shows CLOSED, but its work only reaches
mainthrough this PR.Fix: append to the PR body:
+**Also carries (stacked, merged into this branch):** +- #1302 — Dakota's edits to common: both monthly-wallpaper units, weekly-stats fastfetch drop (bluefin-stats-refresh removed), Ghostty light/dark skel theme, os-release `LOGO=img-logo-icon` and its four wordmarks. +- #1303 — kanata and ydotool replace input-remapper (opt-in, as on Dakota; #1222). + Closes #1265 +Closes #1266
- It adds two monthly-wallpaper units and a sync helper (
Not verified: no image was built. The wallpaper units and the kanata opt-in state were judged from the unit files, the presets and the e2e checks (iso/scripts/luks-e2e.sh:436-449), not from a booted system.
No findings from: correctness, security, style, docs-currency.
Confidence: 3/5 (needs attention) — 1 perspective requested changes
-- hive: agent=reviewer backend=claude model=claude-opus-5-5 effort=medium claude=2.1.327
# Conflicts: # Containerfile # README.md # docs/skills/package-contract.md # site/data/packages.json # tests/test_home_root.py
Owner decision on #1238: Utah keeps Fedora's account model so Fedora users have a clean migration path, and GNOME OS has not moved to homed either. authselect's with-systemd-homed, the homed-firstboot drop-in and the homed PAM/nsswitch assertions go; systemd-homed-firstboot.service is disabled in 98-utah-enable-default.preset and listed in [services].disabled, so enable-by-default cannot bring back its console prompt. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Dakota's toggle-user-motd toggled ~/.config/no-show-user-motd, but Common's uwelcome.sh keeps the banner state in ~/.config/uwelcome/disabled, so the recipe could never bring the banner back. check-local-overrides was gone, and the testsuite runs it on Utah. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
kargs.d/20-zswap.toml sets zswap.enabled=1 zswap.compressor=zstd on every image, but x86_64_defconfig has neither, so on the gaming flavors the swapfile ran uncompressed. Both are built in (zswap initialises before the initramfs could load a zstd module) and gated; the ZRAM option and gate go with zram-generator. This rebuilds the kernel cache once. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
# Conflicts: # README.md # docs/skills/package-contract.md # site/data/packages.json
Regenerate GAP.md, site data and doc counts; keep kanata's installed triage reason; ghostty is main's Flatpak-first waiver. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
At factory c288398 virtiofsd publishes, but qemu-common needs ipxe-roms-qemu and qemu-ui-sdl needs SDL2_image, neither in the factory or Hummingbird, and libvirt is unpublished. Keep all five in [unavailable], tracked by the reopened utah-packages#1021, and stop claiming QEMU/KVM is installed. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
#1309 moved services to enable-by-default with preset-all, so the per-unit enable lines this branch added are dropped; kanata stays off through 98's 80-kanata disable. dakota-config-firstboot-date owns ublue-firstboot-date's units and script, so Utah's copies go and two drop-ins keep their Utah descriptions. bluefin-stats-refresh is gone, so its preset line goes too. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The merge of main brought back ffmpegthumbnailer in package-contract.md. The manifest installs gst-thumbnailers (#1262) and lists it in [factory].parity, so the doc says so again. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ta-config-packages
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. ℹ️ Sentinel: informational, author is trusted (owner), merge is not blocked. Head
No |
Conflicts: packages/utah.toml kept both sides (#1359 tools and this PR's ifuse/opensc/gst-thumbnailers); README and package-contract counts regenerated. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…1295) GNOME OS ships Noto Serif CJK beside the Sans CJK set Utah already carries, and Dakota's bluefin/nerd-fonts-symbols.bst adds the icon-only Symbols Nerd Font as the fallback for common's fastfetch config. Install both factory packages. nerd-fonts-symbols ships 10-nerd-font-symbols.conf in conf.avail and enables it from /etc/fonts/conf.d itself, as the element does; the desktop contract asserts both paths. Closes #1240 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: James Reilly <jreilly1821@gmail.com>
baselines/ taken from main (#1363 already carries this PR's triage); counts regenerated. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…into feat/dakota-config-packages Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…g-packages utah.toml keeps both sides; counts regenerated. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Pre-merge: head |
Consumes the subpackages projectbluefin/utah-packages#1018 builds from Dakota's and gnome-build-meta's configuration elements (list and ownership rules: utah-packages
docs/skills/config-packages.md), and carries the two PRs stacked on it, already merged into this branch: Dakota's edits to common (#1302) and kanata/ydotool (#1303), plus the Noto Serif CJK and Symbols Nerd Font fonts (#1295, which the hive merged into this branch on 2026-11-20).Config subpackages (#1265)
[parity]+[factory].parity) dakota-config-{composefs-loop-udisks-ignore, custom-command-menu-dconf, firstboot-date, flatpak-apps, kexec-disable, network, ntsync-modules-load, rpcbind-preset, sudo-linuxbrew-path, tailscale-preset, tailscale-setup, udev-groups, user-avatars, uupd, wireplumber-pcsp} and gnome-os-config-{hidraw-udev, journald-config, modprobe-config, systemd-presets, uinput, wpa-supplicant-config}.51-disable-pcsp.conf,60-kexec-disable.conf,uupd.rules,/etc/uupd/config.json,uupd-manual.service, BudsLink preinstall,ublue-firstboot-date.{service,path}and/usr/bin/ublue-firstboot-date(the copies feat(dakota): structural parity and quick wins (folded #1284…#1300, #1278…#1289) #1309 added; the package's are byte-identical apart from the Description),ublue-booted-image.service,ublue-booted-image-sync,08-dakota-extension-defaultsandutah-udev-groups.conf.ublue-firstboot-date.{service,path}.d/10-utah-description.conf) keep the Utah descriptions feat(dakota): structural parity and quick wins (folded #1284…#1300, #1278…#1289) #1309 introduced on review, since the package ships Dakota's units verbatim. The contract asserts both, plus the path unit'sPathExists=/run/systemd/timesync/synchronized.dakota-config-uupd's units replace common's copies (pinned byfile_contains); itsconfig.jsonwins over common's.rpmnewbeforesystemctl preset-all.[Install]is on through98-utah-enable-default.preset, so this PR adds no per-unit enables;bluefin-remove-installer.service, the month units andublue-firstboot-date.pathare asserted in[services].enabled.Dakota's edits to common (#1266, from #1302)
ublue-wallpaper-month,bluefin-wallpaper-month+ sync helper); zz0 keeps common's value (Dakota's repoint matches nothing, common.bst: monthly wallpaper repoint is a no-op (sed targets 12-bluefin.xml, common ships 06) dakota#1902), with a guarded check.bluefin-stats-refresh, its user and its preset line retired.LOGO=img-logo-iconplus the wordmarks.kanata and ydotool (#1222, from #1303)
kanataandydotoolinstalled;input-remapperdropped.kanata.servicestays opt-in (Dakota's80-kanatadisable in98-utah-enable-default.preset, contractdisabled).Factory: everything resolves at the c288398 pin (#1347):
check-repo-availability.pyresolves 366 packages for this stack.Closes #1265
Closes #1266
Closes #1222
Closes #1240
Verification:
umask 022; just checkpasses.