From 0ac4502ce1cd05f59d7df53771c48239863dc9b3 Mon Sep 17 00:00:00 2001 From: JSON Derulo <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:27:13 -0500 Subject: [PATCH] feat: added ujust get-decky-bazzite-buddy to view changelogs in game mode (#2108) * chore(repo): Update opengraph images * Revert "feat: Update to kernel 6.12.8-207" This reverts commit b645716f84e71cb2cbd4725a1d333657fb99b6ba. * chore(deps): update wandalen/wretry.action action to v3.8.0 (#2095) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update bazzite-steam (#2099) * feat: ujust install-bazzite-buddy to view changelogs in game mode * fix: moved install-bazzite-buddy to deck specific just file * fix: rename get-decky-bazzite-buddy, move to 80-bazzite.just * remove script from 85-bazzite-image * chore(deps): bump dataaxiom/ghcr-cleanup-action from 1.0.15 to 1.0.16 (#2124) Bumps [dataaxiom/ghcr-cleanup-action](https://github.com/dataaxiom/ghcr-cleanup-action) from 1.0.15 to 1.0.16. - [Release notes](https://github.com/dataaxiom/ghcr-cleanup-action/releases) - [Commits](https://github.com/dataaxiom/ghcr-cleanup-action/compare/v1.0.15...v1.0.16) --- updated-dependencies: - dependency-name: dataaxiom/ghcr-cleanup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump hhd-dev/rechunk from 1.1.1 to 1.1.2 (#2123) Bumps [hhd-dev/rechunk](https://github.com/hhd-dev/rechunk) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/hhd-dev/rechunk/releases) - [Changelog](https://github.com/hhd-dev/rechunk/blob/master/example_changelog.md) - [Commits](https://github.com/hhd-dev/rechunk/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: hhd-dev/rechunk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(ci): Complete rechunker update * feat: change opentabletdriver installation to flathub version (#2128) * Revert "Merge branch 'ublue-os:main' into changelog-decky" This reverts commit b3f692a64236166d8d9d38dab853081e2fd9376a, reversing changes made to 315f8132600398131acd4553322fdb2a85bd031f. --------- Signed-off-by: dependabot[bot] Co-authored-by: Kyle Gospodnetich Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sean Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dreamyuki <49896401+dreamyukii@users.noreply.github.com> --- .github/workflows/build.yml | 6 +-- .github/workflows/clean.yml | 2 +- .../desktop/shared/usr/bin/bazzite-steam | 17 ++----- .../usr/share/ublue-os/just/80-bazzite.just | 44 +++++++++++++++++++ .../share/ublue-os/just/82-bazzite-apps.just | 16 ++++--- 5 files changed, 60 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17c4934104..d5cab6bf41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -200,7 +200,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.2 + sudo podman pull ghcr.io/hhd-dev/rechunk:v1.1.1 - name: Get source versions id: labels @@ -320,9 +320,9 @@ jobs: # Reprocess raw-img using rechunker which will delete it - name: Run Rechunker id: rechunk - uses: hhd-dev/rechunk@v1.1.2 + uses: hhd-dev/rechunk@v1.1.1 with: - rechunk: 'ghcr.io/hhd-dev/rechunk:v1.1.2' + rechunk: 'ghcr.io/hhd-dev/rechunk:v1.1.1' ref: 'raw-img' prev-ref: '${{ steps.generate-prev-ref.outputs.ref }}' version: '${{ steps.generate-version.outputs.tag }}' diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 5cb65cb9ba..9f8e623dcb 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -14,7 +14,7 @@ jobs: packages: write steps: - name: Delete Images Older Than 90 Days - uses: dataaxiom/ghcr-cleanup-action@v1.0.16 + uses: dataaxiom/ghcr-cleanup-action@v1.0.15 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 diff --git a/system_files/desktop/shared/usr/bin/bazzite-steam b/system_files/desktop/shared/usr/bin/bazzite-steam index 425e47ff64..cddaf5d971 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-steam +++ b/system_files/desktop/shared/usr/bin/bazzite-steam @@ -19,7 +19,6 @@ 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 @@ -33,17 +32,7 @@ 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 - # 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 + if [ ! -f $HOME/.local/share/Steam/config/uioverrides/movies/bazzite_novideo ]; 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 @@ -58,7 +47,7 @@ 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 @@ -66,7 +55,7 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" ]]; then 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 diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just index 512a2a8de7..e8e6713ee2 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just @@ -452,6 +452,50 @@ toggle-password-feedback ACTION="": echo "enabled, restart terminal to see changes" fi +# Install Bazzite Buddy plugin to easily access changelogs in game mode! +get-decky-bazzite-buddy: + #!/bin/bash + PLUGIN_URL="https://github.com/xXJSONDeruloXx/bazzite-buddy/releases/download/stable/bazzite-buddy.zip" + PLUGIN_NAME="bazzite-buddy" + PLUGIN_DIR="$HOME/homebrew/plugins" + if [ ! -d "$PLUGIN_DIR" ]; then + echo "Creating plugins directory with sudo..." + sudo mkdir -p "$PLUGIN_DIR" + fi + # Change to the plugin directory + cd "$PLUGIN_DIR" || { echo "Failed to navigate to plugins directory"; exit 1; } + # Remove any existing plugin folder + if [ -d "$PLUGIN_NAME" ]; then + echo "Removing existing $PLUGIN_NAME directory with sudo..." + sudo rm -rf "$PLUGIN_NAME" + fi + # Download the zip file + echo "Downloading $PLUGIN_NAME from $PLUGIN_URL..." + sudo curl -L -o "${PLUGIN_NAME}.zip" "$PLUGIN_URL" + if [ $? -ne 0 ]; then + echo "Download failed!" + exit 1 + fi + echo "Extracting $PLUGIN_NAME..." + sudo unzip -o "${PLUGIN_NAME}.zip" -d . + if [ $? -ne 0 ]; then + echo "Extraction failed!" + exit 1 + fi + # Move the extracted files to the correct location if nested + if [ -d "./${PLUGIN_NAME}/${PLUGIN_NAME}" ]; then + echo "Fixing folder structure..." + sudo mv ./${PLUGIN_NAME}/${PLUGIN_NAME}/* ./${PLUGIN_NAME}/ + sudo rm -rf ./${PLUGIN_NAME}/${PLUGIN_NAME} + fi + # Clean up the downloaded ZIP file + echo "Cleaning up..." + sudo rm -f "${PLUGIN_NAME}.zip" + # Confirm installation + echo "$PLUGIN_NAME has been installed successfully to $PLUGIN_DIR!" + # Prompt user to restart Decky Loader + echo "Please restart Decky Loader to activate the plugin." + post-gamescope-logs: #!/usr/bin/bash OUTPUT_FILE="/tmp/gathered_info.txt" diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just index 85010ee846..0ad51bc5a3 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just @@ -131,14 +131,16 @@ install-scrcpy: distrobox-check-fedora install-opentabletdriver: #!/usr/bin/bash source /usr/lib/ujust/ujust.sh - 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 && \ + 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 && \ systemctl --user daemon-reload && \ - systemctl enable --user --now opentabletdriver.service + systemctl enable --user --now arch-opentabletdriver.service && \ + distrobox enter -n arch -- bash -c 'distrobox-export --app otd-gui' # Install Docker, a platform designed to help developers build, share, and run container applications install-docker: