Merge branch 'main' into testing

2025-02-25 12:41:00 +00:00 · 2024-02-29 20:32:16 -08:00 · 2024-02-29 20:32:16 -08:00 · abe7478c94
commit abe7478c94
parent 65b9206727 4b6565baa9
15 changed files with 70 additions and 48 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -13,6 +13,7 @@ on:
      - 'spec_files/**'
      - 'post_install_files/**'
      - 'press_kit/**'
+      - '.github/workflows/build_iso.yml'
  push:
    branches:
      - testing
@ -24,6 +25,7 @@ on:
      - 'spec_files/**'
      - 'post_install_files/**'
      - 'press_kit/**'
+      - '.github/workflows/build_iso.yml'
  merge_group:
  workflow_dispatch:
 env:
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@ -1,6 +1,13 @@
-name: Build Bazzite ISOs
+name: Build ISOs
+
 on:
  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - '.github/workflows/build_iso.yml'
+
 env:
  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}

@ -27,33 +34,50 @@ jobs:
        major_version: [39]
        image_tag: [stable]
    steps:
-      - name: Set EXTRA_BOOT_ARGS
+      - name: Set EXTRA_BOOT_PARAMS
        run: |
-          EXTRA_BOOT_ARGS=""
-          if [[ "${{ matrix.image_name }}" == "bazzite=deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" ]]; then
-              EXTRA_BOOT_ARGS="inst.resolution=1280x800"
+          EXTRA_BOOT_PARAMS=""
+          if [[ "${{ matrix.image_name }}" == "bazzite-deck" || "${{ matrix.image_name }}" == "bazzite-deck-gnome" || "${{ matrix.image_name }}" == "bazzite-deck-budgie" ]]; then
+              EXTRA_BOOT_PARAMS="inst.resolution=1280x800"
          fi
+          echo "EXTRA_BOOT_PARAMS=$EXTRA_BOOT_PARAMS" >> $GITHUB_ENV
+
      - name: Build ISOs
-        #if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
-        uses: ublue-os/isogenerator@1.0.6
+        uses: ublue-os/isogenerator@1.0.9
+        id: build
        with:
          ARCH: x86_64
          IMAGE_NAME: ${{ matrix.image_name }}
-          IMAGE_REPO: ghcr.io/ublue-os
+          IMAGE_REPO: ${{ env.IMAGE_REGISTRY }}
          VARIANT: 'Kinoite'
          VERSION: ${{ matrix.major_version }}
          IMAGE_TAG: ${{ matrix.image_tag }}
-          ACTION_REPO: ublue-os/isogenerator
-          ACTION_REF: 1.0.6
-          EXTRA_BOOT_ARGS: ${{ env.EXTRA_BOOT_ARGS }}
-      - name: Upload ISOs and SHA Checksum Files to R2
+          SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
+          ENROLLMENT_PASSWORD: 'ublue-os'
+          EXTRA_BOOT_PARAMS: ${{ env.EXTRA_BOOT_PARAMS }}
+
+      - name: Upload ISOs and Checksum to Job Artifacts
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.image_name }}-${{ matrix.image_tag }}-${{ matrix.major_version}}
+          path: ${{ steps.build.outputs.output-directory }}
+          if-no-files-found: error
+          retention-days: 0
+          compression-level: 0
+          overwrite: true
+
+      - name: Upload ISOs and Checksum to R2
+        if: github.event_name == 'workflow_dispatch'
        shell: bash
+        env:
+          RCLONE_CONFIG_R2_TYPE: s3
+          RCLONE_CONFIG_R2_PROVIDER: Cloudflare
+          RCLONE_CONFIG_R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          RCLONE_CONFIG_R2_REGION: auto
+          RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
+          SOURCE_DIR: ${{ steps.build.outputs.output-directory }}
        run: |
-          export RCLONE_CONFIG_R2_TYPE=s3
-          export RCLONE_CONFIG_R2_PROVIDER=Cloudflare
-          export RCLONE_CONFIG_R2_ACCESS_KEY_ID=${{ secrets.R2_ACCESS_KEY_ID }}
-          export RCLONE_CONFIG_R2_SECRET_ACCESS_KEY=${{ secrets.R2_SECRET_ACCESS_KEY }}
-          export RCLONE_CONFIG_R2_REGION=auto
-          export RCLONE_CONFIG_R2_ENDPOINT=${{ secrets.R2_ENDPOINT }}
          dnf install -y rclone
-          rclone copy ./end_iso R2:bazzite
+          rclone copy $SOURCE_DIR R2:bazzite
--- a/1
+++ b/1
@ -282,7 +282,6 @@ RUN rpm-ostree install \
        glow \
        gum \
        setools \
-        redhat-lsb-core \
        cockpit-networkmanager \
        cockpit-podman \
        cockpit-selinux \
--- a/README-ID.md
+++ b/README-ID.md
@ -70,7 +70,7 @@ Varian umum yang tersedia sebagai `bazzite`, cocok untuk komputer desktop.
 - Pembaruan otomatis untuk Sistem Operasi,Flatpak,Nix package <sup><sub>(dengan Fleek)</sub></sup>, dan semua kontainer Distrobox.

 > [!IMPORTANT]  
-> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Jika anda menemukan masalah ketika menginstall Bazzite, anda dapat mengunjungi [panduan memecahkan masalah](https://universal-blue.discourse.group/docs?topic=34).
+> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).**

 Jika anda telah menggunakan image dari Universal Blue anda dapat mengikuti [instruksi ini](https://universal-blue.org/images/#image-list). Untuk berganti image dari image upstream Fedora Silverblue/Kinoite ostree anda dapat mengikuti perintah ini:

@ -125,7 +125,7 @@ Varian `bazzite-deck` ini didesain untuk digunakan sebagai alternatif untuk Stea
 > **Dikarenakan ada bug/kutu dari upstream,Bazzite tidak bisa digunakan pada perangkat SteamDeck yang memiliki penyimpanan 64GB eMMC. meningkatkan penyimpanan menyelesaikan masalah ini.**

 > [!IMPORTANT]  
-> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Jika anda menemukan masalah ketika menginstall Bazzite, anda dapat mengunjungi [panduan memecahkan masalah](https://universal-blue.discourse.group/docs?topic=34).
+> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).**

 Jika anda telah menggunakan image dari Universal Blue anda dapat mengikuti [instruksi ini](https://universal-blue.org/images/#image-list). Untuk berganti image dari image upstream Fedora Silverblue/Kinoite ostree anda dapat mengikuti perintah ini:

@ -146,7 +146,7 @@ Varian desktop GNOME tersedia dalam versi desktop dan deck.varian ini memiliki b
 - Pembaruan otomatis untuk [Firefox GNOME theme](https://github.com/rafaelmardojai/firefox-gnome-theme) dan [Thunderbird GNOME theme](https://github.com/rafaelmardojai/thunderbird-gnome-theme). <sup><sub>(jika terinstall)</sub></sup>

 > [!IMPORTANT]  
-> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).** Jika anda menemukan masalah ketika menginstall Bazzite, anda dapat mengunjungi [panduan memecahkan masalah](https://universal-blue.discourse.group/docs?topic=34).
+> **ISO bisa diunduh dari halaman rilis kami [disini](https://github.com/ublue-os/bazzite/releases), dan berbagai macam panduan instalasi dapat ditemukan [disini](https://universal-blue.discourse.group/docs?topic=30).**

 Untuk rebase dari sistem ostree yang ada ke varian **desktop**:

--- a/README-SPA.md
+++ b/README-SPA.md
@ -83,7 +83,7 @@ Esta variante común/genérica esta disponible como `bazzite`, la cual es adecua
 - Actualizaciones automáticas para el sistema operativo, Flatpaks, paquetes Nix <sup><sub>(Usando Fleek)</sub></sup>, y todos los contenedores Distrobox.

 > \[!IMPORTANT\]\
-> **Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si experimentas errores y/o problemas instalando Bazzite, checa nuestra [guía de solución de problemas (en inglés)](https://universal-blue.discourse.group/docs?topic=34).
+> **Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).**

 Si estas actualmente usando una imagen de Universal Blue, por favor [sigue estas instrucciones (en inglés)](https://universal-blue.org/images/#image-list). 

@ -142,7 +142,7 @@ Esta variante esta diseñada para usarse como una alternativa de SteamOS en la S
 > **Debido a un bug en upstream, Bazzite no puede ser utilizado por el momento en Steam Decks con solo 64 GB de almacenamiento eMMC. Ampliar tu almacenamiento cambiando el disco interno soluciona este problema.**

 > \[!IMPORTANT\]\
-> **Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si experimentas errores y/o problemas instalando Bazzite, checa nuestra [guía de solución de problemas (en inglés)](https://universal-blue.discourse.group/docs?topic=34).
+> **Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).**

 Si estas actualmente usando una imagen de Universal Blue, por favor [sigue estas instrucciones (en inglés)](https://universal-blue.org/images/#image-list). 

@ -163,7 +163,7 @@ Si estas usando una computadora Handheld que tiene soporte por parte de [hhd](ht

 **Igualmente, asegurate de tambien leer la [documentación de HHD (en inglés)](https://github.com/hhd-dev/hhd#after-install), algunas computadoras Handheld requieren ciertos ajustes o tweaks especificos para funcionar correctamente.**

-Tambien incluimos ciertos comandos de `ujust` para instalar varios temas para CSS Loader que no estan disponibles en su propia tienda. Si instalas estos temas, estos tambien serán actualizados automáticamente junto con Bazzite.
+Tambien incluimos ciertos comandos de `ujust` para instalar varios temas para [CSS Loader](https://docs.deckthemes.com/CSSLoader/Install/#linux-or-steam-deck) que no estan disponibles en su propia tienda. Si instalas estos temas, estos tambien serán actualizados automáticamente junto con Bazzite.

 ```bash
 # Instala el tema de la ROG Ally para CSS Loader (https://github.com/semakusut/SBP-ROG-Ally)
@ -220,7 +220,7 @@ Las sub-variantes con el entorno de escritorio GNOME están disponibles tanto pa
 - Actualizaciones automáticas para el [tema de GNOME para Firefox](https://github.com/rafaelmardojai/firefox-gnome-theme) y el [tema de GNOME para Thunderbird](https://github.com/rafaelmardojai/thunderbird-gnome-theme). <sup><sub>(Si se encuentran instalados)</sub></sup>

 > \[!IMPORTANT\]\
-> \**Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).** Si experimentas errores y/o problemas instalando Bazzite, checa nuestra [guía de solución de problemas (en inglés)](https://universal-blue.discourse.group/docs?topic=34).
+> \**Las imágenes de disco (ISOs) pueden descargarse desde nuestra página de lanzamientos (releases) [aquí (en inglés)](https://github.com/ublue-os/bazzite/releases), también puedes encontrar una útil guía de instalación [aquí (en inglés)](https://universal-blue.discourse.group/docs?topic=30).**

 Si deseas cambiar la base (rebase) a la imagen **para computadoras de escritorio con una GPU AMD ó Intel**, ejecuta el siguiente comando en una terminal:

--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@
  <a href="https://bazzite.gg/"><img src="/repo_content/Bazzite_Tagline.svg?raw=true" alt="Bazzite"/></a>
 </p>

-[![build-bazzite](https://github.com/ublue-os/bazzite/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/bazzite/actions/workflows/build.yml)
+[![build-bazzite](https://github.com/ublue-os/bazzite/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/bazzite/actions/workflows/build.yml) [![build-bazzite-isos](https://github.com/ublue-os/bazzite/actions/workflows/build_iso.yml/badge.svg)](https://github.com/ublue-os/bazzite/actions/workflows/build_iso.yml)

 # [🇺🇸](https://github.com/ublue-os/bazzite/blob/main/README.md) [🇪🇸](https://github.com/ublue-os/bazzite/blob/main/README-SPA.md) [🇮🇩](https://github.com/ublue-os/bazzite/blob/main/README-ID.md)

@ -80,9 +80,9 @@ Common variant available as `bazzite`, suitable for desktop computers.
 - Automatic updates for the OS, Flatpaks, and all Distrobox containers - powered by [ublue-update](https://github.com/ublue-os/ublue-update) and [topgrade](https://github.com/topgrade-rs/topgrade).

 > [!IMPORTANT]  
-> **ISOs can be downloaded from our releases page [here](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** If you experience any issues with installing Bazzite, then check out our [troubleshoot guide](https://universal-blue.discourse.group/docs?topic=34).
+> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).**

-If you're on an existing Universal Blue image follow [these instructions](https://universal-blue.org/images/#image-list). To rebase an existing upstream Fedora Silverblue/Kinoite ostree system to this image:
+Rebase from an existing upstream Fedora Atomic to this image:

 ```bash
 rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite:stable
@ -136,9 +136,9 @@ Variant designed for usage as an alternative to SteamOS on the Steam Deck, and f
 > **Due to an upstream bug, Bazzite cannot be used on Steam Decks with 64GB eMMC storage at this time. Upgrading the storage resolves the issue.**

 > [!IMPORTANT]  
-> **ISOs can be downloaded from our releases page [here](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** If you experience any issues with installing Bazzite, then check out our [troubleshoot guide](https://universal-blue.discourse.group/docs?topic=34).
+> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).**

-If you're on an existing Universal Blue image follow [these instructions](https://universal-blue.org/images/#image-list). To rebase an existing upstream Fedora Silverblue/Kinoite ostree system to this image: 
+Rebase from an existing upstream Fedora Atomic to this image:

 ```bash
 rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-deck:stable
@ -154,7 +154,7 @@ If you're using a handheld supported by [hhd](https://github.com/hhd-dev/hhd) <s

 **Be sure to also read the [hhd documentation](https://github.com/hhd-dev/hhd#after-install), some handhelds require specific setting changes/tweaks to function properly.**

-We also ship `ujust` commands to install various CSS Loader themes that can't be found on the CSS Loader store. These will be automatically updated with Bazzite if installed.
+We also ship `ujust` commands to install various [CSS Loader](https://docs.deckthemes.com/CSSLoader/Install/#linux-or-steam-deck) themes that can't be found on the CSS Loader store. These will be automatically updated with Bazzite if installed.
 ```bash
 # Install ROG Ally Theme for CSS Loader (https://github.com/semakusut/SBP-ROG-Ally)
 ujust install-rog-ally-theme
@ -178,9 +178,9 @@ Builds with the GNOME desktop environment are available in both desktop and deck
 - Automatic updates for the [Firefox GNOME theme](https://github.com/rafaelmardojai/firefox-gnome-theme) and [Thunderbird GNOME theme](https://github.com/rafaelmardojai/thunderbird-gnome-theme). <sup><sub>(If installed)</sub></sup>

 > [!IMPORTANT]  
-> **ISOs can be downloaded from our releases page [here](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).** If you experience any issues with installing Bazzite, then check out our [troubleshoot guide](https://universal-blue.discourse.group/docs?topic=34).
+> **ISOs can be downloaded from our [releases page](https://github.com/ublue-os/bazzite/releases), and a helpful install guide can be found [here](https://universal-blue.discourse.group/docs?topic=30).**

-To rebase an existing ostree system to the **desktop** release:
+Rebase from an existing upstream Fedora Atomic to this image:

 ```bash
 rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-gnome:stable
--- a/spec_files/jupiter-hw-support/biosupdate.patch
+++ b/spec_files/jupiter-hw-support/biosupdate.patch
@ -5,7 +5,7 @@
 [[ ! -f $BIOS_INHIBIT_FILE ]] || die "Bios updates inhibited, no action ($BIOS_INHIBIT_FILE)"
 
 +if ! systemctl is-enabled jupiter-biosupdate.service; then
-+  die "Bios updates inhibited, no action (Service disabled)"
+  finish 0 no "Bios updates inhibited, no action (Service disabled)"
 +fi
 +
 # Print action
--- a/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl
+++ b/system_files/deck/shared/usr/etc/system76-scheduler/config.kdl
@ -39,9 +39,6 @@ process-scheduler enable=true {
        // Video games
        games nice=-5 io=(best-effort)0

-        // Video game background tasks
-        games-background nice=0 io="idle"
-
        // Desktop environments
        desktop-environment nice=-3 io=(best-effort)0

@ -102,6 +99,7 @@ process-scheduler enable=true {
        taskset
        vpower
        schedtool
+        sunshine
        tuned
        tuned-ppd
    }
--- a/system_files/desktop/kinoite/usr/share/ublue-os/bazzite/flatpak/install
+++ b/system_files/desktop/kinoite/usr/share/ublue-os/bazzite/flatpak/install
@ -3,6 +3,7 @@ org.kde.gwenview
 org.kde.okular
 org.kde.kcalc
 org.kde.haruna
+org.kde.filelight
 io.github.fastrizwaan.WineZGUI
 io.github.dvlv.boxbuddyrs
 it.mijorus.gearlever
--- a/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl
+++ b/system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl
@ -39,9 +39,6 @@ process-scheduler enable=true {
        // Video games
        games nice=-5 io=(best-effort)0

-        // Video game background tasks
-        games-background nice=0 io="idle"
-
        // Desktop environments
        desktop-environment nice=-3 io=(best-effort)0

@ -94,6 +91,7 @@ process-scheduler enable=true {
        systemd
        taskset
        schedtool
+        sunshine
        tuned
        tuned-ppd
    }
--- a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager
+++ b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager
@ -1,7 +1,7 @@
 #!/usr/bin/bash

 # SCRIPT VERSION
-VER=20
+VER=21
 VER_FILE="/etc/bazzite/flatpak_manager_version"
 VER_RAN=$(cat $VER_FILE)
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"
--- a/system_files/desktop/shared/usr/libexec/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/libexec/bazzite-user-setup
@ -28,8 +28,8 @@ USER_SETUP_FEDORA_VER_RAN=$(cat $USER_SETUP_FEDORA_VER_FILE)
 USER_SETUP_IMAGE_VER_RAN=$(cat $USER_SETUP_IMAGE_VER_FILE)

 # Run script if updated
-if [[ -f $USER_SETUP_VER_FILE && $USER_SETUP_VER = $USER_SETUP_VER_RAN ]]; then
-  if [[ -f $USER_SETUP_FEDORA_VER_FILE && $FEDORA_VERSION = $USER_SETUP_FEDORA_VER_RAN && $BASE_IMAGE_NAME == USER_SETUP_IMAGE_VER_RAN ]]; then
+if [[ -f $USER_SETUP_VER_FILE && -f $USER_SETUP_FEDORA_VER_RAN && -f $USER_SETUP_FEDORA_VER_FILE ]]; then
+  if [[ $USER_SETUP_VER = "$USER_SETUP_VER_RAN" && $FEDORA_VERSION = "$USER_SETUP_FEDORA_VER_RAN" && $BASE_IMAGE_NAME = "$USER_SETUP_IMAGE_VER_RAN" ]]; then
    echo "User setup v$USER_SETUP_VER has already run. Exiting..."
    exit 0
  fi
--- a/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware
+++ b/system_files/desktop/shared/usr/libexec/hardware/rotation-fix-hardware
@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # Returns true for hardware that needs a rotation fix in KDE
 SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
-if [[ ":Galileo:Jupiter:ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:Loki Max:G1618-04:21A0007TUK:" =~ ":$SYS_ID:" ]]; then
+if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:Loki Max:G1618-04:G1619-04:21A0007TUK:" =~ ":$SYS_ID:" ]]; then
 	exit 0
 else
 	exit 1
--- a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders
+++ b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders
@ -18,7 +18,7 @@ name='X-GNOME-Utilities.directory'
 translate=true

 [org/gnome/desktop/app-folders/folders/Containers]
-apps=['com.github.marhkb.Pods.desktop']
+apps=['io.github.dvlv.boxbuddyrs']
 categories=['Distrobox']
 name='Containers'
 translate=false
--- a/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install
+++ b/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install
@ -7,6 +7,7 @@ com.github.tchx84.Flatseal
 io.github.flattool.Warehouse
 io.missioncenter.MissionCenter
 com.vysp3r.ProtonPlus
+io.github.celluloid_player.Celluloid
 org.gnome.Calculator
 org.gnome.Calendar
 org.gnome.Characters
@ -20,7 +21,6 @@ org.gnome.NautilusPreviewer
 org.gnome.TextEditor
 org.gnome.Weather
 org.gnome.baobab
-io.github.celluloid_player.Celluloid
 org.gnome.clocks
 org.gnome.font-viewer
 org.freedesktop.Platform.VulkanLayer.MangoHud//23.08