Merge branch 'ublue-os:main' into changelog-decky

.github/workflows/build.yml

@@ -201,7 +201,7 @@ jobs:
             sudo podman pull ${{ env.PULL_IMAGE_REGISTRY }}/akmods-${{ matrix.target_nvidia_flavor }}:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-${{ matrix.kernel_version }}
 
             # Add rechunk as well to remove this source of failure
-            sudo podman pull ghcr.io/hhd-dev/rechunk:v1.1.1
+            sudo podman pull ghcr.io/hhd-dev/rechunk:v1.1.2
 
       - name: Get source versions
         id: labels
@@ -321,9 +321,9 @@ jobs:
       # Reprocess raw-img using rechunker which will delete it
       - name: Run Rechunker
         id: rechunk
-        uses: hhd-dev/[email protected].1
+        uses: hhd-dev/[email protected].2
         with:
-          rechunk: 'ghcr.io/hhd-dev/rechunk:v1.1.1'
+          rechunk: 'ghcr.io/hhd-dev/rechunk:v1.1.2'
           ref: 'raw-img'
           prev-ref: '${{ steps.generate-prev-ref.outputs.ref }}'
           version: '${{ steps.generate-version.outputs.tag }}'

.github/workflows/clean.yml

@@ -14,7 +14,7 @@ jobs:
       packages: write
     steps:
       - name: Delete Images Older Than 90 Days
-        uses: dataaxiom/[email protected].15
+        uses: dataaxiom/[email protected].16
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           packages: bazzite,bazzite-ally-budgie,bazzite-asus-nvidia,bazzite-asus-nvidia-open,bazzite-budgie,bazzite-budgie-asus,bazzite-budgie-asus-nvidia,bazzite-budgie-nvidia,bazzite-budgie-surface,bazzite-budgie-surface-nvidia,bazzite-deck,bazzite-deck-budgie,bazzite-deck-gnome,bazzite-deck-gnome-nokmods,bazzite-deck-gnome-nvidia,bazzite-deck-nokmods,bazzite-deck-nvidia,bazzite-framegame-budgie,bazzite-gnome,bazzite-gnome-asus-nvidia,bazzite-gnome-asus-nvidia-open,bazzite-gnome-nokmods,bazzite-gnome-nvidia,bazzite-gnome-nvidia-open,bazzite-nokmods,bazzite-nvidia,bazzite-nvidia-open

system_files/desktop/shared/usr/bin/bazzite-steam

@@ -19,6 +19,7 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" ]]; then
   DECK_SUSPEND="/usr/share/ublue-os/bazzite/bazzite-suspend.webm"
   OLED_STARTUP="/usr/share/ublue-os/bazzite/bazzite-oled.webm"
   OLED_SUSPEND="/usr/share/ublue-os/bazzite/bazzite-suspend-oled.webm"
+  SKIP_VIDEOS=false
 
   # Check for Galileo model
   if [[ ":Galileo:" =~ ":$SYS_ID:" ]]; then
@@ -32,7 +33,17 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" ]]; then
   # Install Bazzite's Steam Game Mode Startup & Suspend Videos
   mkdir -p $HOME/.local/share/Steam/config/uioverrides/movies
 
-  if [ ! -f $HOME/.local/share/Steam/config/uioverrides/movies/bazzite_novideo ]; then
+  # Check for the no video flag
+  if [ -f $HOME/.local/share/Steam/config/uioverrides/movies/bazzite_novideo ]; then
+    SKIP_VIDEOS=true
+  fi
+
+  # Check for the Animation Changer plugin, if it exists then they probably don't want us.
+  if [ -f $HOME/homebrew/plugins/SDH-AnimationChanger/main.py ]; then
+    SKIP_VIDEOS=true
+  fi
+
+  if ! $SKIP_VIDEOS; then
 
     LOCATION_STARTUP=$HOME/.local/share/Steam/config/uioverrides/movies/deck_startup.webm
     LOCATION_SUSPEND=$HOME/.local/share/Steam/config/uioverrides/movies/steam_os_suspend.webm
@@ -47,15 +58,15 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" ]]; then
     if ! cmp --silent $VIDEO_SUSPEND $LOCATION_SUSPEND; then
       cp $VIDEO_SUSPEND $LOCATION_SUSPEND
     fi
-    
+
     if ! cmp --silent $VIDEO_SUSPEND $LOCATION_SUSPEND_OLD; then
       cp $VIDEO_SUSPEND $LOCATION_SUSPEND_OLD
     fi
 
     if ! cmp --silent $VIDEO_SUSPEND $LOCATION_THROBBER; then
       cp $VIDEO_SUSPEND $LOCATION_THROBBER
     fi
-    
+
     if ! cmp --silent $VIDEO_SUSPEND $LOCATION_THROBBER_OLD; then
       cp $VIDEO_SUSPEND $LOCATION_THROBBER_OLD
     fi

system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just

@@ -131,16 +131,14 @@ install-scrcpy: distrobox-check-fedora
 install-opentabletdriver:
     #!/usr/bin/bash
     source /usr/lib/ujust/ujust.sh
-    if grep -qvz "arch" <<< $(distrobox list); then \
-      Assemble noconfirmcreate "" "arch"; \
-    fi && \
-    distrobox enter -n arch -- bash -c 'paru -Syu --noconfirm && paru -S opentabletdriver --noconfirm' && \
-    mkdir -p ~/.config/systemd/user/ && \
-    rm -f ~/.config/systemd/user/arch-opentabletdriver.service && \
-    wget https://raw.githubusercontent.com/ublue-os/bazzite/main/post_install_files/OpenTabletDriver/opentabletdriver.service -O ~/.config/systemd/user/arch-opentabletdriver.service && \
+    echo "Installing OpenTabletDriver..."
+    flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
+    flatpak --system install -y flathub net.opentabletdriver.OpenTabletDriver && \
+    mkdir -p $HOME/.config/OpenTabletDriver && \
+    flatpak override --user --filesystem=xdg-config/OpenTabletDriver net.opentabletdriver.OpenTabletDriver && \
+    curl -s https://raw.githubusercontent.com/flathub/net.opentabletdriver.OpenTabletDriver/refs/heads/master/scripts/opentabletdriver.service > ~/.config/systemd/user/opentabletdriver.service  && \
     systemctl --user daemon-reload && \
-    systemctl enable --user --now arch-opentabletdriver.service && \
-    distrobox enter -n arch -- bash -c 'distrobox-export --app otd-gui'
+    systemctl enable --user --now opentabletdriver.service
 
 # Install Docker, a platform designed to help developers build, share, and run container applications
 install-docker: