diff --git a/Containerfile b/Containerfile
index 99ab66223..cc4e5145f 100644
--- a/Containerfile
+++ b/Containerfile
@@ -48,6 +48,9 @@ RUN /usr/local/libexec/utah-install-v4l2loopback base /out
# - /out/branding/bluefin-logo-dark.svg is the source for the GDM greeter logo,
# which configure-branding.sh renders after the package transaction because
# nothing in this stage can rasterize an SVG.
+# - img-logo-icon{,-dark,-text,-text-dark}.svg are the os-release LOGO icon
+# and the variants Settings looks up beside it: the light and dark Bluefin
+# wordmarks, as Dakota's common.bst installs them (#1266).
# Sources other than the wallpaper image are commit-pinned with sha256 in
# config/artwork.lock and verified by scripts/fetch-artwork.sh.
FROM ${BASE_IMAGE} AS artwork
@@ -67,7 +70,13 @@ RUN set -eu; \
/artwork/scripts/fetch-artwork.sh assets/vector/icons/logo-menu/logo-utahraptor-menu.svg \
/out/overlay/usr/share/icons/hicolor/scalable/actions/ublue-logo-symbolic.svg; \
/artwork/scripts/fetch-artwork.sh assets/vector/logos/bluefin/bluefin-logo-dark.svg \
- /out/branding/bluefin-logo-dark.svg
+ /out/branding/bluefin-logo-dark.svg; \
+ pix=/out/overlay/usr/share/pixmaps; \
+ /artwork/scripts/fetch-artwork.sh assets/vector/logos/bluefin/bluefin-logo-light.svg \
+ "$pix/img-logo-icon.svg"; \
+ install -m0644 "$pix/img-logo-icon.svg" "$pix/img-logo-icon-text.svg"; \
+ install -m0644 /out/branding/bluefin-logo-dark.svg "$pix/img-logo-icon-dark.svg"; \
+ install -m0644 /out/branding/bluefin-logo-dark.svg "$pix/img-logo-icon-text-dark.svg"
# Stage source origins without committing their COPY mtimes to the runtime image.
FROM scratch AS inputs
@@ -326,12 +335,9 @@ ARG ENABLE_SSHD=0
# is otherwise unverified. Both move together, so Renovate updates both.
ARG UUPD_VERSION=v1.5.5
ARG UUPD_SHA256=d8d420a153de11589abad3292eef2131a75ac3487414065a2661a558ef0d027c
-# The two systemd units come from raw.githubusercontent at the same tag, and a
-# git tag move changes what raw.* serves for them without touching the release
-# asset the checksum above covers. uupd.service runs as root on a timer, so
-# verify the units against their own digests too; all four ARGs move together.
-ARG UUPD_SERVICE_SHA256=65dd2b64dcb6a9f77227612aa624ef17fe43b32eb835b51d7d22a22755dc21a8
-ARG UUPD_TIMER_SHA256=bbb5f098ec33d047bdef571e0bc112364df157e0f92d73e0febab703c4a3c099
+# The units, uupd-manual.service, the polkit rule and /etc/uupd/config.json
+# are Dakota's (elements/bluefin/uupd.bst), installed by the factory's
+# dakota-config-uupd package; only the binary is downloaded here.
# Hummingbird defaults to a server preset that disables unlisted services;
# Utah's presets enable them instead, as Dakota does (#1233).
@@ -361,12 +367,6 @@ RUN --mount=type=bind,from=artwork,source=/out/branding,target=/tmp/utah-artwork
-o /tmp/uupd/uupd_Linux_x86_64.tar.gz && \
echo "${UUPD_SHA256} /tmp/uupd/uupd_Linux_x86_64.tar.gz" | sha256sum --check --strict && \
tar -xzf /tmp/uupd/uupd_Linux_x86_64.tar.gz -C /tmp/uupd && \
- curl -fsSL "https://raw.githubusercontent.com/ublue-os/uupd/${UUPD_VERSION}/uupd.service" \
- -o /tmp/uupd/uupd.service && \
- curl -fsSL "https://raw.githubusercontent.com/ublue-os/uupd/${UUPD_VERSION}/uupd.timer" \
- -o /tmp/uupd/uupd.timer && \
- echo "${UUPD_SERVICE_SHA256} /tmp/uupd/uupd.service" | sha256sum --check --strict && \
- echo "${UUPD_TIMER_SHA256} /tmp/uupd/uupd.timer" | sha256sum --check --strict && \
/usr/local/libexec/utah-build-gnome-extensions && \
/usr/local/libexec/utah-verify-gnome-extensions --record-provenance && \
glib-compile-schemas /usr/share/glib-2.0/schemas && \
diff --git a/README.md b/README.md
index 998376f73..af1b2e506 100644
--- a/README.md
+++ b/README.md
@@ -72,8 +72,8 @@ Bluefin's `base.toml` and is now edited by hand as Dakota parity work lands.
| | count |
| --- | --- |
-| Base manifest installed | **58** |
-| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 308 |
+| Base manifest installed | **57** |
+| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 333 |
| Genuinely unavailable | **9** |
## Known gaps
diff --git a/config/artwork.lock b/config/artwork.lock
index 7ab087bf0..3a6ec9d0e 100644
--- a/config/artwork.lock
+++ b/config/artwork.lock
@@ -9,4 +9,5 @@
commit 72c74badbdd7c60d006e89aca74e248316dddd54
c3ce8a475deb9faa4efd7cb4bfab1dd5ef3b12cc48772a3ccf375c709c58711d assets/raster/dinos/jacob-schnurr/utah/utah-look/black-outline/utah-look-black-outline.png
4ae1d486e6e73743fad1e1ef625615c4a28e72bbcc0a966ba3c5294303e4e380 assets/vector/logos/bluefin/bluefin-logo-dark.svg
+d336d743082bded58c561c2c53baf1896dae87d7346224d9d06512e6c247cf74 assets/vector/logos/bluefin/bluefin-logo-light.svg
be56a85e4fa93bbc2674a07b4b7d5a9eb8c95ca28eb6dea6cac66aeb9853492d assets/vector/icons/logo-menu/logo-utahraptor-menu.svg
diff --git a/contracts/bluefin-desktop.toml b/contracts/bluefin-desktop.toml
index 3b70471f4..1b4cee315 100644
--- a/contracts/bluefin-desktop.toml
+++ b/contracts/bluefin-desktop.toml
@@ -28,8 +28,12 @@ files = [
"/usr/share/bluefin-artwork-logos/bluefin-logo-dark.png",
"/usr/share/icons/hicolor/scalable/actions/ublue-logo-symbolic.svg",
"/usr/share/icons/hicolor/icon-theme.cache",
- # The os-release LOGO icon; common ships Bluefin's raptor under this name.
- "/usr/share/pixmaps/fedora-logo-icon.png",
+ # The os-release LOGO icon and the names GNOME looks up beside it, Bluefin's
+ # artwork wordmarks as Dakota installs them (common.bst, #1266).
+ "/usr/share/pixmaps/img-logo-icon.svg",
+ "/usr/share/pixmaps/img-logo-icon-dark.svg",
+ "/usr/share/pixmaps/img-logo-icon-text.svg",
+ "/usr/share/pixmaps/img-logo-icon-text-dark.svg",
# The boot splash watermark the bgrt theme draws (Bluefin's raptor, from
# common); fedora-logos owns and erases this path during the logo swap.
"/usr/share/plymouth/themes/spinner/watermark.png",
@@ -38,8 +42,6 @@ files = [
"/usr/share/backgrounds/bluefin/01-bluefin.xml",
"/usr/share/backgrounds/bluefin/06-bluefin.xml",
"/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override",
- "/usr/share/ublue-os/fastfetch-user-count",
- "/usr/share/ublue-os/bazaar-install-count",
"/usr/bin/chairlift-helper",
"/usr/share/polkit-1/actions/io.projectbluefin.chairlift.ublue.policy",
]
@@ -57,7 +59,7 @@ VENDOR_URL = "https://projectbluefin.io"
DEFAULT_HOSTNAME = "bluefin"
VERSION_CODENAME = "Utahraptor"
IMAGE_ID = "utah"
-LOGO = "fedora-logo-icon"
+LOGO = "img-logo-icon"
[branding.os_release_patterns]
PRETTY_NAME = '^Bluefin \(Version: .+\)$'
@@ -109,7 +111,11 @@ files = [
"/etc/dconf/db/distro.d/02-bluefin-keybindings",
"/etc/dconf/db/distro.d/03-bluefin-ptyxis-palette",
"/etc/dconf/db/distro.d/04-bluefin-custom-command-menu",
+ # Dakota's extension defaults and keybindings (dakota-config-custom-command-menu-dconf).
+ "/etc/dconf/db/distro.d/06-dakota-keybindings",
"/etc/dconf/db/distro.d/08-dakota-extension-defaults",
+ # Dakota's avatar directories (dakota-config-user-avatars).
+ "/etc/dconf/db/distro.d/07-dakota-avatar-directories",
"/etc/dconf/db/distro.d/locks/01-bluefin-locked-settings",
# GDM greeter logo. GDM uses its own "gdm" dconf profile (provided by the
# gdm RPM at /etc/dconf/profile/gdm); without this keyfile gnome-shell
@@ -129,15 +135,21 @@ files = [
# fails the health check. The drop-in widens the burst window; #741.
"/usr/lib/systemd/system/projectbluefin-countme.service.d/10-utah-burst-tolerance.conf",
# Dakota desktop parity (#675): first-boot install-date stamping and the
- # booted-image snapshot for fastfetch. Wallpaper rotation stays with
- # Common's per-user timer (see configure-services.sh), so the Dakota month
- # symlink units are intentionally not shipped. The install date is written
- # once timesyncd reports a sync (Dakota's ublue-firstboot-date.path, #1228).
+ # booted-image snapshot for fastfetch, plus the one-shot removal of the live
+ # ISO's installer Flatpak, all from dakota-config-firstboot-date (#1265).
+ # The install date is written once timesyncd reports a sync (Dakota's
+ # ublue-firstboot-date.path, #1228).
"/usr/lib/systemd/system/ublue-firstboot-date.path",
"/usr/lib/systemd/system/ublue-firstboot-date.service",
"/usr/bin/ublue-firstboot-date",
"/usr/lib/systemd/system/ublue-booted-image.service",
"/usr/bin/ublue-booted-image-sync",
+ "/usr/lib/systemd/system/bluefin-remove-installer.service",
+ # Dakota's two monthly-wallpaper units (#1266); the default wallpaper stays
+ # common's (see configure-services.sh).
+ "/usr/lib/systemd/system/ublue-wallpaper-month.service",
+ "/usr/lib/systemd/system/bluefin-wallpaper-month.service",
+ "/usr/libexec/bluefin-wallpaper-month-sync",
# GNOME OS's fallback NTP server for systemd-timesyncd (#1228).
"/usr/lib/systemd/timesyncd.conf.d/10-gnome-os-fallback-ntp.conf",
# Common files configure-services.sh patches or checks for Dakota parity.
@@ -147,6 +159,15 @@ files = [
"/usr/bin/ublue-image-info.sh",
"/usr/libexec/ublue-booted-image",
"/etc/profile.d/uwelcome.sh",
+ "/etc/skel/.config/ghostty/config.ghostty",
+ # Dakota's key remapper and its uinput helper (#1222): kanata's opt-in unit
+ # and preset, and ydotool's uinput udev rule and modules-load drop-in.
+ "/usr/bin/kanata",
+ "/usr/lib/systemd/system/kanata.service",
+ "/usr/lib/systemd/system-preset/80-kanata.preset",
+ "/usr/bin/ydotool",
+ "/usr/lib/udev/rules.d/80-ydotool.rules",
+ "/usr/lib/modules-load.d/ydotool.conf",
# Dakota's shell defaults (projectbluefin/dakota elements/bluefin/common.bst).
"/etc/profile.d/bluefin-shell-defaults.sh",
# Common's Red Hat signature policy uses the unsuffixed key path. The pinned
@@ -156,12 +177,17 @@ files = [
"/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release-2",
# Plymouth stays graphical with Hummingbird's console=ttyS0 karg (#461).
"/usr/lib/bootc/kargs.d/10-utah-plymouth.toml",
- # Dakota system defaults (projectbluefin/dakota elements/bluefin/
- # wireplumber-pcsp.bst, kexec-disable.bst, networkmanager-polkit.bst).
- # Hummingbird's NetworkManager RPM already ships Dakota's wheel rule at the
- # same path, so Utah asserts it but must not overlay its own copy.
+ # Dakota system defaults, from the factory's dakota-config and
+ # gnome-os-config subpackages (#1265): wireplumber-pcsp, kexec-disable,
+ # udev-groups, composefs-loop-udisks-ignore, journald-config.
+ # Hummingbird's NetworkManager RPM already ships Dakota's wheel rule
+ # (networkmanager-polkit.bst) at the same path, so Utah asserts it but must
+ # not overlay its own copy.
"/usr/share/wireplumber/wireplumber.conf.d/51-disable-pcsp.conf",
"/usr/lib/sysctl.d/60-kexec-disable.conf",
+ "/usr/lib/sysusers.d/bluefin-udev-groups.conf",
+ "/usr/lib/udev/rules.d/90-hide-composefs-loop.rules",
+ "/usr/lib/systemd/journald.conf.d/90-persistent-journal.conf",
# Dakota's zswap and disk-backed swapfile (elements/bluefin/zswap-config.bst,
# swapfile.bst), plus the zstd initramfs driver and swapfile_t label Utah's
# kernel and SELinux need (#1224). The swap unit is wanted statically.
@@ -189,7 +215,8 @@ files = [
"/usr/share/polkit-1/rules.d/org.freedesktop.NetworkManager.rules",
# Dakota's elements/bluefin/uupd.bst: the update units, user-startable
# manual updates, and the hardware-check config that replaces Common's
- # distrobox-only one. file_contains below pins the units' contents.
+ # distrobox-only one (dakota-config-uupd; the binary is downloaded by the
+ # Containerfile). file_contains below pins the units' contents.
"/usr/bin/uupd",
"/usr/lib/systemd/system/uupd.service",
"/usr/lib/systemd/system/uupd.timer",
@@ -203,6 +230,10 @@ files = [
"/etc/pkcs11/modules/opensc.module",
# Common's PipeWire drop-in; Utah no longer overrides it (#1267).
"/usr/share/pipewire/pipewire-pulse.conf.d/50-bluefin-bt-switch.conf",
+ # Dakota's Symbols Nerd Font fallback rule (bluefin/nerd-fonts-symbols.bst),
+ # shipped and enabled by the nerd-fonts-symbols package (#1240).
+ "/usr/share/fontconfig/conf.avail/10-nerd-font-symbols.conf",
+ "/etc/fonts/conf.d/10-nerd-font-symbols.conf",
]
[configuration.file_contains]
@@ -234,13 +265,25 @@ files = [
"/usr/lib/systemd/timesyncd.conf.d/10-gnome-os-fallback-ntp.conf" = [
"FallbackNTP=gnome.pool.ntp.org",
]
+# dakota-config-firstboot-date's path unit waits for timesyncd's first sync
+# (#1228); the drop-ins give both units Utah's descriptions.
+"/usr/lib/systemd/system/ublue-firstboot-date.path" = [
+ "PathExists=/run/systemd/timesync/synchronized",
+]
+"/usr/lib/systemd/system/ublue-firstboot-date.path.d/10-utah-description.conf" = [
+ "Description=Record Utah installation date once the clock is synchronized",
+]
+"/usr/lib/systemd/system/ublue-firstboot-date.service.d/10-utah-description.conf" = [
+ "Description=Record Utah first-boot installation date",
+]
# Dakota parity (#675): fastfetch reads the first-boot install date stamped
# by ublue-firstboot-date.service instead of inferring age from /var/log.
"/usr/share/ublue-os/fastfetch.jsonc" = [
"/var/lib/ublue-os/install-date",
- # The community stats come from bluefin-stats-refresh.service's cache (#860).
- "cat /var/cache/bluefin-stats/fastfetch-user-count 2>/dev/null || cat /usr/share/ublue-os/fastfetch-user-count",
- "cat /var/cache/bluefin-stats/bazaar-install-count 2>/dev/null || cat /usr/share/ublue-os/bazaar-install-count",
+]
+# Dakota's patches/common/0002-ghostty-dual-theme.patch (#1266).
+"/etc/skel/.config/ghostty/config.ghostty" = [
+ "theme = light:Catppuccin Latte,dark:Catppuccin Mocha",
]
# Dakota parity (#675): ublue-image-info.sh reads the booted tag through
# Common's ublue-booted-image reader, which falls back to the boot-time
@@ -318,6 +361,11 @@ files = [
"/usr/lib/sysctl.d/60-kexec-disable.conf" = [
"kernel.kexec_load_disabled = 1",
]
+# Udev rules name these groups; dakota-config-udev-groups creates them (#444).
+"/usr/lib/sysusers.d/bluefin-udev-groups.conf" = [
+ "g plugdev",
+ "g nintendo_switch",
+]
# Dakota parity (#1224): zswap in front of /var/swap/swapfile.
"/usr/lib/bootc/kargs.d/20-zswap.toml" = [
'"zswap.enabled=1"',
@@ -390,6 +438,9 @@ files = [
"/usr/share/pipewire/pipewire-pulse.conf.d/50-bluefin-bt-switch.conf" = [
"pulse.cmd = [ ]",
]
+"/etc/fonts/conf.d/10-nerd-font-symbols.conf" = [
+ "Symbols Nerd Font",
+]
[flatpak]
files = [
@@ -399,7 +450,7 @@ files = [
# Spacebar file previews in Files (Sushi), from Flathub (#1015).
"/usr/share/flatpak/preinstall.d/nautilus-previewer.preinstall",
# BudsLink backs the default-enabled BudsLink-Companion extension
- # (projectbluefin/dakota files/oci/bluefin-flatpak/preinstall.d/).
+ # (dakota-config-flatpak-apps: Dakota's files/oci/bluefin-flatpak/preinstall.d/).
"/usr/share/flatpak/preinstall.d/io.github.maniacx.BudsLink.preinstall",
"/etc/flatpak/remotes.d/tuna-os.flatpakrepo",
"/usr/share/ublue-os/privileged-setup.hooks.d/99-flatpaks.sh",
@@ -519,13 +570,15 @@ enabled = [
# qemu-guest-agent unit); each starts only on its hypervisor (#1232).
"vmtoolsd.service",
"qemu-guest-agent.service",
- # Dakota desktop parity (#675).
+ # Dakota desktop parity (#675, #1265).
"ublue-firstboot-date.path",
"ublue-booted-image.service",
+ "bluefin-remove-installer.service",
"bootc-unified-storage.timer",
"brew-setup.service",
"cups.socket",
- "bluefin-stats-refresh.timer",
+ "ublue-wallpaper-month.service",
+ "bluefin-wallpaper-month.service",
"dconf-update.service",
"flatpak-nuke-fedora.service",
"flatpak-preinstall.service",
@@ -535,7 +588,6 @@ enabled = [
# without an [Install] section, so it is D-Bus activated and `systemctl
# enable` is a no-op (the nvidia/gaming image builds failed on it).
"accounts-daemon.service",
- "input-remapper.service",
"ModemManager.service",
"power-profiles-daemon.service",
# Dakota's effective service state (#1233): on by enable-by-default
@@ -668,6 +720,8 @@ disabled = [
"sysstat-collect.timer",
"sysstat-summary.timer",
"sysstat-rotate.timer",
+ # Key remapping is opt-in, as on Dakota (#1222).
+ "kanata.service",
# Utah-only units Dakota does not run (#1233).
"multipathd.service",
"lm_sensors.service",
diff --git a/docs/skills/desktop-contract.md b/docs/skills/desktop-contract.md
index 035f5eea5..70dc36799 100644
--- a/docs/skills/desktop-contract.md
+++ b/docs/skills/desktop-contract.md
@@ -86,14 +86,13 @@ The TOML's sections are the contract's table of contents:
carry active `timers.target.wants` symlinks that bypass uupd staging or undo manual rollbacks.
Switchers can mask them by hand if a local `/etc` symlink survived. uupd matches Dakota ([uupd](desktop-contract/references/uupd.md)).
- `ublue-firstboot-date.path` (Dakota's, waits for timesyncd's first sync, #1228) and `ublue-booted-image.service` are Dakota parity (#675): install-date stamping and the
- booted-image snapshot Common's `/usr/libexec/ublue-booted-image` falls back to.
- `configure-services.sh` patches Common's fastfetch ([stats](desktop-contract/references/stats-refresh.md))
- and `uwelcome.sh` (non-interactive shells skip the greeting), checks image-info ([bootc compatibility](desktop-contract/references/image-info.md)), and applies [Dakota's desktop defaults](desktop-contract/references/dakota-desktop-defaults.md).
- Wallpaper rotation is deliberately NOT Dakota parity: Common's per-user `bluefin-dynamic-wallpaper`
- timer is hemisphere-aware and rotates live at month boundaries, while
- Dakota's boot-time month symlink is northern-only and stale until reboot, so
- repointing the default would stand the better rotator down (#675 decision).
+ The firstboot-date, booted-image and remove-installer units, from `dakota-config-firstboot-date`
+ (#1265), are Dakota parity (#675): install-date stamping once timesyncd reports its first sync
+ (`ublue-firstboot-date.path`, #1228) and the booted-image snapshot Common's
+ `/usr/libexec/ublue-booted-image` falls back to.
+ `configure-services.sh` applies [Dakota's edits to Common](desktop-contract/references/dakota-common-edits.md)
+ (month units, weekly stats, Ghostty theme, logos; #1266),
+ patches `uwelcome.sh` (non-interactive shells skip the greeting), checks image-info ([bootc compatibility](desktop-contract/references/image-info.md)), and applies [Dakota's desktop defaults](desktop-contract/references/dakota-desktop-defaults.md).
bootc applies presets on first boot, so a unit's state comes from the
presets, never from a build-time `systemctl enable` (#98: `flatpak-preinstall`
@@ -182,7 +181,7 @@ one is pending a composefs boot check (see below):
- `Failed to resolve group 'plugdev'` / `'nintendo_switch'`, about 100 lines:
udev rules from libfido2 and common name groups nothing creates.
- `sysusers.d/utah-udev-groups.conf` creates them.
+ `sysusers.d/bluefin-udev-groups.conf` (`dakota-config-udev-groups`, #1265) creates them.
- `fchmod() of / failed: Read-only file system`: systemd's `root.conf`
(`z / 555`) cannot apply to the composefs root. `/etc/tmpfiles.d/root.conf`
masks it by name with a comment-only file.
@@ -315,12 +314,11 @@ a `path=` the extensions ship; it skips when the submodules are not checked out.
GNOME Initial Setup's welcome page shows the icon named by os-release
`LOGO`. Distributor builds of Settings > About use the compiled PNG paths
-described below. Fedora sets `LOGO=fedora-logo-icon` and
-Bluefin keeps it; common overlays the raptor at
-`/usr/share/pixmaps/fedora-logo-icon.png`. Hummingbird's os-release has no
-`LOGO`, so Utah showed the generic GNOME foot with the raptor already on disk.
-`configure-branding.sh` sets it, and the contract asserts both the key and the
-icon file. To check without a build: `bootc usr-overlay`, append the key to
+described below. Hummingbird's os-release has no `LOGO`, so Utah showed the
+generic GNOME foot. `configure-branding.sh` sets `LOGO=img-logo-icon` as
+Dakota does, and the `artwork` stage installs Dakota's four
+`/usr/share/pixmaps/img-logo-icon*.svg` wordmarks (#1266); the contract asserts
+the key and the files. To check without a build: `bootc usr-overlay`, append the key to
`/usr/lib/os-release`, `systemctl restart gdm`, and look at Initial Setup.
## The GDM greeter logo is Bluefin, not Fedora (#378)
@@ -384,7 +382,7 @@ build.
Hummingbird defaults to a server preset and disables unlisted services, so
the desktop policy is applied explicitly. `scripts/configure-services.sh`
mirrors bluefin-lts's `40-services.sh`: it applies the desktop presets,
-enables GDM, input-remapper, firmware updates, Tailscale, uupd, user setup and resolved,
+enables GDM, firmware updates, Tailscale, uupd, user setup and resolved, keeps kanata opt-in,
configures authselect, and removes the extension build toolchain before
cleanup. Lid/sleep stay at logind defaults; Dakota-copied sysctl, WirePlumber
and polkit defaults: [Dakota system defaults](desktop-contract/references/dakota-system-defaults.md).
diff --git a/docs/skills/desktop-contract/references/about-artwork.md b/docs/skills/desktop-contract/references/about-artwork.md
index 145937245..c757f63b3 100644
--- a/docs/skills/desktop-contract/references/about-artwork.md
+++ b/docs/skills/desktop-contract/references/about-artwork.md
@@ -25,8 +25,12 @@ Wallpapers: `/usr/share/backgrounds/bluefin/*` and
`bluefin-wallpapers-gnome` image, overlaid after Common's copy (see the
Containerfile skill). `01-bluefin.xml` and `06-bluefin.xml` are contract files.
The mascot the live installer shows is the Utah black-outline art, staged into
-`iso/live/src/images/utahraptor.png` by the ISO builders; the os-release `LOGO`
-raptor (`fedora-logo-icon.png`) remains Common's.
+`iso/live/src/images/utahraptor.png` by the ISO builders. The os-release `LOGO`
+is `img-logo-icon`, as on Dakota: artwork's `bluefin-logo-light.svg` installed
+as `/usr/share/pixmaps/img-logo-icon.svg` and `img-logo-icon-text.svg`, and
+`bluefin-logo-dark.svg` as the two `-dark` names, all from the
+`config/artwork.lock` commit (the bytes match Dakota's pins at artwork
+`de74de65`; #1266).
## GDM greeter logo
diff --git a/docs/skills/desktop-contract/references/dakota-common-edits.md b/docs/skills/desktop-contract/references/dakota-common-edits.md
new file mode 100644
index 000000000..4bf3d38bb
--- /dev/null
+++ b/docs/skills/desktop-contract/references/dakota-common-edits.md
@@ -0,0 +1,38 @@
+## Dakota's edits to Common (#1266)
+
+Dakota (`elements/bluefin/common.bst`) changes projectbluefin/common's files
+before it installs them. Utah copies Common unedited and applies the same
+edits afterwards, so the composed image matches what Dakota actually ships.
+`configure-services.sh` guards each one: already applied is a no-op, and an
+upstream file of a different shape fails the build. `DakotaCommonEditTests`
+in `tests/test_desktop_contract.py` runs the blocks against Common-shaped and
+foreign input.
+
+- **Monthly wallpaper.** Utah ships both of Dakota's month units:
+ `ublue-wallpaper-month.service` (`bluefin/wallpaper-month.bst`) links
+ `/var/lib/ublue-os/current-bluefin.xml`, and `bluefin-wallpaper-month.service`
+ with `/usr/libexec/bluefin-wallpaper-month-sync` (`files/wallpaper-month`)
+ links `/var/lib/bluefin/backgrounds/current-bluefin.xml`. Both are enabled
+ in the preset, `configure-services.sh` and the contract. Nothing reads
+ either link. Dakota's sed repoints zz0 from `12-bluefin.xml`, but Common
+ names another month, so the sed matches nothing
+ (projectbluefin/dakota#1902). The default stays Common's zz0 value, and
+ Common's per-user `bluefin-dynamic-wallpaper` timer keeps rotating. The
+ build fails if Common's zz0 ever names `12-bluefin.xml`, because Dakota's
+ repoint would then take effect and Utah has to follow it.
+- **Weekly stats.** Dakota's `patches/common/0006-fastfetch-drop-weekly-stats.patch`
+ removes the user-count and Bazaar-installs lines from `fastfetch.jsonc`,
+ along with the break after them. Utah removes the same lines, and the
+ result is byte-identical to the patched file. The runtime refresher
+ `bluefin-stats-refresh` (#860) and its `bluefin-stats` user are gone.
+- **Ghostty theme.** `patches/common/0002-ghostty-dual-theme.patch` sets
+ `/etc/skel/.config/ghostty/config.ghostty` to
+ `theme = light:Catppuccin Latte,dark:Catppuccin Mocha`, so Ghostty follows
+ GNOME's light/dark style.
+- **Logos.** os-release `LOGO=img-logo-icon` and
+ `/usr/share/pixmaps/img-logo-icon{,-text}.svg` (light wordmark),
+ `img-logo-icon{,-text}-dark.svg` (dark), fetched by the `artwork` stage
+ from `config/artwork.lock` ([About artwork](about-artwork.md)).
+- **Not applied:** `0004-policy-drop-redhat-gpg-entries`. Utah needs those
+ entries to verify Hummingbird images. `0003-uwelcome-interactive-only` was
+ already applied as the `uwelcome.sh` guard (#675).
diff --git a/docs/skills/desktop-contract/references/dakota-services.md b/docs/skills/desktop-contract/references/dakota-services.md
index 84abd00a0..d5d0a25b7 100644
--- a/docs/skills/desktop-contract/references/dakota-services.md
+++ b/docs/skills/desktop-contract/references/dakota-services.md
@@ -46,7 +46,6 @@ are never enabled by a preset.
gssproxy, nftables beside firewalld), CNI, and helpers that
need configuration or change the system unasked (brltty, fancontrol,
powertop, xfs_healer, canberra sounds, lastlog2 import, man-db cache).
- `bluefin-stats-refresh.service` runs from its timer only.
- mdadm's `mdcheck_start.timer`, `mdcheck_continue.timer` and
`mdmonitor-oneshot.timer`, although Dakota runs them (#1271). Utah keeps
Fedora's `raid-check.timer` (#1268), and the mdcheck pair would schedule a
@@ -75,11 +74,13 @@ they are harmless: `ratbagd.service` (D-Bus alias), `selinux-check-proper-disabl
`[services].enabled` asserts, in the built image: `avahi-daemon.service`,
`avahi-daemon.socket`, `bluetooth.service`, `ublue-firstboot-date.path`,
-`ublue-booted-image.service`, `bootc-unified-storage.timer`,
-`brew-setup.service`, `cups.socket`, `bluefin-stats-refresh.timer`,
+`ublue-booted-image.service`, `bluefin-remove-installer.service`
+(dakota-config-firstboot-date, #1265), `ublue-wallpaper-month.service`,
+`bluefin-wallpaper-month.service` (#1266), `bootc-unified-storage.timer`,
+`brew-setup.service`, `cups.socket`,
`dconf-update.service`, `flatpak-nuke-fedora.service`,
`flatpak-preinstall.service`, `gdm.service`, `colord.service`,
-`accounts-daemon.service`, `input-remapper.service`, `ModemManager.service`,
+`accounts-daemon.service`, `ModemManager.service`,
`power-profiles-daemon.service`, `rtkit-daemon.service`, `uresourced.service`,
`upower.service`, `udisks2.service`, `polkit-agent-helper.socket`,
`cups.service`, `pcscd.socket`, `gnome-remote-desktop.service`,
@@ -148,6 +149,18 @@ factory (`[unavailable]`, utah-packages#1021: ipxe-roms-qemu and SDL2_image are
missing, libvirt is unpublished); until libvirt lands the recipes say so and
exit. containerd and runc are excluded: podman runs on crun.
+### Key remapping (#1222)
+
+Key remapping is kanata plus ydotool, as on Dakota, and input-remapper is
+gone. The factory's `kanata` ships Dakota's `kanata.service` (DynamicUser,
+`input` group, `/dev/uinput`) and its `80-kanata.preset`
+(`disable kanata.service`); `85-utah-desktop.preset` and the contract's
+`disabled` list keep it off as well. The unit has
+`ConditionPathExists=/etc/kanata/kanata.kbd`, so opt in by writing that file
+and running `systemctl enable --now kanata`. `ydotool` brings Dakota's
+`80-ydotool.rules` (uinput to `input`, uaccess) and the `uinput` modules-load
+drop-in (utah-packages#1134).
+
### User units
The user side keeps a catch-all disable, as GNOME OS does (gnome-build-meta
diff --git a/docs/skills/desktop-contract/references/dakota-system-defaults.md b/docs/skills/desktop-contract/references/dakota-system-defaults.md
index 9a3ce822f..2b7cbe648 100644
--- a/docs/skills/desktop-contract/references/dakota-system-defaults.md
+++ b/docs/skills/desktop-contract/references/dakota-system-defaults.md
@@ -1,16 +1,23 @@
## Dakota system defaults
-Utah copies these small system defaults from Dakota (`testing`) and asserts
-each in `contracts/bluefin-desktop.toml` (`[configuration].files` plus
+Utah installs Dakota's and GNOME OS's configuration elements as the factory's
+`dakota-config-*` and `gnome-os-config-*` subpackages (#1265; element list and
+ownership rules in utah-packages `docs/skills/config-packages.md`), never as
+copies in `system_files`, and asserts the files it relies on in
+`contracts/bluefin-desktop.toml` (`[configuration].files` plus
`file_contains`):
-- `system_files/shared/usr/share/wireplumber/wireplumber.conf.d/51-disable-pcsp.conf`
- (Dakota `files/wireplumber/`, `elements/bluefin/wireplumber-pcsp.bst`) hides
- the PC-speaker ALSA card so it never becomes the default sink after resume.
-- `system_files/shared/usr/lib/sysctl.d/60-kexec-disable.conf` (Dakota
- `elements/bluefin/kexec-disable.bst`) sets `kernel.kexec_load_disabled = 1`;
- bootc upgrades and soft-reboot do not use kexec, and Easy Anti-Cheat
- requires it off.
+- `dakota-config-wireplumber-pcsp`: `51-disable-pcsp.conf` hides the
+ PC-speaker ALSA card so it never becomes the default sink after resume.
+- `dakota-config-kexec-disable`: `60-kexec-disable.conf` sets
+ `kernel.kexec_load_disabled = 1`; bootc upgrades and soft-reboot do not use
+ kexec, and Easy Anti-Cheat requires it off.
+- `dakota-config-udev-groups`, `-firstboot-date`, `-uupd`, `-flatpak-apps`
+ (BudsLink preinstall), `-custom-command-menu-dconf`
+ (`08-dakota-extension-defaults`), and the rest of the adopted list in
+ `packages/utah.toml` `[parity]`. `dakota-config-firstboot-date`'s
+ `ublue-firstboot-date.path` waits for systemd-timesyncd's sync flag, so the
+ install date is recorded only once timesyncd replaces chrony (#1228).
- Dakota's `files/polkit/org.freedesktop.NetworkManager.rules` (local wheel
users modify system connections without a password) is already shipped,
with an identical rule body, by Hummingbird's NetworkManager RPM at
@@ -78,6 +85,20 @@ Swap follows Dakota (#1224), not zram: `zram-generator(-defaults)` are gone.
`CRYPTO_ZSTD` and gates on both, so the kargs take effect there too
(`docs/skills/kernel-cache.md`).
+## Fonts
+
+Dakota ships two fonts Utah's base manifest does not (#1240), both factory
+packages in `packages/utah.toml` `[parity]`:
+
+- `google-noto-serif-cjk-vf-fonts`: GNOME OS's Noto Serif CJK, next to the
+ Sans CJK set the base manifest already carries.
+- `nerd-fonts-symbols`: Dakota's `bluefin/nerd-fonts-symbols.bst`, the
+ icon-only Symbols Nerd Font that common's fastfetch config falls back to.
+ The package ships `10-nerd-font-symbols.conf` in
+ `/usr/share/fontconfig/conf.avail` and enables it with the same
+ `/etc/fonts/conf.d` link the element creates, so Utah adds no fontconfig
+ file of its own; the contract asserts both paths and the family name.
+
## Lid and sleep
Lid and sleep handling stays at systemd-logind's defaults (suspend). Dakota
diff --git a/docs/skills/desktop-contract/references/stats-refresh.md b/docs/skills/desktop-contract/references/stats-refresh.md
deleted file mode 100644
index 0d5286188..000000000
--- a/docs/skills/desktop-contract/references/stats-refresh.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Community stats in fastfetch (#860)
-
-`bluefin-stats-refresh.service` fetches the Bluefin user count and Bazaar's
-weekly installs for the terminal banner. Two rules keep the values visible:
-
-- The unit runs as the static `bluefin-stats` user
- (`sysusers.d/utah-bluefin-stats.conf`) with `DynamicUser=no`,
- `CacheDirectory=bluefin-stats` and `CacheDirectoryMode=0755`.
- `DynamicUser=yes` always places the cache under `/var/cache/private`
- (mode 0700), which user shells cannot traverse. The hardening
- `DynamicUser=yes` implied (`RemoveIPC=`, `PrivateTmp=`, `NoNewPrivileges=`,
- `RestrictSUIDSGID=`, `ProtectSystem=strict`) is spelled out instead.
-- The directory name is deliberately not `bluefin`. Machines that ran the old
- unit have `/var/cache/private/bluefin`; reusing the name would trigger
- systemd's private-to-public rename, the same migration that fails with
- `EACCES` for fwupd-refresh on this image (#385). The orphaned directory
- holds two small text files and is left alone.
-- Common's `fastfetch.jsonc` reads only the `/usr/share/ublue-os` placeholders
- that `configure-branding.sh` writes, and `/usr` is read-only at runtime.
- `configure-services.sh` rewrites both stat commands to
- `cat /var/cache/bluefin-stats/ 2>/dev/null || cat /usr/share/ublue-os/`,
- guarded like the other Common patches (already patched is a no-op; an
- unrecognised upstream line fails the build). The contract's
- `file_contains` asserts the rewritten commands.
-
-`StatsRefreshCacheTests` in `tests/test_desktop_contract.py` pins the unit,
-the sysusers entry, the script's write path, and runs the fastfetch patch
-twice against Common's lines to prove it is idempotent and fails closed.
diff --git a/docs/skills/desktop-contract/references/uupd.md b/docs/skills/desktop-contract/references/uupd.md
index e95b60c98..37df47414 100644
--- a/docs/skills/desktop-contract/references/uupd.md
+++ b/docs/skills/desktop-contract/references/uupd.md
@@ -3,20 +3,20 @@
Utah's update stack matches Dakota's `elements/bluefin/uupd.bst`:
- The Containerfile pins the uupd release Dakota uses (`UUPD_VERSION`, with
- digests for the tarball and both raw units).
-- `configure-services.sh` installs upstream's `uupd.service`, adding
- `--disable-module-distrobox`, and upstream's daily 04:00 `uupd.timer`. Dakota
- writes the same units inline. The downloaded timer replaces Common's
- four-a-day copy. Dakota resolves that overlap the same way: BuildStream
- stages `bluefin/uupd.bst` after `bluefin/common.bst`.
-- `system_files` ships Dakota's `uupd-manual.service` (static,
+ the tarball digest) and installs only the binary.
+- The factory's `dakota-config-uupd` (#1265) installs Dakota's units as the
+ element writes them: `uupd.service` with `--disable-module-distrobox`, the
+ daily 04:00 `uupd.timer`, `uupd-manual.service` (static,
`--hw-check=false`), `/etc/polkit-1/rules.d/uupd.rules` (local users may
start `uupd.service` and `uupd-manual.service`) and `/etc/uupd/config.json`
- (hardware checks), which overrides Common's distrobox-only config.
+ (hardware checks). The package's files replace Common's four-a-day timer
+ and distrobox-only config, which are copied in before the package
+ transaction; Dakota resolves the same overlap by staging `bluefin/uupd.bst`
+ after `bluefin/common.bst`.
- Common's `uupd-resume.timer`, `uupd-on-ac.service`, udev rule and
`uupd.service.d/10-bluefin.conf` stay, as on Dakota.
`[configuration]` requires these files and pins the timer schedule, the
service flag and the hardware-check config, so the build fails if Common's
-copies win. `test_dakota_uupd_files_shipped_and_required` in
+copies win. `test_dakota_uupd_files_come_from_the_factory_and_are_required` in
`tests/test_desktop_contract.py` covers the contract entries.
diff --git a/docs/skills/package-contract.md b/docs/skills/package-contract.md
index 954582bd3..cdb51b0d3 100644
--- a/docs/skills/package-contract.md
+++ b/docs/skills/package-contract.md
@@ -370,8 +370,8 @@ Never append rows from a newer image to an older snapshot: `image.txt` must
describe the same image as its `surface.tsv`; after a refresh,
[remove resolved triage entries](package-contract/references/factory-consumption.md#closing-baseline-gaps).
-Current counts, per the README "Parity with Dakota" section: 58 base manifest
-packages installed, 308 Utah additions (GNOME 51, base-image parity, device
+Current counts, per the README "Parity with Dakota" section: 57 base manifest
+packages installed, 333 Utah additions (GNOME 51, base-image parity, device
firmware, desktop services), 9 genuinely unavailable. After changing a manifest,
run `python3 scripts/generate-site-data.py`, then
`python3 scripts/check-doc-counts.py --write` to refresh both documents.
diff --git a/iso/scripts/luks-e2e.sh b/iso/scripts/luks-e2e.sh
index bfccce97f..8a708c8b9 100755
--- a/iso/scripts/luks-e2e.sh
+++ b/iso/scripts/luks-e2e.sh
@@ -450,9 +450,12 @@ verify_setup_state() {
check_system_unit_state flatpak-preinstall.service true true "${boot_pass}"
check_system_unit_state ublue-system-setup.service true true "${boot_pass}"
check_system_unit_state brew-setup.service true false "${boot_pass}"
- for unit in input-remapper.service bluefin-stats-refresh.timer uupd.timer; do
+ for unit in ublue-wallpaper-month.service bluefin-wallpaper-month.service uupd.timer; do
check_system_unit_state "${unit}" true false "${boot_pass}"
done
+ # kanata replaced input-remapper (#1222): installed and loaded, opt-in, so
+ # neither enablement nor a run is required.
+ check_system_unit_state kanata.service false false "${boot_pass}"
check_user_setup_unit "${boot_pass}"
}
diff --git a/packages/base.toml b/packages/base.toml
index f9f3be108..8e9bf59e0 100644
--- a/packages/base.toml
+++ b/packages/base.toml
@@ -65,7 +65,6 @@ packages = [
"ibus-mozc",
"ibus-unikey",
"igt-gpu-tools",
- "input-remapper",
"isomd5sum",
"just",
"libappindicator-gtk3",
diff --git a/packages/utah.toml b/packages/utah.toml
index 3f62cb294..9a38b1f77 100644
--- a/packages/utah.toml
+++ b/packages/utah.toml
@@ -221,6 +221,14 @@ packages = [
# it, stays out until its own parity ticket (#263); this adds the font
# itself (#382).
"stix-fonts",
+ # Dakota's other two fonts (#1240): GNOME OS ships Noto Serif CJK next to
+ # the Sans CJK the base manifest carries, and Dakota's
+ # bluefin/nerd-fonts-symbols.bst adds Symbols Nerd Font as the icon
+ # fallback for common's fastfetch config. 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.
+ "google-noto-serif-cjk-vf-fonts",
+ "nerd-fonts-symbols",
# Shell and tooling Bluefin users reach for
"bash-completion",
"man-db",
@@ -391,6 +399,35 @@ packages = [
# the lax zone; the resolved drop-in applies on its own.
"gnome-os-config-firewalld",
"gnome-os-config-resolved-fallback-dns",
+ # The rest of Dakota's and GNOME OS's configuration elements, packaged by
+ # the factory (utah-packages packages/dakota-config and gnome-os-config,
+ # docs/skills/config-packages.md) instead of copied into system_files
+ # (#1265). Each subpackage installs one element's files at the element's
+ # paths; the desktop contract asserts the ones Utah relies on.
+ # dakota-config-firstboot-date's ublue-firstboot-date.path waits for
+ # systemd-timesyncd's sync flag, so it records the install date only once
+ # timesyncd replaces chrony (#1228).
+ "dakota-config-composefs-loop-udisks-ignore",
+ "dakota-config-custom-command-menu-dconf",
+ "dakota-config-firstboot-date",
+ "dakota-config-flatpak-apps",
+ "dakota-config-kexec-disable",
+ "dakota-config-network",
+ "dakota-config-ntsync-modules-load",
+ "dakota-config-rpcbind-preset",
+ "dakota-config-sudo-linuxbrew-path",
+ "dakota-config-tailscale-preset",
+ "dakota-config-tailscale-setup",
+ "dakota-config-udev-groups",
+ "dakota-config-user-avatars",
+ "dakota-config-uupd",
+ "dakota-config-wireplumber-pcsp",
+ "gnome-os-config-hidraw-udev",
+ "gnome-os-config-journald-config",
+ "gnome-os-config-modprobe-config",
+ "gnome-os-config-systemd-presets",
+ "gnome-os-config-uinput",
+ "gnome-os-config-wpa-supplicant-config",
# Everyday command-line tools (#392). xdg-utils supplies xdg-open, which
# nothing else in the image provides. nano-default-editor sets EDITOR.
"xdg-utils",
@@ -407,6 +444,12 @@ packages = [
"pinentry-gnome3",
"brltty",
"ptyxis",
+ # Key remapping as Dakota ships it (bluefin/kanata.bst, bluefin/ydotool.bst),
+ # in place of input-remapper (#1222). kanata.service stays off until the
+ # user writes /etc/kanata/kanata.kbd and enables it (the package's
+ # 80-kanata.preset); ydotool brings the uinput udev rule and modules-load.
+ "kanata",
+ "ydotool",
# Network file systems and Windows domain clients (the NFS family follows
# in the second-wave block below).
"cifs-utils",
@@ -956,6 +999,27 @@ parity = [
"uresourced",
"gnome-os-config-firewalld",
"gnome-os-config-resolved-fallback-dns",
+ "dakota-config-composefs-loop-udisks-ignore",
+ "dakota-config-custom-command-menu-dconf",
+ "dakota-config-firstboot-date",
+ "dakota-config-flatpak-apps",
+ "dakota-config-kexec-disable",
+ "dakota-config-network",
+ "dakota-config-ntsync-modules-load",
+ "dakota-config-rpcbind-preset",
+ "dakota-config-sudo-linuxbrew-path",
+ "dakota-config-tailscale-preset",
+ "dakota-config-tailscale-setup",
+ "dakota-config-udev-groups",
+ "dakota-config-user-avatars",
+ "dakota-config-uupd",
+ "dakota-config-wireplumber-pcsp",
+ "gnome-os-config-hidraw-udev",
+ "gnome-os-config-journald-config",
+ "gnome-os-config-modprobe-config",
+ "gnome-os-config-systemd-presets",
+ "gnome-os-config-uinput",
+ "gnome-os-config-wpa-supplicant-config",
"xdg-utils",
"rsync",
"nano",
@@ -967,6 +1031,8 @@ parity = [
"pinentry-gnome3",
"brltty",
"ptyxis",
+ "kanata",
+ "ydotool",
"cifs-utils",
"rpcbind",
"autofs",
@@ -1073,4 +1139,6 @@ parity = [
"bindfs",
"malcontent-tools",
"nfs-python-utils",
+ "google-noto-serif-cjk-vf-fonts",
+ "nerd-fonts-symbols",
]
diff --git a/scripts/configure-branding.sh b/scripts/configure-branding.sh
index c0f474d06..d028861f0 100644
--- a/scripts/configure-branding.sh
+++ b/scripts/configure-branding.sh
@@ -73,12 +73,12 @@ set_os_release OSTREE_VERSION "${VERSION}"
set_os_release IMAGE_ID "${IMAGE_ID}"
set_os_release IMAGE_VERSION "${VERSION}"
set_os_release BUILD_ID "${SHA_HEAD_SHORT}"
-# The OS logo GNOME Initial Setup looks up by
-# icon name. Fedora sets LOGO=fedora-logo-icon and Bluefin keeps it, with
-# common overlaying its raptor at /usr/share/pixmaps/fedora-logo-icon.png.
-# Hummingbird's os-release has no LOGO at all, so Utah fell back to the
-# generic GNOME foot even though the raptor was on disk.
-set_os_release LOGO "fedora-logo-icon"
+# The OS logo GNOME Initial Setup looks up by icon name. Hummingbird's
+# os-release has no LOGO at all, so Utah fell back to the generic GNOME foot.
+# Dakota sets LOGO=img-logo-icon (include/os-release.yml) and installs the
+# Bluefin wordmarks under that name and its -dark/-text variants in
+# /usr/share/pixmaps; the artwork build stage stages the same SVGs (#1266).
+set_os_release LOGO "img-logo-icon"
# Fedora's bootloader helper still keys its vendor directory off EFIDIR after
# the distribution ID changes.
diff --git a/scripts/configure-services.sh b/scripts/configure-services.sh
index 7dadfe21c..ac826cc4a 100644
--- a/scripts/configure-services.sh
+++ b/scripts/configure-services.sh
@@ -55,13 +55,29 @@ sed -i --follow-symlinks \
-e 's/^IPv6_rpfilter=.*/IPv6_rpfilter=loose/' /etc/firewalld/firewalld.conf
grep -qx 'DefaultZone=lax' /etc/firewalld/firewalld.conf
grep -qx 'IPv6_rpfilter=loose' /etc/firewalld/firewalld.conf
+
# Apply Dakota's runtime desktop integrations onto common's files. Each patch
# is guarded: already-patched is a no-op, an unrecognized upstream file fails
# the build loudly instead of silently shipping unpatched behavior.
-# Wallpaper rotation stays with Common's per-user bluefin-dynamic-wallpaper
-# timer (hemisphere-aware, live month-boundary rotation) rather than Dakota's
-# boot-time month symlink: repointing the default would stand the Common
-# rotator down with no replacement until reboot (#675 decision, #732 review).
+# Monthly wallpaper, as Dakota's effective image has it (#1266): both month
+# units keep their links current, but the default stays common's zz0 value.
+# Dakota's common.bst repoints zz0 from 12-bluefin.xml to
+# /var/lib/ublue-os/current-bluefin.xml, and common names another month, so
+# that sed matches nothing (projectbluefin/dakota#1902) and common's per-user,
+# hemisphere-aware bluefin-dynamic-wallpaper rotator stays in charge. Fail if
+# common ever names 12-bluefin.xml: Dakota's repoint would then take effect
+# there, and Utah has to follow it. The contract fails the build if common
+# drops the file.
+ZZ0_OVERRIDE=/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override
+if [ -f "${ZZ0_OVERRIDE}" ]; then
+ if grep -qF 'file:///usr/share/backgrounds/bluefin/12-bluefin.xml' "${ZZ0_OVERRIDE}"; then
+ echo "ERROR: ${ZZ0_OVERRIDE} names 12-bluefin.xml, so Dakota's current-bluefin.xml repoint now applies -- re-fit it (projectbluefin/dakota#1902)" >&2
+ exit 1
+ elif ! grep -qE "^picture-uri='file:///usr/share/backgrounds/bluefin/[0-9]{2}-bluefin\.xml'$" "${ZZ0_OVERRIDE}"; then
+ echo "ERROR: ${ZZ0_OVERRIDE} changed upstream -- re-check Dakota's wallpaper repoint (projectbluefin/dakota#1902)" >&2
+ exit 1
+ fi
+fi
# Installation date for fastfetch: read the first-boot timestamp instead of
# inferring the image age from /var/log timestamps.
FASTFETCH_JSONC=/usr/share/ublue-os/fastfetch.jsonc
@@ -75,21 +91,44 @@ if [ -f "${FASTFETCH_JSONC}" ]; then
exit 1
fi
fi
-# Community stats for fastfetch: read what bluefin-stats-refresh.service last
-# fetched, and fall back to the build-time placeholder until it has run once.
-# Common reads only the /usr/share/ublue-os copy, which is read-only at runtime,
-# so without this the banner shows the placeholder forever (#860).
-STATS_CACHE=/var/cache/bluefin-stats
+# Weekly community stats: Dakota drops common's two fastfetch lines and the
+# break after them (patches/common/0006-fastfetch-drop-weekly-stats.patch)
+# and fetches nothing at runtime, so Utah does the same (#1266). Already
+# dropped is a no-op; any other shape fails the build.
if [ -f "${FASTFETCH_JSONC}" ]; then
- if grep -qF "${STATS_CACHE}/" "${FASTFETCH_JSONC}"; then
+ python3 - "${FASTFETCH_JSONC}" <<'PY'
+import re
+import sys
+
+path = sys.argv[1]
+with open(path, encoding="utf-8") as f:
+ text = f.read()
+stats = ("/usr/share/ublue-os/fastfetch-user-count", "/usr/share/ublue-os/bazaar-install-count")
+if not any(stat in text for stat in stats):
+ sys.exit(0)
+# One object per stat: its lines up to the closing brace, which no inner line
+# matches (the format strings carry {1}, so a brace-free match cannot work).
+body = r'(?:(?![ \t]*\},?\n)[^\n]*\n)*?'
+entry = r'\{\n' + body + r'[ \t]*"text": "cat %s",\n' + body + r'[ \t]*\},\s*'
+pattern = "".join(entry % re.escape(stat) for stat in stats) + r'"break",\s*'
+text, count = re.subn(pattern, "", text)
+if count != 1:
+ sys.exit(f"ERROR: {path} changed upstream -- re-fit Dakota's weekly-stats drop (patches/common/0006)")
+with open(path, "w", encoding="utf-8") as f:
+ f.write(text)
+PY
+fi
+# Ghostty's skeleton config follows GNOME's light/dark style, as Dakota
+# patches it (patches/common/0002-ghostty-dual-theme.patch, #1266).
+GHOSTTY_SKEL=/etc/skel/.config/ghostty/config.ghostty
+GHOSTTY_DUAL_THEME='theme = light:Catppuccin Latte,dark:Catppuccin Mocha'
+if [ -f "${GHOSTTY_SKEL}" ]; then
+ if grep -qxF "${GHOSTTY_DUAL_THEME}" "${GHOSTTY_SKEL}"; then
: already patched
- elif grep -qF '"cat /usr/share/ublue-os/fastfetch-user-count"' "${FASTFETCH_JSONC}" \
- && grep -qF '"cat /usr/share/ublue-os/bazaar-install-count"' "${FASTFETCH_JSONC}"; then
- for stat in fastfetch-user-count bazaar-install-count; do
- sed -i "s#\"cat /usr/share/ublue-os/${stat}\"#\"cat ${STATS_CACHE}/${stat} 2>/dev/null || cat /usr/share/ublue-os/${stat}\"#" "${FASTFETCH_JSONC}"
- done
+ elif grep -qxF 'theme = Catppuccin Mocha' "${GHOSTTY_SKEL}"; then
+ sed -i "s/^theme = Catppuccin Mocha\$/${GHOSTTY_DUAL_THEME}/" "${GHOSTTY_SKEL}"
else
- echo "ERROR: ${FASTFETCH_JSONC} changed upstream -- re-fit the community-stats patch (see bluefin-stats-refresh.service)" >&2
+ echo "ERROR: ${GHOSTTY_SKEL} changed upstream -- re-fit Dakota's dual-theme patch (patches/common/0002)" >&2
exit 1
fi
fi
@@ -145,6 +184,7 @@ fi
rm -f /usr/share/applications/system-update.desktop \
/usr/share/applications/discourse.desktop \
/usr/share/applications/documentation.desktop
+
# Bluefin's Brewfile and Bazaar preinstall hook need the Flathub remote before
# first boot. Keep this as a .flatpakrepo descriptor so the remote is available
# to both flatpak-preinstall and brew-setup without baking mutable /var state.
@@ -176,9 +216,9 @@ grep -q '^DeployCollectionID=' /etc/flatpak/remotes.d/flathub.flatpakrepo ||
grep -qx 'DeployCollectionID=org.flathub.Stable' /etc/flatpak/remotes.d/flathub.flatpakrepo
# BudsLink backs the BudsLink-Companion extension enabled by default; Dakota
# appends it to common's system Flatpaks and preinstalls it
-# (projectbluefin/dakota elements/bluefin/common.bst,
-# files/oci/bluefin-flatpak/preinstall.d/io.github.maniacx.BudsLink.preinstall).
-# The desktop contract's [flatpak] apps list fails the build if it is missing.
+# (projectbluefin/dakota elements/bluefin/common.bst; the preinstall comes from
+# the factory's dakota-config-flatpak-apps). The desktop contract's [flatpak]
+# apps list fails the build if it is missing.
SYSTEM_FLATPAKS=/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile
if [ -f "${SYSTEM_FLATPAKS}" ] && ! grep -qxF 'flatpak "io.github.maniacx.BudsLink"' "${SYSTEM_FLATPAKS}"; then
echo 'flatpak "io.github.maniacx.BudsLink"' >>"${SYSTEM_FLATPAKS}"
@@ -296,18 +336,16 @@ if ! matchpathcon /var/swap/swapfile | grep -q ':swapfile_t:'; then
fi
# uupd is distributed as a release binary, not an RPM in the Hummingbird
-# repositories. Keep its version pinned by the Containerfile argument.
-# Dakota's elements/bluefin/uupd.bst writes the same upstream units, with the
-# distrobox flag below, so the downloads give Dakota's units. Installing them
-# here replaces Common's uupd.timer (four runs a day) with upstream's daily
-# 04:00 timer, which is also what wins on Dakota: BuildStream stages
-# bluefin/uupd.bst after bluefin/common.bst. uupd-manual.service, its polkit
-# rule and /etc/uupd/config.json come from Dakota via system_files.
+# repositories. Keep its version pinned by the Containerfile argument. Its
+# units, uupd-manual.service, polkit rule and /etc/uupd/config.json come from
+# 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
-install -Dm0644 /tmp/uupd/uupd.service /usr/lib/systemd/system/uupd.service
-install -Dm0644 /tmp/uupd/uupd.timer /usr/lib/systemd/system/uupd.timer
-# Avoid pulling the distrobox module on every update, as in Dakota's uupd.service.
-sed -i 's|uupd|& --disable-module-distrobox|' /usr/lib/systemd/system/uupd.service
+# Common ships its own /etc/uupd/config.json, so rpm installs the package's
+# copy as .rpmnew; Dakota's hardware-check config must win.
+if [ -f /etc/uupd/config.json.rpmnew ]; then
+ mv -f /etc/uupd/config.json.rpmnew /etc/uupd/config.json
+fi
# Apply the system presets to every installed unit, so the image carries the
# state first-boot preset application would give it and the desktop contract
diff --git a/site/data/packages.json b/site/data/packages.json
index 865da2d4d..b74c3b631 100644
--- a/site/data/packages.json
+++ b/site/data/packages.json
@@ -32,7 +32,6 @@
"ibus-mozc",
"ibus-unikey",
"igt-gpu-tools",
- "input-remapper",
"isomd5sum",
"just",
"libappindicator-gtk3",
@@ -154,6 +153,21 @@
"cups-client",
"cups-filters",
"cups-ipptool",
+ "dakota-config-composefs-loop-udisks-ignore",
+ "dakota-config-custom-command-menu-dconf",
+ "dakota-config-firstboot-date",
+ "dakota-config-flatpak-apps",
+ "dakota-config-kexec-disable",
+ "dakota-config-network",
+ "dakota-config-ntsync-modules-load",
+ "dakota-config-rpcbind-preset",
+ "dakota-config-sudo-linuxbrew-path",
+ "dakota-config-tailscale-preset",
+ "dakota-config-tailscale-setup",
+ "dakota-config-udev-groups",
+ "dakota-config-user-avatars",
+ "dakota-config-uupd",
+ "dakota-config-wireplumber-pcsp",
"dbus-daemon",
"dbus-tools",
"default-fonts-core-emoji",
@@ -185,7 +199,13 @@
"gnome-disk-utility",
"gnome-epub-thumbnailer",
"gnome-os-config-firewalld",
+ "gnome-os-config-hidraw-udev",
+ "gnome-os-config-journald-config",
+ "gnome-os-config-modprobe-config",
"gnome-os-config-resolved-fallback-dns",
+ "gnome-os-config-systemd-presets",
+ "gnome-os-config-uinput",
+ "gnome-os-config-wpa-supplicant-config",
"gnupg2-scdaemon",
"gnupg2-smime",
"gnupg2-utils",
@@ -193,6 +213,7 @@
"google-noto-sans-math-fonts",
"google-noto-sans-mono-vf-fonts",
"google-noto-sans-symbols-2-fonts",
+ "google-noto-serif-cjk-vf-fonts",
"google-noto-serif-vf-fonts",
"gssproxy",
"gst-thumbnailers",
@@ -226,6 +247,7 @@
"iproute-tc",
"iptables-nft",
"iw",
+ "kanata",
"keyutils",
"krb5-workstation",
"langpacks-en",
@@ -259,6 +281,7 @@
"mtr",
"nano",
"nano-default-editor",
+ "nerd-fonts-symbols",
"nethogs",
"nfs-client-utils",
"nfs-common-utils",
@@ -370,6 +393,7 @@
"xxd",
"xxhash",
"xz-lzma-compat",
+ "ydotool",
"zip"
],
"title": "Base-image parity",
@@ -423,7 +447,7 @@
}
],
"totals": {
- "installed": 366,
+ "installed": 390,
"unavailable": 9
},
"unavailable": [
diff --git a/system_files/shared/etc/dconf/db/distro.d/08-dakota-extension-defaults b/system_files/shared/etc/dconf/db/distro.d/08-dakota-extension-defaults
deleted file mode 100644
index 347aa3c6b..000000000
--- a/system_files/shared/etc/dconf/db/distro.d/08-dakota-extension-defaults
+++ /dev/null
@@ -1,22 +0,0 @@
-# Default settings for shell extensions that bundle their own compiled schemas.
-#
-# GNOME Shell's Extension.getSettings() builds the schema source from the
-# extension's own schemas/ directory first, so a gschema override dropped into
-# /usr/share/glib-2.0/schemas never reaches these extensions. The dconf distro
-# database applies regardless of which schema source is used, so extension
-# defaults belong here, not in zz3-bluefin-unsupported-stuff.gschema.override.
-
-[org/gnome/shell/extensions/tilingshell]
-show-indicator=false
-# Layouts match projectbluefin/dakota files/dconf/08-dakota-extension-defaults;
-# Quarters needs four distinct tiles, one per quadrant.
-layouts-json='[{"id": "Horizontal","tiles": [{"x": 0,"y": 0,"width": 0.5,"height": 1,"groups": [1]},{"x": 0.5,"y": 0,"width": 0.5,"height": 1,"groups": [1]}]},{"id": "Vertical","tiles": [{"x": 0,"y": 0,"width": 1,"height": 0.5,"groups": [1]},{"x": 0,"y": 0.5,"width": 1,"height": 0.5,"groups": [1]}]},{"id": "Quarters","tiles": [{"x": 0,"y": 0,"width": 0.5,"height": 0.5,"groups": [1]},{"x": 0,"y": 0.5,"width": 0.5,"height": 0.5,"groups": [1]},{"x": 0.5,"y": 0,"width": 0.5,"height": 0.5,"groups": [1]},{"x": 0.5,"y": 0.5,"width": 0.5,"height": 0.5,"groups": [1]}]},{"id": "Full","tiles": [{"x": 0,"y": 0,"width": 1,"height": 1,"groups": [1]}]}]'
-
-[org/gnome/shell/extensions/BudsLink-Companion]
-level-indicator-color=0
-
-[org/gnome/shell/extensions/syncthing-toggle]
-start-stop-only=true
-
-[org/gnome/shell/extensions/blur-my-shell/popup]
-blur=true
diff --git a/system_files/shared/etc/polkit-1/rules.d/uupd.rules b/system_files/shared/etc/polkit-1/rules.d/uupd.rules
deleted file mode 100644
index 3b25cf434..000000000
--- a/system_files/shared/etc/polkit-1/rules.d/uupd.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-// From Dakota's elements/bluefin/uupd.bst (upstream ublue-os/uupd v1.5.5):
-// users may start uupd.service and uupd-manual.service without authenticating.
-polkit.addRule(function(action, subject) {
- if (action.id == "org.freedesktop.systemd1.manage-units") {
- switch(action.lookup("unit")) {
- case "uupd.service":
- return polkit.Result.YES;
- case "uupd-manual.service":
- return polkit.Result.YES;
- }
- }
-})
diff --git a/system_files/shared/etc/uupd/config.json b/system_files/shared/etc/uupd/config.json
deleted file mode 100644
index 7f07b1860..000000000
--- a/system_files/shared/etc/uupd/config.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "checks": {
- "hardware": {
- "enable": true,
- "bat-min-percent": 20,
- "cpu-max-percent": 50,
- "mem-max-percent": 90,
- "net-max-bytes": 700000
- }
- },
- "modules": {
- "brew": {
- "disable": false
- },
- "distrobox": {
- "disable": false
- },
- "flatpak": {
- "disable": false
- },
- "system": {
- "disable": false
- }
- }
-}
diff --git a/system_files/shared/usr/bin/ublue-booted-image-sync b/system_files/shared/usr/bin/ublue-booted-image-sync
deleted file mode 100755
index edb350e04..000000000
--- a/system_files/shared/usr/bin/ublue-booted-image-sync
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/bash
-# Record the booted bootc image ref where unprivileged consumers (Common's
-# /usr/libexec/ublue-booted-image, used by fastfetch's ublue-image-info.sh)
-# can read it. `bootc status` requires root on bootc >= 1.14, so the live
-# query is dead in user sessions, and the baked image tag is the compose-time
-# tag. The booted ref cannot change within a boot, so one write per boot is
-# always accurate. Parity with Dakota (projectbluefin/utah#675).
-set -euo pipefail
-
-bootc_json="$(bootc status --json 2>/dev/null || true)"
-ref="$(jq -r '.status.booted.image.image.image // empty' <<<"${bootc_json}" 2>/dev/null || true)"
-if [ -z "${ref}" ]; then
- echo "no booted bootc image found; leaving no state file" >&2
- exit 0
-fi
-
-install -d -m 0755 /run/ublue-os
-tmp="$(mktemp /run/ublue-os/booted-image.XXXXXX)"
-printf '%s\n' "${ref}" > "${tmp}"
-chmod 0644 "${tmp}"
-mv -f "${tmp}" /run/ublue-os/booted-image
diff --git a/system_files/shared/usr/bin/ublue-firstboot-date b/system_files/shared/usr/bin/ublue-firstboot-date
deleted file mode 100755
index b1361be7d..000000000
--- a/system_files/shared/usr/bin/ublue-firstboot-date
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/bash
-# Record the installation date, once, after the clock has been synchronized.
-# ublue-firstboot-date.path starts this only when systemd-timesyncd reports a
-# sync, so the date written here is always a real one.
-#
-# A sane record is never rewritten. A record dated 2011 is not sane: images
-# whose systemd time epoch was BuildStream's SOURCE_DATE_EPOCH (2011-11-11)
-# booted with the clock reset to that day and recorded it. No Dakota install
-# predates 2026, so a 2011 record is replaced with today's date. That is the
-# closest recoverable value: /var/log, the fallback fastfetch would use if the
-# record were removed, was created under the same wrong clock.
-set -euo pipefail
-
-record=/var/lib/ublue-os/install-date
-
-if [ -s "${record}" ]; then
- read -r recorded <"${record}" || true
- case "${recorded}" in
- 2011-*) echo "replacing install date ${recorded} written before the clock was set" ;;
- *) exit 0 ;;
- esac
-fi
-
-install -d -m 0755 "${record%/*}"
-date +%Y-%m-%d >"${record}.tmp"
-mv -f "${record}.tmp" "${record}"
diff --git a/system_files/shared/usr/lib/sysctl.d/60-kexec-disable.conf b/system_files/shared/usr/lib/sysctl.d/60-kexec-disable.conf
deleted file mode 100644
index cc77283a2..000000000
--- a/system_files/shared/usr/lib/sysctl.d/60-kexec-disable.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copied from Dakota (projectbluefin/dakota elements/bluefin/kexec-disable.bst).
-# Nothing in Utah boots through kexec (bootc upgrades and soft-reboot do not
-# use it), and Epic's Easy Anti-Cheat requires it off: a kexec'd kernel would
-# skip the measured boot chain. The sysctl is one-way, so it cannot be turned
-# back on until reboot.
-kernel.kexec_load_disabled = 1
diff --git a/system_files/shared/usr/lib/systemd/system-preset/98-utah-enable-default.preset b/system_files/shared/usr/lib/systemd/system-preset/98-utah-enable-default.preset
index 1ab58674a..384eec527 100644
--- a/system_files/shared/usr/lib/systemd/system-preset/98-utah-enable-default.preset
+++ b/system_files/shared/usr/lib/systemd/system-preset/98-utah-enable-default.preset
@@ -151,9 +151,6 @@ disable canberra-system-shutdown-reboot.service
disable foomaticrip-upgrade.service
disable lastlog2-import.service
disable man-db-restart-cache-update.service
-# The community-stats fetch runs from bluefin-stats-refresh.timer, not at
-# every boot.
-disable bluefin-stats-refresh.service
# mdadm's scrub and reminder timers, which Dakota runs, stay off (#1271).
# raid-check.timer already scrubs every array weekly (kept by #1268), so
diff --git a/system_files/shared/usr/lib/systemd/system/bluefin-stats-refresh.service b/system_files/shared/usr/lib/systemd/system/bluefin-stats-refresh.service
deleted file mode 100644
index 05e3da882..000000000
--- a/system_files/shared/usr/lib/systemd/system/bluefin-stats-refresh.service
+++ /dev/null
@@ -1,45 +0,0 @@
-[Unit]
-Description=Refresh Bluefin community stats for fastfetch
-Documentation=https://projectbluefin.io
-After=network-online.target
-Wants=network-online.target
-ConditionPathIsReadWrite=/var/cache
-
-[Service]
-Type=oneshot
-ExecStart=/usr/libexec/bluefin-refresh-stats
-StandardOutput=journal
-StandardError=journal
-# The job needs the network and a writable cache directory, nothing else.
-# fastfetch reads the cache from unprivileged user shells, so it must not sit
-# under /var/cache/private: DynamicUser=yes always puts CacheDirectory= there,
-# mode 0700 (#860). Run as the static user from
-# sysusers.d/utah-bluefin-stats.conf instead, with the hardening DynamicUser=yes
-# implied spelled out. The directory name is new rather than "bluefin" so
-# systemd never runs its private-to-public rename on machines that already
-# have /var/cache/private/bluefin (that rename fails on this image, see #385).
-User=bluefin-stats
-Group=bluefin-stats
-DynamicUser=no
-CacheDirectory=bluefin-stats
-CacheDirectoryMode=0755
-UMask=0022
-RemoveIPC=yes
-NoNewPrivileges=yes
-PrivateTmp=yes
-ProtectHome=yes
-ProtectSystem=strict
-CapabilityBoundingSet=
-RestrictRealtime=yes
-RestrictSUIDSGID=yes
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-ProtectKernelTunables=yes
-ProtectKernelModules=yes
-ProtectControlGroups=yes
-RestrictNamespaces=yes
-SystemCallFilter=@system-service
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-
-[Install]
-WantedBy=multi-user.target
diff --git a/system_files/shared/usr/lib/systemd/system/bluefin-stats-refresh.timer b/system_files/shared/usr/lib/systemd/system/bluefin-stats-refresh.timer
deleted file mode 100644
index 3109b4fe6..000000000
--- a/system_files/shared/usr/lib/systemd/system/bluefin-stats-refresh.timer
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Periodically refresh Bluefin community stats for fastfetch
-Documentation=https://projectbluefin.io
-
-[Timer]
-OnBootSec=2min
-OnUnitActiveSec=1d
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff --git a/system_files/shared/usr/lib/systemd/system/bluefin-wallpaper-month.service b/system_files/shared/usr/lib/systemd/system/bluefin-wallpaper-month.service
new file mode 100644
index 000000000..dde17cd1e
--- /dev/null
+++ b/system_files/shared/usr/lib/systemd/system/bluefin-wallpaper-month.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Update Bluefin wallpaper month symlink
+After=local-fs.target
+ConditionPathExists=/usr/share/backgrounds/bluefin
+Before=display-manager.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/bluefin-wallpaper-month-sync
+
+[Install]
+WantedBy=multi-user.target
diff --git a/system_files/shared/usr/lib/systemd/system/ublue-booted-image.service b/system_files/shared/usr/lib/systemd/system/ublue-booted-image.service
deleted file mode 100644
index 7512ebfd7..000000000
--- a/system_files/shared/usr/lib/systemd/system/ublue-booted-image.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Record booted bootc image ref for unprivileged consumers
-Documentation=https://github.com/projectbluefin/utah/issues/675
-ConditionPathExists=/usr/bin/bootc
-After=local-fs.target
-Before=systemd-user-sessions.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/ublue-booted-image-sync
-
-[Install]
-WantedBy=multi-user.target
diff --git a/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.path b/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.path
deleted file mode 100644
index 40358079b..000000000
--- a/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.path
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Record Utah installation date once the clock is synchronized
-Documentation=man:systemd-timesyncd.service(8)
-
-# systemd-timesyncd touches this file on each successful NTP synchronization.
-# Before that the clock may still be the systemd build epoch on hardware whose
-# RTC the kernel does not read early, which would record a bogus date for good.
-# There is no condition on the record here: the service decides, because it
-# also has to replace a record that an earlier image wrote under a wrong clock.
-[Path]
-PathExists=/run/systemd/timesync/synchronized
-
-[Install]
-WantedBy=multi-user.target
diff --git a/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.path.d/10-utah-description.conf b/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.path.d/10-utah-description.conf
new file mode 100644
index 000000000..1e6fcf8f5
--- /dev/null
+++ b/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.path.d/10-utah-description.conf
@@ -0,0 +1,4 @@
+# dakota-config-firstboot-date ships Dakota's unit verbatim; user-facing text
+# names Utah (#1265).
+[Unit]
+Description=Record Utah installation date once the clock is synchronized
diff --git a/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.service b/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.service
deleted file mode 100644
index 7c5e63856..000000000
--- a/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Record Utah first-boot installation date
-After=local-fs.target
-
-# Started by ublue-firstboot-date.path, never directly at boot: the date is
-# only trustworthy after the clock has been synchronized. The script leaves a
-# sane record alone, so running on every boot is a no-op. RemainAfterExit
-# keeps the unit active so the path unit does not start it again.
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/ublue-firstboot-date
-RemainAfterExit=yes
diff --git a/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.service.d/10-utah-description.conf b/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.service.d/10-utah-description.conf
new file mode 100644
index 000000000..fdb830cbc
--- /dev/null
+++ b/system_files/shared/usr/lib/systemd/system/ublue-firstboot-date.service.d/10-utah-description.conf
@@ -0,0 +1,4 @@
+# dakota-config-firstboot-date ships Dakota's unit verbatim; user-facing text
+# names Utah (#1265).
+[Unit]
+Description=Record Utah first-boot installation date
diff --git a/system_files/shared/usr/lib/systemd/system/ublue-wallpaper-month.service b/system_files/shared/usr/lib/systemd/system/ublue-wallpaper-month.service
new file mode 100644
index 000000000..3cd84b973
--- /dev/null
+++ b/system_files/shared/usr/lib/systemd/system/ublue-wallpaper-month.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Point Dakota wallpaper at the current month
+After=local-fs.target
+Before=display-manager.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash -c 'mkdir -p /var/lib/ublue-os; month="$(date +%%m)"; target="/usr/share/backgrounds/bluefin/${month}-bluefin.xml"; [ -e "$target" ] || target="/usr/share/backgrounds/bluefin/12-bluefin.xml"; ln -sfn "$target" /var/lib/ublue-os/current-bluefin.xml'
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/system_files/shared/usr/lib/systemd/system/uupd-manual.service b/system_files/shared/usr/lib/systemd/system/uupd-manual.service
deleted file mode 100644
index c9d6abb47..000000000
--- a/system_files/shared/usr/lib/systemd/system/uupd-manual.service
+++ /dev/null
@@ -1,17 +0,0 @@
-# From Dakota's elements/bluefin/uupd.bst (upstream ublue-os/uupd v1.5.5).
-# A user-started update that skips uupd's hardware checks; uupd.rules lets
-# local users start it without a password prompt.
-[Unit]
-Description=Universal Blue Update Oneshot Service - Manual Activation
-StartLimitBurst=3
-StartLimitIntervalSec=600
-
-[Service]
-Type=oneshot
-# DO NOT CHANGE ANYTHING BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
-ExecStart=/usr/bin/uupd --hw-check=false --json --log-level=debug
-# Restart on failure for edge cases like waking from suspend and wifi not connecting immediately
-Restart=on-failure
-RestartSec=60s
-# Set SELinux context unconfined because bootc requires some special perms for relabeling (install_t????)
-SELinuxContext=system_u:unconfined_r:unconfined_t:s0
diff --git a/system_files/shared/usr/lib/sysusers.d/utah-bluefin-stats.conf b/system_files/shared/usr/lib/sysusers.d/utah-bluefin-stats.conf
deleted file mode 100644
index 451d88ea1..000000000
--- a/system_files/shared/usr/lib/sysusers.d/utah-bluefin-stats.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Allocate the static user bluefin-stats-refresh.service runs as.
-#
-# The unit used DynamicUser=yes, which puts CacheDirectory= under
-# /var/cache/private/ (mode 0700), so the stats it wrote could never be read
-# by fastfetch in a user's terminal (#860). A static user keeps the job off
-# UID 0 while its cache stays world-readable. Same pattern as
-# utah-fwupd-refresh.conf (#385).
-u bluefin-stats - "Bluefin community stats refresh"
diff --git a/system_files/shared/usr/lib/sysusers.d/utah-udev-groups.conf b/system_files/shared/usr/lib/sysusers.d/utah-udev-groups.conf
deleted file mode 100644
index 42baa42a0..000000000
--- a/system_files/shared/usr/lib/sysusers.d/utah-udev-groups.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Groups that udev rules on the image assign device nodes to, but that neither
-# Hummingbird nor Fedora creates:
-#
-# plugdev libfido2's upstream 70-u2f.rules (security keys) and
-# common's 50-zsa.rules (ZSA keyboards)
-# nintendo_switch common's 10-switch.rules (Switch RCM recovery mode)
-#
-# udev logged "Failed to resolve group" over a hundred times every boot for
-# these, filling the boot-error section of `ujust report` (#444). Access for
-# the logged-in user still comes from the rules' uaccess tags; the groups only
-# make the rules resolve.
-g plugdev - -
-g nintendo_switch - -
diff --git a/system_files/shared/usr/libexec/bluefin-refresh-stats b/system_files/shared/usr/libexec/bluefin-refresh-stats
deleted file mode 100755
index 573ead588..000000000
--- a/system_files/shared/usr/libexec/bluefin-refresh-stats
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/bash
-# Refresh Bluefin community stats used by fastfetch.
-# Writes to /var/cache/bluefin-stats/ so updates survive across reboots
-# without requiring changes to the immutable /usr layer. fastfetch.jsonc reads
-# these files first and falls back to the /usr/share/ublue-os placeholders
-# (configure-services.sh patches it, #860).
-
-set -euo pipefail
-
-CACHE_DIR="${CACHE_DIRECTORY:-/var/cache/bluefin-stats}"
-mkdir -p "${CACHE_DIR}"
-
-# These values end up rendered verbatim in user terminals by fastfetch, so
-# never write a string the remote endpoint fully controls: a compromised or
-# spoofed response could otherwise inject ANSI escape sequences into every
-# terminal that runs fastfetch. Accept only short plain counts like
-# "4.2k users" or "12K".
-valid_stat() {
- [[ "$1" =~ ^[A-Za-z0-9][A-Za-z0-9.,+\ ]{0,31}$ ]]
-}
-
-# Replace a stat file atomically so a concurrent fastfetch never reads it
-# half-written.
-write_stat() {
- local tmp
- tmp="$(mktemp "${CACHE_DIR}/.$1.XXXXXX")"
- printf '%s\n' "$2" > "${tmp}"
- chmod 0644 "${tmp}"
- mv -f "${tmp}" "${CACHE_DIR}/$1"
-}
-
-# User count from ublue-os/countme
-if count=$(curl -sf --retry 3 --max-time 10 \
- https://raw.githubusercontent.com/ublue-os/countme/main/badge-endpoints/bluefin.json \
- | jq -r '.message') && valid_stat "${count}"; then
- write_stat fastfetch-user-count "${count}"
-fi
-
-# Bazaar weekly downloads from Flathub
-if installs=$(curl -sf --retry 3 --max-time 10 \
- 'https://flathub.org/api/v2/stats/io.github.kolunmi.Bazaar?all=false&days=1' \
- | jq -r '.installs_last_7_days' \
- | numfmt --to=si --round=nearest) && valid_stat "${installs}"; then
- write_stat bazaar-install-count "${installs}"
-fi
diff --git a/system_files/shared/usr/libexec/bluefin-wallpaper-month-sync b/system_files/shared/usr/libexec/bluefin-wallpaper-month-sync
new file mode 100755
index 000000000..1e8e9ffc9
--- /dev/null
+++ b/system_files/shared/usr/libexec/bluefin-wallpaper-month-sync
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+source_dir="/usr/share/backgrounds/bluefin"
+state_dir="/var/lib/bluefin/backgrounds"
+link_path="${state_dir}/current-bluefin.xml"
+month_file="$(date +%m)-bluefin.xml"
+
+if [[ ! -d "${source_dir}" ]]; then
+ exit 0
+fi
+
+mkdir -p "${state_dir}"
+
+if [[ -f "${source_dir}/${month_file}" ]]; then
+ ln -sfn "${source_dir}/${month_file}" "${link_path}"
+else
+ ln -sfn "${source_dir}/12-bluefin.xml" "${link_path}"
+fi
diff --git a/system_files/shared/usr/share/flatpak/preinstall.d/io.github.maniacx.BudsLink.preinstall b/system_files/shared/usr/share/flatpak/preinstall.d/io.github.maniacx.BudsLink.preinstall
deleted file mode 100644
index e0a888fe1..000000000
--- a/system_files/shared/usr/share/flatpak/preinstall.d/io.github.maniacx.BudsLink.preinstall
+++ /dev/null
@@ -1,4 +0,0 @@
-[Flatpak Preinstall io.github.maniacx.BudsLink]
-Branch=stable
-IsRuntime=false
-CollectionID=org.flathub.Stable
diff --git a/system_files/shared/usr/share/wireplumber/wireplumber.conf.d/51-disable-pcsp.conf b/system_files/shared/usr/share/wireplumber/wireplumber.conf.d/51-disable-pcsp.conf
deleted file mode 100644
index 463e2c2e9..000000000
--- a/system_files/shared/usr/share/wireplumber/wireplumber.conf.d/51-disable-pcsp.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copied from Dakota (projectbluefin/dakota files/wireplumber/51-disable-pcsp.conf,
-# installed by elements/bluefin/wireplumber-pcsp.bst; projectbluefin/dakota#1248).
-# Keep snd_pcsp available for console beeps without exposing its PCM card as a
-# desktop audio device. Otherwise it can become the default sink after resume.
-monitor.alsa.rules = [
- {
- matches = [
- {
- device.name = "alsa_card.platform-pcspkr"
- }
- ]
- actions = {
- update-props = {
- device.disabled = true
- }
- }
- }
-]
diff --git a/tests/test_boot_noise.py b/tests/test_boot_noise.py
index c4f2069be..d13b82783 100644
--- a/tests/test_boot_noise.py
+++ b/tests/test_boot_noise.py
@@ -21,10 +21,17 @@ def directives(path: Path) -> list[str]:
class BootNoiseTests(unittest.TestCase):
def test_udev_rule_groups_are_created(self):
- groups = {line.split()[1] for line in directives(
- SHARED / "usr/lib/sysusers.d/utah-udev-groups.conf")
- if line.startswith("g ")}
- self.assertEqual(groups, {"plugdev", "nintendo_switch"})
+ # Dakota's bluefin/udev-groups.bst, packaged as dakota-config-udev-groups
+ # (#1265); the contract asserts both groups in the installed file.
+ import tomllib
+ manifest = tomllib.loads((ROOT / "packages/utah.toml").read_text())
+ self.assertIn("dakota-config-udev-groups", manifest["parity"]["packages"])
+ contract = tomllib.loads((ROOT / "contracts/bluefin-desktop.toml").read_text())
+ self.assertEqual(
+ contract["configuration"]["file_contains"]["/usr/lib/sysusers.d/bluefin-udev-groups.conf"],
+ ["g plugdev", "g nintendo_switch"],
+ )
+ self.assertFalse((SHARED / "usr/lib/sysusers.d/utah-udev-groups.conf").exists())
def test_mail_spool_exists_for_useradd(self):
rules = directives(SHARED / "usr/lib/tmpfiles.d/utah-mail.conf")
diff --git a/tests/test_desktop_contract.py b/tests/test_desktop_contract.py
index 3c3774e16..9a8b9eb3b 100644
--- a/tests/test_desktop_contract.py
+++ b/tests/test_desktop_contract.py
@@ -61,11 +61,13 @@ def test_shipped_contract_is_valid(self):
data = tomllib.loads((ROOT / "contracts/bluefin-desktop.toml").read_text())
self.assertEqual(desktop.validate_contract(data), [])
- def test_shipped_contract_enables_input_remapper(self):
+ def test_shipped_contract_keeps_kanata_opt_in_without_input_remapper(self):
import tomllib
data = tomllib.loads((ROOT / "contracts/bluefin-desktop.toml").read_text())
- self.assertIn("input-remapper.service", data.get("services", {}).get("enabled", []))
+ services = data.get("services", {})
+ self.assertIn("kanata.service", services.get("disabled", []))
+ self.assertNotIn("input-remapper.service", services.get("enabled", []))
def test_every_missing_section_is_named(self):
errors = desktop.validate_contract({})
@@ -498,26 +500,27 @@ def test_configure_services_applies_the_presets(self):
self.assertRegex(services, r"(?m)^systemctl preset-all$")
self.assertNotRegex(services, r"(?m)^\s*systemctl (enable|disable) ")
self.assertNotIn("enable_unit", services)
- uupd = services.index("install -Dm0644 /tmp/uupd/uupd.timer")
+ uupd = services.index("mv -f /etc/uupd/config.json.rpmnew /etc/uupd/config.json")
self.assertLess(uupd, services.index("\nsystemctl preset-all\n"))
def test_the_reported_desktop_units_are_enabled(self):
- # projectbluefin/utah#99: input-remapper was installed and its unit
- # never started. #19: the first-boot Flatpak, setup, statistics,
- # update and Tailscale units need an enablement policy too. #675:
- # Dakota's first-boot date and booted-image units.
+ # projectbluefin/utah#99: an installed unit that never started. #19: the
+ # first-boot Flatpak, setup, update and Tailscale units need an
+ # enablement policy too. #675, #1265: Dakota's first-boot date and
+ # booted-image units. #1266: Dakota's monthly-wallpaper units.
enabled = self.contract_services()["enabled"]
for unit in (
"gdm.service",
- "input-remapper.service",
+ "ublue-wallpaper-month.service",
"flatpak-preinstall.service",
"ublue-system-setup.service",
- "bluefin-stats-refresh.timer",
+ "bluefin-wallpaper-month.service",
"projectbluefin-countme.timer",
"uupd.timer",
"accounts-daemon.service",
"ublue-firstboot-date.path",
"ublue-booted-image.service",
+ "bluefin-remove-installer.service",
):
with self.subTest(unit=unit):
self.assertIn(unit, enabled)
@@ -526,8 +529,12 @@ def test_the_reported_desktop_units_are_enabled(self):
# the contract cannot require it enabled; the preset still turns it on.
self.assertNotIn("colord.service", enabled)
self.assertEqual(preset_verdict("colord.service")[0], "enable")
- for unit in ("ublue-firstboot-date.path", "ublue-booted-image.service"):
- self.assertTrue((ROOT / "system_files/shared/usr/lib/systemd/system" / unit).is_file())
+ # dakota-config-firstboot-date ships these units (#1265); Utah keeps no copy.
+ parity = tomllib.loads((ROOT / "packages/utah.toml").read_text())["parity"]["packages"]
+ self.assertIn("dakota-config-firstboot-date", parity)
+ for unit in ("ublue-firstboot-date.path", "ublue-booted-image.service",
+ "bluefin-remove-installer.service"):
+ self.assertFalse((ROOT / "system_files/shared/usr/lib/systemd/system" / unit).exists())
def test_dakota_gnome_user_units_enabled_in_contract_preset_and_script(self):
# Dakota inherits these from gnome-build-meta's user presets.
@@ -651,11 +658,14 @@ def test_dakota_parity_patch_targets_are_required_files(self):
self.assertIn(path, files)
self.assertIn(path, file_contains)
- def test_dakota_uupd_files_shipped_and_required(self):
- # Dakota's elements/bluefin/uupd.bst ships these beside the binary.
+ def test_dakota_uupd_files_come_from_the_factory_and_are_required(self):
+ # Dakota's elements/bluefin/uupd.bst ships these beside the binary;
+ # dakota-config-uupd packages them (#1265), so Utah keeps no copy.
contract = tomllib.loads((ROOT / "contracts/bluefin-desktop.toml").read_text())
files = contract["configuration"]["files"]
file_contains = contract["configuration"]["file_contains"]
+ manifest = tomllib.loads((ROOT / "packages/utah.toml").read_text())["parity"]["packages"]
+ self.assertIn("dakota-config-uupd", manifest)
for path in (
"/usr/lib/systemd/system/uupd-manual.service",
"/etc/polkit-1/rules.d/uupd.rules",
@@ -663,14 +673,13 @@ def test_dakota_uupd_files_shipped_and_required(self):
):
with self.subTest(path=path):
self.assertIn(path, files)
- self.assertTrue((ROOT / "system_files/shared" / path.lstrip("/")).is_file())
- # The downloaded units land after Common's copy; pin which one ships.
- for path in ("/usr/lib/systemd/system/uupd.timer", "/usr/lib/systemd/system/uupd.service"):
+ self.assertFalse((ROOT / "system_files/shared" / path.lstrip("/")).exists())
+ # The package's units replace Common's copies; pin which one ships.
+ for path in ("/usr/lib/systemd/system/uupd.timer", "/usr/lib/systemd/system/uupd.service",
+ "/etc/uupd/config.json"):
with self.subTest(path=path):
self.assertIn(path, files)
self.assertIn(path, file_contains)
- config = json.loads((ROOT / "system_files/shared/etc/uupd/config.json").read_text())
- self.assertTrue(config["checks"]["hardware"]["enable"])
def test_bootc_fetch_apply_updates_masked_and_disabled(self):
preset = (ROOT / "system_files/shared/usr/lib/systemd/system-preset/85-utah-desktop.preset").read_text()
@@ -1073,96 +1082,111 @@ def test_drop_in_reasserts_dynamic_user_hardening(self):
)
-class StatsRefreshCacheTests(unittest.TestCase):
- """fastfetch must be able to read what bluefin-stats-refresh.service fetched.
+class DakotaCommonEditTests(unittest.TestCase):
+ """Dakota's edits to common's files, applied by configure-services.sh (#1266).
- The unit used DynamicUser=yes, which always puts CacheDirectory= under
- /var/cache/private (mode 0700), and Common's fastfetch.jsonc only read
- the read-only /usr/share/ublue-os placeholders, so the banner showed the
- placeholder forever (#860).
+ Each edit must be idempotent and fail the build when common's file no
+ longer has the shape it was written against.
"""
- UNIT = ROOT / "system_files/shared/usr/lib/systemd/system/bluefin-stats-refresh.service"
- SYSUSERS = ROOT / "system_files/shared/usr/lib/sysusers.d/utah-bluefin-stats.conf"
- SCRIPT = ROOT / "system_files/shared/usr/libexec/bluefin-refresh-stats"
- CACHE = "/var/cache/bluefin-stats"
- STATS = ("fastfetch-user-count", "bazaar-install-count")
-
- @staticmethod
- def directives(path):
- return [
- line.strip() for line in path.read_text().splitlines()
- if line.strip() and not line.lstrip().startswith("#")
- ]
+ SERVICES = (ROOT / "scripts/configure-services.sh").read_text()
+ COMMON_STATS = """ "break",
+ {
+ "type": "command",
+ "text": "cat /usr/share/ublue-os/fastfetch-user-count",
+ "format": "Murder Chickens: {1} (weekly)"
+ },
+ {
+ "type": "command",
+ "text": "cat /usr/share/ublue-os/bazaar-install-count",
+ "format": "Bazaar Installs: {1} (weekly)"
+ },
+ "break",
+ {
+ "type": "host"
+ }
+"""
+ DAKOTA_STATS = """ "break",
+ {
+ "type": "host"
+ }
+"""
- def test_unit_cache_is_public_and_owned_by_a_static_user(self):
- lines = self.directives(self.UNIT)
- for required in (
- "DynamicUser=no",
- "User=bluefin-stats",
- "Group=bluefin-stats",
- "CacheDirectory=bluefin-stats",
- "CacheDirectoryMode=0755",
- # Implied by DynamicUser=yes, not by DynamicUser=no.
- "NoNewPrivileges=yes",
- "PrivateTmp=yes",
- "RemoveIPC=yes",
- "RestrictSUIDSGID=yes",
- "ProtectSystem=strict",
- ):
- with self.subTest(directive=required):
- self.assertIn(required, lines)
- self.assertNotIn("DynamicUser=yes", lines)
- # Reusing "bluefin" would make systemd rename the existing
- # /var/cache/private/bluefin back on upgraded machines.
- self.assertNotIn("CacheDirectory=bluefin", lines)
-
- def test_sysusers_allocates_the_unit_user(self):
- active = self.directives(self.SYSUSERS)
- self.assertEqual(len(active), 1)
- fields = active[0].split(None, 3)
- self.assertEqual(fields[:3], ["u", "bluefin-stats", "-"])
+ def block(self, start):
+ import re
- def test_script_writes_where_fastfetch_reads(self):
- script = self.SCRIPT.read_text()
- self.assertIn(f"${{CACHE_DIRECTORY:-{self.CACHE}}}", script)
- contract = tomllib.loads((ROOT / "contracts/bluefin-desktop.toml").read_text())
- wanted = contract["configuration"]["file_contains"]["/usr/share/ublue-os/fastfetch.jsonc"]
- for stat in self.STATS:
- with self.subTest(stat=stat):
- self.assertIn(f"write_stat {stat} ", script)
- self.assertIn(
- f"cat {self.CACHE}/{stat} 2>/dev/null || cat /usr/share/ublue-os/{stat}",
- wanted,
- )
+ return re.search(rf"^{re.escape(start)}.*?^fi$", self.SERVICES, re.S | re.M).group(0)
- def test_fastfetch_patch_rewrites_common_lines_once(self):
- import re
+ def run_block(self, block, env_line):
import subprocess
- services = (ROOT / "scripts/configure-services.sh").read_text()
- block = re.search(r"^STATS_CACHE=.*?^fi$", services, re.S | re.M).group(0)
- common = "\n".join(
- f' "text": "cat /usr/share/ublue-os/{stat}",' for stat in self.STATS
- ) + "\n"
+ return subprocess.run(
+ ["bash", "-euo", "pipefail", "-c", f"{env_line}\n{block}\n"],
+ capture_output=True, text=True,
+ )
+
+ def test_weekly_stats_drop_matches_dakota_patch_once(self):
+ block = self.block("# Weekly community stats")
with tempfile.TemporaryDirectory() as tmp:
jsonc = Path(tmp) / "fastfetch.jsonc"
- jsonc.write_text(common)
- script = f"FASTFETCH_JSONC={jsonc}\n{block}\n"
+ jsonc.write_text(self.COMMON_STATS)
for _ in range(2):
- subprocess.run(["bash", "-euo", "pipefail", "-c", script], check=True)
- patched = jsonc.read_text()
- for stat in self.STATS:
- with self.subTest(stat=stat):
- self.assertEqual(
- patched.count(f"cat {self.CACHE}/{stat} 2>/dev/null || cat /usr/share/ublue-os/{stat}"),
- 1,
- )
-
- jsonc.write_text(' "text": "cat /somewhere/else",\n')
- result = subprocess.run(["bash", "-c", script], capture_output=True, text=True)
+ result = self.run_block(block, f"FASTFETCH_JSONC={jsonc}")
+ self.assertEqual(result.returncode, 0, result.stderr)
+ self.assertEqual(jsonc.read_text(), self.DAKOTA_STATS)
+
+ jsonc.write_text(' "text": "cat /usr/share/ublue-os/fastfetch-user-count",\n')
+ result = self.run_block(block, f"FASTFETCH_JSONC={jsonc}")
+ self.assertNotEqual(result.returncode, 0)
+ self.assertIn("re-fit Dakota's weekly-stats drop", result.stderr)
+
+ def test_ghostty_skel_follows_light_and_dark_once(self):
+ block = self.block("GHOSTTY_SKEL=")
+ with tempfile.TemporaryDirectory() as tmp:
+ skel = Path(tmp) / "config.ghostty"
+ block = block.replace("/etc/skel/.config/ghostty/config.ghostty", str(skel))
+ skel.write_text("# comment\ntheme = Catppuccin Mocha\nwindow-theme = ghostty\n")
+ for _ in range(2):
+ result = self.run_block(block, "")
+ self.assertEqual(result.returncode, 0, result.stderr)
+ self.assertEqual(
+ skel.read_text(),
+ "# comment\ntheme = light:Catppuccin Latte,dark:Catppuccin Mocha\nwindow-theme = ghostty\n",
+ )
+
+ skel.write_text("theme = Dracula\n")
+ result = self.run_block(block, "")
self.assertNotEqual(result.returncode, 0)
- self.assertIn("re-fit the community-stats patch", result.stderr)
+ self.assertIn("re-fit Dakota's dual-theme patch", result.stderr)
+
+ def test_zz0_check_fails_when_dakotas_repoint_would_apply(self):
+ block = self.block("ZZ0_OVERRIDE=")
+ with tempfile.TemporaryDirectory() as tmp:
+ override = Path(tmp) / "zz0.override"
+ block = block.replace(
+ "/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override", str(override)
+ )
+ uri = "picture-uri='file:///usr/share/backgrounds/bluefin/{}-bluefin.xml'\n"
+ override.write_text(uri.format("06"))
+ self.assertEqual(self.run_block(block, "").returncode, 0)
+ override.write_text(uri.format("12"))
+ result = self.run_block(block, "")
+ self.assertNotEqual(result.returncode, 0)
+ self.assertIn("projectbluefin/dakota#1902", result.stderr)
+ override.write_text("picture-uri='file:///var/lib/ublue-os/current-bluefin.xml'\n")
+ self.assertNotEqual(self.run_block(block, "").returncode, 0)
+
+ def test_month_units_ship_as_dakota_and_are_enabled(self):
+ import os
+
+ contract = tomllib.loads((ROOT / "contracts/bluefin-desktop.toml").read_text())
+ for unit in ("ublue-wallpaper-month.service", "bluefin-wallpaper-month.service"):
+ with self.subTest(unit=unit):
+ self.assertTrue((ROOT / "system_files/shared/usr/lib/systemd/system" / unit).is_file())
+ self.assertIn(unit, contract["services"]["enabled"])
+ self.assertEqual(preset_verdict(unit)[0], "enable")
+ sync = ROOT / "system_files/shared/usr/libexec/bluefin-wallpaper-month-sync"
+ self.assertTrue(os.access(sync, os.X_OK))
if __name__ == "__main__":
diff --git a/tests/test_flathub_descriptor.py b/tests/test_flathub_descriptor.py
index 11bd5bbd8..be856faa5 100644
--- a/tests/test_flathub_descriptor.py
+++ b/tests/test_flathub_descriptor.py
@@ -44,8 +44,6 @@ def setUp(self):
uupd = self.root / "tmp/uupd"
uupd.mkdir(parents=True)
(uupd / "uupd").write_text("#!/bin/sh\nexit 0\n")
- (uupd / "uupd.service").write_text("[Service]\nExecStart=/usr/bin/uupd\n")
- (uupd / "uupd.timer").write_text("[Timer]\nOnBootSec=1h\n")
def run_script(self):
source = (ROOT / "scripts/configure-services.sh").read_text()
diff --git a/tests/test_package_resolution.py b/tests/test_package_resolution.py
index 2ebffd9c8..36eeccf4b 100644
--- a/tests/test_package_resolution.py
+++ b/tests/test_package_resolution.py
@@ -607,6 +607,7 @@ def preset_directives(self, verb):
if line.startswith(f"{verb} ")
}
+
def test_systemd_boot_update_enabled_and_gated_on_the_loader(self):
# projectbluefin/utah#363: on systemd-boot systems bootupd stands down
# by design ("managed with bootctl"), so the image must carry the boot
diff --git a/tests/test_script_syntax_gate.py b/tests/test_script_syntax_gate.py
index f381d7771..6e9587d81 100644
--- a/tests/test_script_syntax_gate.py
+++ b/tests/test_script_syntax_gate.py
@@ -100,7 +100,7 @@ def test_gate_covers_scripts_the_old_hand_list_missed(self):
"iso/scripts/luks-unlock.py",
"iso/scripts/boot-installed.sh",
"scripts/build-gnome-extensions.sh",
- "system_files/shared/usr/libexec/bluefin-refresh-stats",
+ "system_files/shared/usr/libexec/bluefin-wallpaper-month-sync",
):
self.assertIn(missed, covered)
diff --git a/tests/test_timesyncd.py b/tests/test_timesyncd.py
index ce232f22f..f43366e04 100644
--- a/tests/test_timesyncd.py
+++ b/tests/test_timesyncd.py
@@ -57,16 +57,24 @@ def test_timesyncd_outranks_hummingbirds_disable(self):
self.assertIn("chronyd.service", services["disabled"])
def test_install_date_waits_for_the_first_sync(self):
- # Dakota files/firstboot/ublue-firstboot-date.path, verbatim.
- path_unit = ini(SYSTEMD / "system/ublue-firstboot-date.path")
- self.assertEqual(path_unit["Path"]["PathExists"], "/run/systemd/timesync/synchronized")
- self.assertEqual(path_unit["Install"]["WantedBy"], "multi-user.target")
- service = ini(SYSTEMD / "system/ublue-firstboot-date.service")
- self.assertFalse(service.has_section("Install"))
- self.assertEqual(service["Service"]["ExecStart"], "/usr/bin/ublue-firstboot-date")
- script = ROOT / "system_files/shared/usr/bin/ublue-firstboot-date"
- self.assertTrue(script.stat().st_mode & 0o111)
- self.assertIn("record=/var/lib/ublue-os/install-date", script.read_text())
+ # dakota-config-firstboot-date ships Dakota's files/firstboot units and
+ # script (#1265); Utah keeps no copy, which the package would overwrite.
+ parity = tomllib.loads((ROOT / "packages/utah.toml").read_text())["parity"]["packages"]
+ self.assertIn("dakota-config-firstboot-date", parity)
+ for copy in ("lib/systemd/system/ublue-firstboot-date.path",
+ "lib/systemd/system/ublue-firstboot-date.service",
+ "bin/ublue-firstboot-date"):
+ self.assertFalse((ROOT / "system_files/shared/usr" / copy).exists(), copy)
+ contains = tomllib.loads((ROOT / "contracts/bluefin-desktop.toml").read_text())[
+ "configuration"]["file_contains"]
+ self.assertIn("PathExists=/run/systemd/timesync/synchronized",
+ contains["/usr/lib/systemd/system/ublue-firstboot-date.path"])
+
+ def test_install_date_units_describe_utah(self):
+ for unit in ("ublue-firstboot-date.path", "ublue-firstboot-date.service"):
+ dropin = ini(SYSTEMD / f"system/{unit}.d/10-utah-description.conf")
+ self.assertIn("Utah", dropin["Unit"]["Description"])
+ self.assertNotIn("Dakota", dropin["Unit"]["Description"])
if __name__ == "__main__":