Merge current Quattro into sudo expiry fix

2026-09-08 15:28:24 +01:00
commit 60ac419f8c
@@ -70,10 +70,6 @@ magick -background white -fill black -font default/fonts/omarchy/omarchy.ttf \
  -pointsize 110 label:@/tmp/row.txt /tmp/font-row.png
 ```

-Then confirm it in the running menu per
-[`visual-verification.md`](visual-verification.md). Fontconfig prefers the
-packaged font over a copy in `~/.local/share/fonts` for the same family, so a
-preview needs either the real file replaced or a `<rejectfont>` rule in
-`~/.config/fontconfig/conf.d/` pointing fontconfig away from the packaged one.
-Restart the shell afterwards — Qt reads the font database at startup, so
-`omarchy menu refresh` alone will not pick up a changed font.
+Then confirm it in the running menu per [`visual-verification.md`](visual-verification.md). Avoid leaving two fonts with the `omarchy` family registered: Qt can use an old copy in `~/.local/share/fonts` even when `fc-match omarchy` reports the packaged font. For a preview, either replace the packaged file in the disposable VM or temporarily exclude it with a `<rejectfont>` rule in `~/.config/fontconfig/conf.d/` before loading the candidate.
+
+Refresh the font cache and restart the shell afterwards — Qt reads the font database at startup, so `omarchy menu refresh` alone will not pick up a changed font. Remove temporary fonts and rules after verification.
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Detect whether an Elgato Cam Link 4K is plugged in.
+
+grep -qsx "Cam Link 4K" /sys/bus/usb/devices/*/product
@@ -1569,7 +1569,6 @@ refresh	xournalpp/settings.xml	1c1a9efbf1b6dc7813bf3440fd5bf8409fc283e8d0192ca29
 # fastfetch/config.jsonc -> /etc/fastfetch/config.jsonc
 # fontconfig/fonts.conf -> /usr/share/fontconfig/conf.avail/50-omarchy.conf
 # mimeapps.list -> /usr/share/applications/mimeapps.list
-# omarchy.ttf -> /usr/share/fonts/omarchy/omarchy.ttf
 # systemd/user/bt-agent.service -> /usr/lib/systemd/user/bt-agent.service
 # systemd/user/omarchy-recover-internal-monitor.service -> /usr/lib/systemd/user/omarchy-recover-internal-monitor.service
 # systemd/user/omarchy-sleep-lock.service -> /usr/lib/systemd/user/omarchy-sleep-lock.service
@@ -1602,7 +1601,6 @@ retire	fontconfig/fonts.conf	6dec98b539388b95ecfdb3c7ab951001c712820eb0581002832
 retire	fontconfig/fonts.conf	3545f6c5a8c1465df7a4e251b3c2047d4ba03654c86636794f64cb0d8ea8ef63
 retire	fontconfig/fonts.conf	0f085b449f1cbe8eda3b59a6235bf2a3ddb6e982ab5d22fa642248916e63bafc
 retire	mimeapps.list	3b574cef135b5deb7a8a0c7e17139037cf1fe155300e3809f60bed0e04120975
-retire	omarchy.ttf	e55e67119e82f56f92d90cbf54b7ccc1b2946b32c535a29370439d7ef5215966
 retire	systemd/user/bt-agent.service	0406b577a1225dc2a9f86638d3c346eb3635168576f04050be50ebcc0be6be12
 retire	systemd/user/omarchy-recover-internal-monitor.service	b9b92cedc44cf3cb6216948629be55b53d16746e31896dc6469fd49ba55e82f4
 retire	systemd/user/omarchy-recover-internal-monitor.service	e1483079b9f2aefcd43b4722c75a31643e5f3bb5a2eada5f52f1d7d201e8c289
@@ -2381,6 +2379,8 @@ cleanup_retired_services
 ensure_sleep_lock_service
 remove_retired_default_packages
 run_final_system_package_upgrade
+# This also retires the stock ~/.local/share/fonts/omarchy.ttf missed by the
+# former ~/.config retirement entry, through migration 1788848726.
 run_post_upgrade_migrations
 run_post_upgrade_update_steps
 refresh_current_theme_after_upgrade
@@ -0,0 +1,9 @@
+[Unit]
+Description=Create the Cam Link 4K virtual camera
+After=systemd-modules-load.service
+
+[Service]
+# Reruns on every relay start, so a deleted or unloaded device comes back.
+Type=oneshot
+ExecStart=/usr/bin/modprobe v4l2loopback
+ExecStart=/bin/sh -c 'grep -qsx "Cam Link 4K" /sys/devices/virtual/video4linux/*/name || exec v4l2loopback-ctl add -n "Cam Link 4K" -x 1'
@@ -0,0 +1,16 @@
+[Unit]
+# udev starts this when the Cam Link 4K appears. Only the device's stop is
+# tied in: a start dependency on it would leave a job waiting whenever the
+# base v4l2-relayd.service is started with no Cam Link attached.
+ConditionPathExists=/dev/camlink4k
+StopPropagatedFrom=dev-camlink4k.device
+Requires=camlink-4k-loopback.service
+After=camlink-4k-loopback.service
+
+[Service]
+RestartSec=2
+# The packaged command line, plus sync=false on the sink. v4l2src stamps each
+# frame with its capture time, so by the time it reaches the sink it is already
+# past due and a synced sink drops every one of them.
+ExecStart=
+ExecStart=/bin/sh -c 'DEVICE=$(grep -l -m1 -E "^${CARD_LABEL}$" /sys/devices/virtual/video4linux/*/name | cut -d/ -f6); exec /usr/bin/v4l2-relayd -i "${VIDEOSRC}" $${SPLASHSRC:+-s "$${SPLASHSRC}"} -o "appsrc name=appsrc caps=video/x-raw,format=${FORMAT},width=${WIDTH},height=${HEIGHT},framerate=${FRAMERATE} ! videoconvert ! v4l2sink name=v4l2sink sync=false device=/dev/$${DEVICE}" $EXTRA_OPTS'
@@ -0,0 +1,6 @@
+# Keep the Elgato Cam Link 4K's raw capture node away from users and hand it to
+# the v4l2-relayd instance that re-exposes it as a 16:9 virtual camera.
+# Sorted after 70-uaccess adds the tag and before 73-seat-late applies its ACL.
+SUBSYSTEM=="video4linux", ENV{ID_VENDOR_ID}=="0fd9", ENV{ID_MODEL}=="Cam_Link_4K", ENV{ID_V4L_CAPABILITIES}==":capture:", \
+  TAG-="uaccess", OWNER="root", GROUP="root", MODE="0600", SYMLINK+="camlink4k", \
+  TAG+="systemd", ENV{SYSTEMD_ALIAS}="/dev/camlink4k", ENV{SYSTEMD_WANTS}="v4l2-relayd@camlink.service"
@@ -0,0 +1,9 @@
+# Elgato Cam Link 4K relayed as a fixed 16:9 virtual camera. Browser meeting
+# apps send 720p at most; raise WIDTH/HEIGHT (up to 3840x2160) for apps that
+# can use more.
+VIDEOSRC="v4l2src device=/dev/camlink4k"
+FORMAT=NV12
+WIDTH=1280
+HEIGHT=720
+FRAMERATE=30/1
+CARD_LABEL="Cam Link 4K"
@@ -0,0 +1,4 @@
+# Keep Cursor optional while applying these options whenever mise installs it.
+# Expose only its launcher so the bundled Node cannot shadow the user's Node.
+[tool_alias]
+cursor-agent = 'http:cursor-agent[bin_path=bin,postinstall=mkdir -p "$MISE_TOOL_INSTALL_PATH/bin" && ln -sfn ../dist-package/cursor-agent "$MISE_TOOL_INSTALL_PATH/bin/cursor-agent"]'
@@ -24,6 +24,9 @@ run_logged "$OMARCHY_INSTALL/hardware/intel/fred.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/fix-wifi7-eht.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/sof-firmware.sh"

+# Pulls in v4l2loopback-dkms, so it sits after the Panther Lake kernel swap.
+run_logged "$OMARCHY_INSTALL/hardware/fix-elgato-camlink-4k.sh"
+
 # Rebuilds the boot image, so it has to follow the Panther Lake kernel swap
 # above rather than sit with the other Dell leaf at the top of this file.
 run_logged "$OMARCHY_INSTALL/hardware/dell-xps13-sidecar-amps.sh"
@@ -6,5 +6,5 @@ pci_info=$(lspci -nn)

 if (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then
  echo "BCM4360 / BCM4331 detected"
-  omarchy-pkg-add broadcom-wl dkms linux-headers
+  omarchy-pkg-add broadcom-wl-dkms linux-headers
 fi
@@ -0,0 +1,18 @@
+# Expose the Elgato Cam Link 4K as a 16:9-only virtual camera.
+# Browsers ask it for 640x480, which it fills by cropping, and the 4:3 frame
+# then gets stretched into a 16:9 tile. The raw node is hidden from users and
+# v4l2-relayd re-exposes it at 1280x720 under the same name.
+
+if omarchy-hw-elgato-camlink-4k; then
+  mapfile -t kernel_headers < <(pacman -Qqs '^linux(-zen|-lts|-hardened|-t2|-ptl|-omarchy-bore)?$' | sed 's/$/-headers/')
+  omarchy-pkg-add "${kernel_headers[@]}" v4l2loopback-dkms v4l2loopback-utils v4l2-relayd
+
+  sudo install -Dm644 "$OMARCHY_PATH/default/udev/elgato-camlink-4k.rules" /etc/udev/rules.d/71-elgato-camlink-4k.rules
+  sudo install -Dm644 "$OMARCHY_PATH/default/v4l2-relayd/camlink.conf" /etc/v4l2-relayd.d/camlink.conf
+  sudo install -Dm644 "$OMARCHY_PATH/default/systemd/system/camlink-4k-loopback.service" /etc/systemd/system/camlink-4k-loopback.service
+  sudo install -Dm644 "$OMARCHY_PATH/default/systemd/system/v4l2-relayd@camlink.service.d/camlink.conf" "/etc/systemd/system/v4l2-relayd@camlink.service.d/camlink.conf"
+
+  # The module's own default device would otherwise show up in browsers as
+  # "Dummy video device" on machines without another relay.
+  echo "options v4l2loopback exclusive_caps=1" | sudo tee /etc/modprobe.d/v4l2loopback-exclusive-caps.conf >/dev/null
+fi
@@ -5,7 +5,7 @@ autoconf-archive
 asusctl
 base
 base-devel
-broadcom-wl
+broadcom-wl-dkms
 btrfs-progs
 dkms
 egl-wayland
@@ -0,0 +1,21 @@
+echo "Retire the stock user icon font missed by the Quattro upgrade"
+
+legacy_font="$HOME/.local/share/fonts/omarchy.ttf"
+
+# The upgrader treated this as ~/.config/omarchy.ttf and left the old family
+# registered alongside the packaged font. Preserve custom fonts and symlinks.
+if [[ -f $legacy_font && ! -L $legacy_font ]]; then
+  legacy_hash=$(sha256sum "$legacy_font")
+  if [[ ${legacy_hash%% *} == "e55e67119e82f56f92d90cbf54b7ccc1b2946b32c535a29370439d7ef5215966" ]]; then
+    if [[ ! -f /usr/share/fonts/omarchy/omarchy.ttf ]]; then
+      echo "Packaged Omarchy icon font is missing; keeping the legacy font." >&2
+      exit 1
+    fi
+
+    rm "$legacy_font"
+  fi
+fi
+
+# Also refresh on retries after removal succeeded but the cache refresh failed.
+# The normal update restarts the shell, which reloads Qt's font database.
+fc-cache -f
@@ -0,0 +1,20 @@
+echo "Expose the Elgato Cam Link 4K as a 16:9 virtual camera"
+
+if omarchy-hw-elgato-camlink-4k; then
+  source "$OMARCHY_PATH/install/hardware/fix-elgato-camlink-4k.sh"
+
+  sudo systemctl daemon-reload
+  sudo udevadm control --reload
+
+  # Re-run the rules for the Cam Link that is plugged in now so it gets hidden
+  # and relayed right away. The user ACL from its first plug survives a
+  # re-trigger, so drop it here; a replug or reboot does the same on its own.
+  sudo udevadm trigger --action=add --subsystem-match=video4linux
+  sudo udevadm settle
+  [[ -e /dev/camlink4k ]] && sudo setfacl -b /dev/camlink4k
+
+  # The trigger only starts the relay when the rule is new to the device.
+  # Start it outright so a failed module build or loopback surfaces here,
+  # with the raw camera hidden, rather than passing silently.
+  sudo systemctl start v4l2-relayd@camlink.service
+fi
@@ -0,0 +1,3 @@
+Stock Omarchy icon font from `config/omarchy.ttf` at `babfafa5^`, before fonts moved into the settings package. SHA-256: `e55e67119e82f56f92d90cbf54b7ccc1b2946b32c535a29370439d7ef5215966`.
+
+The migration test uses the real font so it exercises the exact-content guard without mocking `sha256sum`.
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "$0")/base-test.sh"
+
+migration="$ROOT/migrations/1788848726.sh"
+fixture="$ROOT/test/shell.d/fixtures/legacy-icon-font/omarchy.ttf"
+test_dir=$(mktemp -d)
+trap 'rm -rf "$test_dir"' EXIT
+
+export FONT_TEST_HOME="$test_dir/home with spaces"
+export FONT_TEST_PACKAGE="$test_dir/packaged-font.ttf"
+export FONT_TEST_CACHE_LOG="$test_dir/cache.log"
+legacy_font="$FONT_TEST_HOME/.local/share/fonts/omarchy.ttf"
+
+# Redirect only the filesystem roots; run the real hash check and removal.
+# Never change the developer's HOME or refresh their real font cache.
+python3 - "$migration" "$test_dir/migration.sh" <<'PY'
+import pathlib
+import sys
+
+source = pathlib.Path(sys.argv[1]).read_text()
+source = source.replace('$HOME', '$FONT_TEST_HOME')
+source = source.replace('/usr/share/fonts/omarchy/omarchy.ttf', '$FONT_TEST_PACKAGE')
+pathlib.Path(sys.argv[2]).write_text(source)
+PY
+
+mkdir -p "$test_dir/bin"
+cat > "$test_dir/bin/fc-cache" <<'SH'
+#!/bin/bash
+printf '%s\n' "$*" >> "$FONT_TEST_CACHE_LOG"
+exit "${FONT_TEST_CACHE_STATUS:-0}"
+SH
+chmod +x "$test_dir/bin/fc-cache"
+
+reset_fonts() {
+  rm -rf "$FONT_TEST_HOME"
+  mkdir -p "$FONT_TEST_HOME/.local/share/fonts" "$FONT_TEST_HOME/.config"
+  cp "$ROOT/default/fonts/omarchy/omarchy.ttf" "$FONT_TEST_PACKAGE"
+  : > "$FONT_TEST_CACHE_LOG"
+}
+
+run_migration() {
+  PATH="$test_dir/bin:$PATH" bash -euo pipefail "$test_dir/migration.sh" > "$test_dir/output" 2>&1
+}
+
+reset_fonts
+cp "$fixture" "$legacy_font"
+cp "$fixture" "$FONT_TEST_HOME/.config/omarchy.ttf"
+run_migration
+[[ ! -e $legacy_font ]] || fail "stock font is removed from the actual user font directory"
+cmp "$fixture" "$FONT_TEST_HOME/.config/omarchy.ttf" || fail "unrelated config path is untouched"
+cmp "$ROOT/default/fonts/omarchy/omarchy.ttf" "$FONT_TEST_PACKAGE" || fail "packaged font is untouched"
+[[ $(cat "$FONT_TEST_CACHE_LOG") == "-f" ]] || fail "font cache is refreshed after retirement"
+pass "retire the known stock font at its real path and refresh the cache"
+
+run_migration
+[[ ! -e $legacy_font ]] || fail "a second run leaves the stock font retired"
+pass "font retirement is idempotent"
+
+reset_fonts
+cp "$fixture" "$legacy_font"
+printf 'custom modification\n' >> "$legacy_font"
+cp "$legacy_font" "$test_dir/custom-font.ttf"
+run_migration
+cmp "$test_dir/custom-font.ttf" "$legacy_font" || fail "custom font is preserved"
+pass "preserve a modified font with the legacy filename"
+
+reset_fonts
+cp "$fixture" "$test_dir/symlink-target.ttf"
+ln -s "$test_dir/symlink-target.ttf" "$legacy_font"
+run_migration
+[[ -L $legacy_font ]] || fail "user font symlink is preserved"
+cmp "$fixture" "$test_dir/symlink-target.ttf" || fail "symlink target is untouched"
+pass "preserve user font symlinks even when they point to the stock font"
+
+reset_fonts
+run_migration
+[[ ! -e $legacy_font ]] || fail "an absent user font is left absent"
+pass "handle installs without a legacy user font"
+
+reset_fonts
+cp "$fixture" "$legacy_font"
+rm "$FONT_TEST_PACKAGE"
+if run_migration; then
+  fail "missing packaged font keeps the repair pending"
+fi
+cmp "$fixture" "$legacy_font" || fail "keep the stock font until its replacement is present"
+[[ ! -s $FONT_TEST_CACHE_LOG ]] || fail "missing replacement stops before cache refresh"
+pass "preserve the stock font and fail when the packaged replacement is missing"
+
+reset_fonts
+cp "$fixture" "$legacy_font"
+if FONT_TEST_CACHE_STATUS=17 run_migration; then
+  fail "font cache failure keeps the repair pending"
+fi
+[[ ! -e $legacy_font ]] || fail "cache failure follows successful retirement"
+run_migration
+(( $(wc -l < "$FONT_TEST_CACHE_LOG") == 2 )) || fail "retry refreshes the cache after the file was removed"
+pass "retry a failed cache refresh after successful font retirement"
+
+if grep -q $'^retire\tomarchy.ttf\t' "$ROOT/bin/omarchy-upgrade-to-quattro"; then
+  fail "upgrader no longer treats the user font as a config file"
+fi
+pass "upgrader leaves font retirement to its post-upgrade migrations"