From fbec3b3de794797b93e6604589456b7d59095bbb Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Sat, 23 May 2026 19:32:18 -0400 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20bug=20batch=20may23=20=E2=80=94=20se?= =?UTF-8?q?arch-light,=20LockLayering,=20Readymade=20dock,=20toggle-devmod?= =?UTF-8?q?e=20tag,=20OTD=20blacklist,=20brew=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove search-light from enabled-extensions (crashes GDM, causes reboots) Closes #324 (pfanzola) - Fix LockLayering grep to ignore commented entries in rpm-ostreed.conf Closes #301, picks up PR #300 (joshyorko) - Remove Readymade installer from dock favorites (users re-click causing confusion) Closes #213 - Fix toggle-devmode reading image-tag from image-info.json; now reads from rpm-ostree status -b --json so stable-daily stays on stable-daily Closes #149 - Fix install-opentabletdriver: cleanup old rule files, add modprobe uinput and rmmod wacom/hid_uclogic so drivers unload immediately without reboot Closes #340 - Fix clean-system brew path: /home/linuxbrew -> /var/home/linuxbrew, use explicit path to match update.just Assisted-by: claude-sonnet-4-5 via pi --- bluefin-branding | 2 +- .../schemas/zz0-bluefin-modifications.gschema.override | 2 +- .../bluefin/usr/share/ublue-os/just/system.just | 6 +++--- system_files/shared/usr/share/ublue-os/just/apps.just | 10 ++++++++++ .../shared/usr/share/ublue-os/just/default.just | 6 +++--- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/bluefin-branding b/bluefin-branding index 59ca14a4..f5213ca6 160000 --- a/bluefin-branding +++ b/bluefin-branding @@ -1 +1 @@ -Subproject commit 59ca14a42f5a922159895d37935f70e408a42c7d +Subproject commit f5213ca61615bb79a8315fc4c5378a80ca93922e diff --git a/system_files/bluefin/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override b/system_files/bluefin/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override index 6ebd8716..4ab4211c 100644 --- a/system_files/bluefin/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override +++ b/system_files/bluefin/usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override @@ -1,7 +1,7 @@ #-------------- DESKTOP MODIFICATIONS --------------# [org.gnome.shell] -favorite-apps = ['com.fyralabs.Readymade.desktop', 'org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'io.github.kolunmi.Bazaar.desktop', 'org.gnome.Software.desktop', 'code.desktop'] +favorite-apps = ['org.mozilla.firefox.desktop', 'org.mozilla.Thunderbird.desktop', 'org.gnome.Nautilus.desktop', 'io.github.kolunmi.Bazaar.desktop', 'org.gnome.Software.desktop', 'code.desktop'] enabled-extensions = ['appindicatorsupport@rgcjonas.gmail.com', 'bazaar-integration@kolunmi.github.io', 'blur-my-shell@aunetx', 'dash-to-dock@micxgx.gmail.com', 'gradia-integration@alexandervanhee.github.io', 'gsconnect@andyholmes.github.io', 'logomenu@aryan_k'] [org.gnome.desktop.background] diff --git a/system_files/bluefin/usr/share/ublue-os/just/system.just b/system_files/bluefin/usr/share/ublue-os/just/system.just index acf0894b..564e5c2a 100644 --- a/system_files/bluefin/usr/share/ublue-os/just/system.just +++ b/system_files/bluefin/usr/share/ublue-os/just/system.just @@ -19,9 +19,10 @@ toggle-devmode: set -e IMAGE_INFO_FILE="${IMAGE_INFO_FILE:-/usr/share/ublue-os/image-info.json}" IMAGE_NAME="$(jq -rc '."image-name"' "${IMAGE_INFO_FILE}")" - IMAGE_REF="$(jq -rc '."image-ref"' "${IMAGE_INFO_FILE}" | sed "s/.*ghcr/ghcr/")" - CURRENT_IMAGE="${IMAGE_REF}:$(jq -rc '."image-tag"' "${IMAGE_INFO_FILE}")" IMAGE_BASE_NAME="$(cut -f1 -d\- <<< "${IMAGE_NAME}")" + # Use the booted deployment reference so stable-daily images get the correct tag + # Strip transport prefix (ostree-image-signed:docker://, ostree-unverified-registry:, etc.) + CURRENT_IMAGE="$(rpm-ostree status -b --json | jq -rc '.deployments[0]."container-image-reference"' | sed -E 's|^.*://||; s|^[a-z-]+:||')" set +e if grep -q -E -e "dx$" <<< "${IMAGE_NAME}" ; then @@ -100,4 +101,3 @@ alias rollback-helper := rebase-helper [group('System')] rebase-helper: @/usr/bin/ublue-rollback-helper - diff --git a/system_files/shared/usr/share/ublue-os/just/apps.just b/system_files/shared/usr/share/ublue-os/just/apps.just index 4b1114e8..652220e6 100644 --- a/system_files/shared/usr/share/ublue-os/just/apps.just +++ b/system_files/shared/usr/share/ublue-os/just/apps.just @@ -30,8 +30,18 @@ install-opentabletdriver: | tar --strip-components=1 -xvzf - -C "${OTD_TMPDIR}" # https://opentabletdriver.net/Wiki/Documentation/RequiredPermissions + # Clean up any old conflicting rule files before installing new ones + for old_rule in /etc/udev/rules.d/9{0,9}-opentabletdriver.rules; do + [ -f "${old_rule}" ] && sudo rm -f "${old_rule}" + done + sudo cp "${OTD_TMPDIR}/etc/udev/rules.d/70-opentabletdriver.rules" /etc/udev/rules.d/71-opentabletdriver.rules echo -ne "blacklist hid_uclogic\nblacklist wacom\n" | sudo tee /etc/modprobe.d/blacklist-opentabletdriver.conf + # Load uinput and unload conflicting kernel drivers immediately (takes effect without reboot) + sudo modprobe uinput + sudo rmmod wacom hid_uclogic 2>/dev/null || true + sudo udevadm control --reload-rules + sudo udevadm trigger rm -rf "${OTD_TMPDIR}" flatpak --system install -y flathub net.opentabletdriver.OpenTabletDriver diff --git a/system_files/shared/usr/share/ublue-os/just/default.just b/system_files/shared/usr/share/ublue-os/just/default.just index 554ce64c..6be8fb54 100644 --- a/system_files/shared/usr/share/ublue-os/just/default.just +++ b/system_files/shared/usr/share/ublue-os/just/default.just @@ -42,9 +42,9 @@ clean-system: flatpak uninstall --unused rpm-ostree cleanup -bm - if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then - brew autoremove - brew cleanup + if [ -x /var/home/linuxbrew/.linuxbrew/bin/brew ]; then + /var/home/linuxbrew/.linuxbrew/bin/brew autoremove + /var/home/linuxbrew/.linuxbrew/bin/brew cleanup fi # Show all messages from this boot From ecfab9364db6ad1713d6b0bb3ee70e2e54068e47 Mon Sep 17 00:00:00 2001 From: James Reilly Date: Sun, 31 May 2026 08:04:44 +0100 Subject: [PATCH 2/2] fix(just): fix incorrect blacklist filename in OpenTabletDriver uninstall command --- system_files/shared/usr/share/ublue-os/just/apps.just | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/shared/usr/share/ublue-os/just/apps.just b/system_files/shared/usr/share/ublue-os/just/apps.just index 652220e6..90e516d5 100644 --- a/system_files/shared/usr/share/ublue-os/just/apps.just +++ b/system_files/shared/usr/share/ublue-os/just/apps.just @@ -53,7 +53,7 @@ install-opentabletdriver: systemctl enable --user --now opentabletdriver.service elif [ "${EXIT_CODE}" == 1 ] ; then echo "Uninstalling OpenTabletDriver..." - sudo rm -f /etc/modprobe.d/blacklist-opentabletdriver.rules /etc/udev/rules.d/71-opentabletdriver.rules + sudo rm -f /etc/modprobe.d/blacklist-opentabletdriver.conf /etc/udev/rules.d/71-opentabletdriver.rules flatpak --system remove -y flathub net.opentabletdriver.OpenTabletDriver fi