Merge branch 'main' into testing

Containerfile

@@ -92,6 +92,7 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
         /tmp/akmods-rpms/kmods/*nct6687*.rpm \
         /tmp/akmods-rpms/kmods/*evdi*.rpm \
         /tmp/akmods-rpms/kmods/*zenpower3*.rpm \
+        /tmp/akmods-rpms/kmods/*bmi260*.rpm \
         /tmp/akmods-rpms/kmods/*ryzen-smu*.rpm && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
 
@@ -432,6 +433,7 @@ RUN /tmp/image-info.sh && \
     cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \
     echo "import \"/usr/share/ublue-os/just/80-bazzite.just\"" >> /usr/share/ublue-os/justfile && \
     pip install --prefix=/usr yafti && \
+    pip install --prefix=/usr topgrade && \
     pip install --prefix=/usr hyfetch && \
     sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \

system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just

@@ -117,6 +117,7 @@ get-simpledeckytdp:
       curl -L $(curl -s https://api.github.com/repos/aarron-lee/SimpleDeckyTDP/releases/latest | grep "browser_download_url" | cut -d '"' -f 4) -o /tmp/SimpleDeckyTDP.tar.gz
       sudo tar -xzf /tmp/SimpleDeckyTDP.tar.gz -C $HOME/homebrew/plugins
       rm /tmp/SimpleDeckyTDP.tar.gz
+      sudo sed -i 's/ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE=0/ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE=1/g' /etc/default/steam-hardware-control
     else
       echo 'Please install Decky Loader by running ujust get-decky first.'
     fi
@@ -457,8 +458,10 @@ install-scrcpy: distrobox-check-fedora
 
 # Install OpenTabletDriver, an open source, cross-platform, user-mode tablet driver
 install-opentabletdriver:
+    #!/usr/bin/bash
+    source /usr/lib/ujust/ujust.sh
     if grep -qvz "arch" <<< $(distrobox list); then \
-      distrobox-create --nvidia --image ghcr.io/ublue-os/arch-distrobox:latest -n arch -Y; \
+      Assemble noconfirmcreate "" "arch"; \
     fi && \
     distrobox enter -n arch -- ' paru -S opentabletdriver --noconfirm' && \
     mkdir -p ~/.config/systemd/user/ && \
@@ -505,7 +508,8 @@ restore-gnome-folders:
 [private]
 distrobox-check-fedora:
     #!/bin/env bash
+    source /usr/lib/ujust/ujust.sh
     if grep -qvz "fedora" <<< $(distrobox list); then
       echo "Setting up Fedora distrobox"
-      /usr/bin/ujust distrobox-fedora
+      Assemble noconfirmcreate "" "fedora"
     fi

system_files/desktop/shared/usr/etc/ublue-os/topgrade.toml

@@ -0,0 +1,3 @@
+[commands]
+"Firefox GNOME Theme" = "/usr/libexec/topgrade/mozilla-gnome-theme-update"
+"Steam Adwaita Theme" = "/usr/libexec/topgrade/adwaita-for-steam-update"

system_files/desktop/shared/usr/etc/ublue-update.d/user/99-bazzite-arch-user-update.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/bash
-
-if [[ $(podman ps -a --no-trunc --format {{.Names}} | grep -E '(^|\s)bazzite-arch($|\s)') ]]; then
-	unset SUDO_USER # avoid distrobox sudo checks
-	/usr/bin/distrobox-enter -n bazzite-arch -- '  paru -Sua --noconfirm'
-else
-	echo "Update skipped: bazzite-arch not installed"
-fi

system_files/desktop/shared/usr/libexec/topgrade/adwaita-for-steam-update

@@ -0,0 +1,15 @@
+#!/usr/bin/bash
+shopt -s nullglob
+
+echo "Looking for updates..."
+
+if [ -d "$HOME/homebrew/themes/Adwaita-for-Steam" ]; then
+  cd "$HOME/homebrew/themes/Adwaita-for-Steam"
+  echo "Theme found, pulling latest with git."
+  git pull
+  echo "Update complete."
+else
+  echo -e "\nNothing to do."
+fi
+
+exit 0

system_files/desktop/shared/usr/libexec/topgrade/mozilla-gnome-theme-update

@@ -0,0 +1,26 @@
+#!/usr/bin/bash
+shopt -s nullglob
+
+echo "Looking for updates..."
+
+# Flatpak Firefox
+for firefox_gnome_theme in "$HOME/.var/app/org.mozilla.firefox/.mozilla/firefox/"*".default"*"/chrome/firefox-gnome-theme/"; do
+  if [ -d "$firefox_gnome_theme" ]; then
+    echo "Firefox theme found, pulling latest with git"
+    cd "$firefox_gnome_theme"
+    git pull
+    echo "Update complete"
+  fi
+done
+
+# Flatpak Thunderbird
+for thunderbird_gnome_theme in "$HOME/.var/app/org.mozilla.Thunderbird/.thunderbird/"*".default"*"/chrome/thunderbird-gnome-theme/"; do
+  if [ -d "$thunderbird_gnome_theme" ]; then
+    echo "Thunderbird theme found, pulling latest with git"
+    cd "$thunderbird_gnome_theme"
+    git pull
+    echo "Update complete"
+  fi
+done
+
+exit 0

system_files/desktop/shared/usr/share/ublue-os/just/10-update.just

@@ -0,0 +1,14 @@
+# vim: set ft=make :
+
+alias upgrade := update
+
+# Update system, flatpaks, and containers all at once
+update:
+    /usr/bin/topgrade --config /usr/share/ublue-os/topgrade.toml
+
+# Update device firmware
+[no-exit-message]
+update-firmware:
+    /usr/bin/fwupdmgr refresh --force
+    /usr/bin/fwupdmgr get-updates
+    /usr/bin/fwupdmgr update

system_files/desktop/shared/usr/share/ublue-os/topgrade.toml

@@ -0,0 +1,6 @@
+[include]
+paths = ["/etc/ublue-os/topgrade.toml"]
+
+[misc]
+disable = ["toolbx", "self_update"]
+ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "pip3"]