Repository navigation
feat(common): apply Dakota's edits to common - #1302
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danathar, 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 ( Failing checks:
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 (1 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. No Common feature or testsuite scenario breaks. Checked:
- The fastfetch edit gives output byte-identical to Dakota's patch 0006 on common
07d6b3e, and the Ghostty theme edit equals patch 0002. Both fail closed if Common's files change shape. - The
img-logo-iconSVG hashes match the lock (artwork72c74bad). - The month units are byte-identical to Dakota's and inert, as there (dakota#1902).
- The
12-bluefin.xmlguard passes on Common's current06-bluefin.xml.
Visible changes: the two weekly-stats lines leave fastfetch and the runtime refresher (#860) is gone, new users' Ghostty follows light/dark, and the About and Initial Setup logo becomes the wordmark. Question for the owner: #1266 has no explicit decision on retiring bluefin-stats-refresh, and Dakota's reason for patch 0006 (no network at build time) doesn't apply to Utah, which refreshed at runtime. It fits "Dakota is the only parity target" (#1248), but please confirm on #1266. Housekeeping: this stack sits on closed #1273's branch with the old pin 523507b8, so the red contract is that stale base, not this commit. Rebase onto #1248 or #1309.
There was a problem hiding this comment.
Summary: This change makes Bluefin's Utah image match the changes the sister image, Dakota, makes to the shared Bluefin desktop files: two new monthly-wallpaper services, removing the weekly community stats from the terminal greeting, a terminal theme that follows light/dark mode, and new logo images. I found nothing that blocks it. There is one small bug that came over unchanged from Dakota: one of the wallpaper services always picks December. Nothing reads its result, so users won't see any effect today.
correctness (out of scope, low; the same bug exists in Dakota)
system_files/shared/usr/lib/systemd/system/ublue-wallpaper-month.service:8: systemd expands ${VAR} itself in ExecStart=, even inside single quotes, before bash ever runs. ${month} isn't in the unit's environment, so systemd replaces it with an empty string. bash then tests /usr/share/backgrounds/bluefin/-bluefin.xml, which doesn't exist, so the [ -e "$target" ] || fallback always runs and the link points at 12-bluefin.xml every month. ($target is safe because it isn't in ${} form.) This file is byte-identical to Dakota's files/firstboot/ublue-wallpaper-month.service at testing, and the PR says nothing reads /var/lib/ublue-os/current-bluefin.xml (docs/skills/desktop-contract/references/dakota-common-edits.md:16). So keeping it as-is is faithful parity. The fix belongs upstream in Dakota, and Utah can take it later:
-ExecStart=/bin/bash -c 'mkdir -p /var/lib/ublue-os; month="$(date +%%m)"; target="/usr/share/backgrounds/bluefin/${month}-bluefin.xml"; ...
+ExecStart=/bin/bash -c 'mkdir -p /var/lib/ublue-os; month="$(date +%%m)"; target="/usr/share/backgrounds/bluefin/$${month}-bluefin.xml"; ...The other month unit, bluefin-wallpaper-month.service, calls a script (/usr/libexec/bluefin-wallpaper-month-sync), so systemd doesn't touch its variables and it doesn't have this bug.
What I checked against issue #1266: all four checklist items are covered. The zz0 repoint is intentionally left out, and that's documented and guarded (scripts/configure-services.sh:387-396). The stats decision is to drop them, as Dakota does. Patch 0004 is excluded as the issue says. I didn't build an image, so the rendered logo and theme are unverified.
No findings from: security, intent-alignment, style, docs-currency.
Confidence: 5/5 (safe)
— hive: agent=reviewer-2 backend=claude model=claude-opus-5-5 effort=medium claude=2.1.325
Review follow-ups (below
|
cf20e6b to
7a5e52c
Compare
89b2574 to
41c0b38
Compare
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>
…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 update pulls a second, already-merged change into this pull request: the keyboard-remapping tool it ships is swapped from the old one (input-remapper) to the one Dakota uses (kanata, plus its helper ydotool), kept off until a user opts in. It also makes Dakota's update-checker settings win over the shared base's copy. Both changes look correct and the image builds pass on this revision, but the pull request's description mentions neither, so whoever merges it should know they come along.
Delta re-review of 9edb336d..2a4ade4b (one commit, the merged stacked PR #1303). Previous review had no findings; nothing to mark fixed or still present.
intent-alignment
- Low, advisory. The PR body describes only the #1266 common edits, but the head now also carries #1222's kanata/ydotool swap (
packages/utah.toml:425-430,85-utah-desktop.preset:63-66,contracts/bluefin-desktop.toml:159-166) and an unrelated uupd config fix (scripts/configure-services.sh:424-428, moves/etc/uupd/config.json.rpmnewover common's copy). That last change is in neither #1302's nor #1303's description. #1303 merged into this branch, notmain, so itsCloses #1222will not fire. Suggest adding a line to the body: "Includes #1303 (kanata and ydotool replace input-remapper, closes #1222) and a uupd fix: Dakota'sconfig.jsonreplaces common's.rpmnewcollision."
Checked: the factory dependencies #1303 called blockers (utah-packages#1134, #1150) both merged on 2026-11-16, and build_main / image (main, utah, testing, x86_64) and contract passed at 2a4ade4b. Package counts agree (60 + 283 = 343 in site/data/packages.json). disable_unit is guarded by unit_exists (configure-services.sh:28-30), and the e2e kanata check requires only loaded and not failed (luks-e2e.sh:375-397), which matches an opt-in unit with ConditionPathExists.
No findings from: correctness, security, style, docs-currency.
Confidence: 5/5 (safe)
— hive: agent=reviewer backend=claude model=claude-opus-5-5 effort=medium claude=2.1.326
| # dakota-config-uupd (Dakota's elements/bluefin/uupd.bst), which replaces | ||
| # Common's four-a-day uupd.timer with the daily 04:00 one, as on Dakota. | ||
| install -Dm0755 /tmp/uupd/uupd /usr/bin/uupd | ||
| # Common ships its own /etc/uupd/config.json, so rpm installs the package's |
There was a problem hiding this comment.
intent-alignment (low, advisory): this uupd .rpmnew fix is not described in this PR or in #1303. It looks correct, but please name it in the PR body so it isn't a surprise at merge.
There was a problem hiding this comment.
I checked the build-time patches in this PR against common's current files, and they look correct to me. One note on upgrade messaging below. The image builds were still running when I read this head.
Checked against projectbluefin/common main:
- Fastfetch weekly-stats drop (
scripts/configure-services.sh): I ran the embedded Python on common'ssystem_files/bluefin/usr/share/ublue-os/fastfetch.jsonc. It removes the two stat objects and the trailing"break"(count 1), and the result still parses. A second run is a no-op (exit 0). The install-date patch that runs before it changes a different entry, so the two do not interfere. - zz0 guard: common's override has
picture-uri='file:///usr/share/backgrounds/bluefin/06-bluefin.xml'(line 8). That matches the[0-9]{2}-bluefin.xmlshape and is not12-bluefin.xml, so the build passes, and the per-user rotator stays in charge as the comment says. - Ghostty: common's
etc/skel/.config/ghostty/config.ghostty:11is exactlytheme = Catppuccin Mocha, so thesedmatches. /etc/uupd/config.json: common does ship one (system_files/shared/etc/uupd/config.json). The.rpmnewswap is guarded by-f, so it is harmless if rpm did not write one.- input-remapper to kanata/ydotool follows the owner decision in #1222.
Info, not a blocker: the two new month units each maintain a symlink that nothing reads yet (/var/lib/ublue-os/current-bluefin.xml and /var/lib/bluefin/backgrounds/current-bluefin.xml). The comments say this is deliberate, for parity. Separately, existing installs that used input-remapper lose their remaps on upgrade, because the package and its enabled unit both go away. A line in the release notes would save some confused reports.
Confidence: 5/5 (safe)
-- hive: agent=reviewer-2 backend=claude model=claude-opus-5-5 effort=medium claude=2.1.327
|
Merged by hive contributor-lane auto-merge: CI green for ≥30m, reviewer verdict approve, @hanthor was auto-promoted after 5 clean merged PRs in this hive's repositories. |
Applies the edits Dakota's
elements/bluefin/common.bst(testing @ bf271777) makes to projectbluefin/common, so the composed image matches what Dakota actually ships. Stacked on #1297. No factory dependency.What changed
Monthly wallpaper: Utah now ships both month units Dakota ships:
ublue-wallpaper-month.service(bluefin/wallpaper-month.bst, fromfiles/firstboot).bluefin-wallpaper-month.servicewith/usr/libexec/bluefin-wallpaper-month-sync(files/wallpaper-month).Both are enabled in the preset,
configure-services.shand the contract[services]. zz0 keeps common's value. Dakota's sed repoints12-bluefin.xml, but common names06-bluefin.xml, so the sed is a no-op (filed as common.bst: monthly wallpaper repoint is a no-op (sed targets 12-bluefin.xml, common ships 06) dakota#1902). A guarded check fails the build if common ever names12-bluefin.xml, because Dakota's repoint would then apply.Weekly stats (patch 0006):
configure-services.shdrops common's two weekly-stats fastfetch entries and the break after them. The result is byte-identical to applying Dakota's patch to common 07d6b3e (checked locally).bluefin-stats-refresh(service, timer, script,bluefin-statssysusers entry) and its fastfetch rewrite are removed.Ghostty dual theme (patch 0002): a guarded sed sets
/etc/skel/.config/ghostty/config.ghosttytotheme = light:Catppuccin Latte,dark:Catppuccin Mocha. The contract asserts the file and the line.Logos: os-release
LOGO=img-logo-icon, as in Dakota'sinclude/os-release.yml. The artwork stage installs/usr/share/pixmaps/img-logo-icon{,-text}.svg(light) andimg-logo-icon{,-text}-dark.svg(dark).config/artwork.lockgainsbluefin-logo-light.svg.de74de65(d336d743…,4ae1d486…).Not applied: patch 0004 (Utah needs the Red Hat GPG entries for Hummingbird). Patch 0003 already shipped as the uwelcome guard.
Docs and baseline: new
desktop-contract/references/dakota-common-edits.md(replacesstats-refresh.md), plus updates todesktop-contract.mdandabout-artwork.md. Triage marksublue-wallpaper-month.serviceplanned (parity(dakota): Dakota's edits to projectbluefin/common #1266). The e2e unit list swaps the stats timer for the two month units.Closes #1266
Verification
umask 022; just checkpassed.pre-commit runon the changed files passed.DakotaCommonEditTestscovers the stats drop, the skel sed and the zz0 guard: each is idempotent and fails closed.