From 0b14aaefc6d6ff6873d28894bea6fc7682baecac Mon Sep 17 00:00:00 2001 From: Aarron Lee Date: Wed, 14 Feb 2024 22:19:20 -0500 Subject: [PATCH 1/7] fix(waydroid): waydroid-launcher script (#772) Co-authored-by: Aarron Lee --- system_files/desktop/shared/usr/bin/waydroid-launcher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/desktop/shared/usr/bin/waydroid-launcher b/system_files/desktop/shared/usr/bin/waydroid-launcher index d0a15667..78a6841b 100755 --- a/system_files/desktop/shared/usr/bin/waydroid-launcher +++ b/system_files/desktop/shared/usr/bin/waydroid-launcher @@ -15,7 +15,7 @@ fi # Launch Cage & Waydroid pkexec /usr/libexec/waydroid-container-start if [ -z "$(pgrep wlr-randr)" ]; then - cage -- bash -c "wlr-randr --output X11-1 --custom-mode ${WAYDROID_WIDTH:-1280}x${WAYDROID_HEIGHT:-800}; sleep 1; waydroid show-full-ui &> /dev/null &" + cage -- bash -c "wlr-randr --output X11-1 --custom-mode ${WAYDROID_WIDTH:-1280}x${WAYDROID_HEIGHT:-800}; sleep 1; waydroid show-full-ui &> /dev/null &" & fi # Fix controllers, we know Waydroid has started because surfaceflinger is running From 3f3a1eb5d3539dba1cc9034b4ee3059c95bfa0f5 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 14 Feb 2024 12:13:57 -0800 Subject: [PATCH 2/7] feat: Add patched switcheroo-control by Sentry, fixes dGPU/iGPU switching --- Containerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 6b67a2f4..214c48d2 100644 --- a/Containerfile +++ b/Containerfile @@ -38,6 +38,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$ wget https://copr.fedorainfracloud.org/coprs/kylegospo/webapp-manager/repo/fedora-$(rpm -E %fedora)/kylegospo-webapp-manager-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-webapp-manager.repo && \ wget https://copr.fedorainfracloud.org/coprs/hhd-dev/hhd/repo/fedora-$(rpm -E %fedora)/hhd-dev-hhd-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \ wget https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-$(rpm -E %fedora)/che-nerd-fonts-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_che-nerd-fonts.repo && \ + wget https://copr.fedorainfracloud.org/coprs/sentry/switcheroo-control_discrete/repo/fedora-$(rpm -E %fedora)/sentry-switcheroo-control_discrete-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-switcheroo-control_discrete.repo && \ wget https://pkgs.tailscale.com/stable/fedora/tailscale.repo -O /etc/yum.repos.d/tailscale.repo && \ sed -i 's@gpgcheck=1@gpgcheck=0@g' /etc/yum.repos.d/tailscale.repo @@ -184,6 +185,7 @@ RUN rpm-ostree override replace \ || true # Install Valve's patched Mesa, Pipewire and Bluez +# Install patched switcheroo control with proper discrete GPU support RUN rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \ @@ -209,7 +211,11 @@ RUN rpm-ostree override replace \ bluez-obexd \ xorg-x11-server-Xwayland && \ rpm-ostree install \ - mesa-vdpau-drivers-freeworld.x86_64 + mesa-vdpau-drivers-freeworld.x86_64 && \ + rpm-ostree override replace \ + --experimental \ + --from repo=copr:copr.fedorainfracloud.org:sentry:switcheroo-control_discrete \ + switcheroo-control # Remove unneeded packages RUN rpm-ostree override remove \ @@ -523,6 +529,7 @@ RUN /tmp/image-info.sh && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-webapp-manager.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hhd-dev-hhd.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_che-nerd-fonts.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_sentry-switcheroo-control_discrete.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/tailscale.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/charm.repo && \ sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \ From 78e1d3530caf8217b6a6d89aeb2076f112f8f64f Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 14 Feb 2024 12:17:29 -0800 Subject: [PATCH 3/7] chore(readme): Mention switcheroo-control patch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0fd146bb..2844bce8 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ Bazzite is built from [ublue-os/main](https://github.com/ublue-os/main) and [ubl - Features optional Valve-inspired GTK3/4 themes matching Vapor and VGUI2 from SteamOS. Install [Gradience](https://flathub.org/apps/com.github.GradienceTeam.Gradience) to make use of them. - [LatencyFleX](https://github.com/ishitatsuyuki/LatencyFleX), [vkBasalt](https://github.com/DadSchoorse/vkBasalt), [MangoHud](https://github.com/flightlessmango/Mangohud), and [OBS VkCapture](https://github.com/nowrep/obs-vkcapture) installed and available by default - Uses [TuneD](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/monitoring_and_managing_system_status_and_performance/getting-started-with-tuned_monitoring-and-managing-system-status-and-performance) in place of PPD, with full integration into GNOME, KDE, and Game mode. This is an incredibly powerful tool that Red Hat offers [entire classes on](https://www.redhat.com/en/services/training/rh442-red-hat-enterprise-performance-tuning). +- [Patched Switcheroo-Control](https://copr.fedorainfracloud.org/coprs/sentry/switcheroo-control_discrete/) fixing default-broken iGPU/dGPU switching. - Support for [Wallpaper Engine](https://www.wallpaperengine.io/en). (Only on KDE) - [ROM Properties Page shell extension](https://github.com/GerbilSoft/rom-properties) included. - Full support for [Winesync/Fastsync/NTsync](https://github.com/Frogging-Family/wine-tkg-git/issues/936). From 0bdab30b7ab36906735303b021516659a70968c1 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 14 Feb 2024 12:03:32 -0800 Subject: [PATCH 4/7] chore: Add AIR to HHD/SimpleDecky list --- system_files/desktop/shared/usr/libexec/bazzite-hardware-setup | 2 +- .../desktop/shared/usr/libexec/hardware/hhd-supported-hardware | 2 +- .../usr/libexec/hardware/simpledeckytdp-supported-hardware | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup index 577cfde0..69b62b57 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup +++ b/system_files/desktop/shared/usr/libexec/bazzite-hardware-setup @@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO) FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO) # SCRIPT VERSION -HWS_VER=32 +HWS_VER=33 HWS_VER_FILE="/etc/bazzite/hws_version" HWS_VER_RAN=$(cat $HWS_VER_FILE) diff --git a/system_files/desktop/shared/usr/libexec/hardware/hhd-supported-hardware b/system_files/desktop/shared/usr/libexec/hardware/hhd-supported-hardware index cbd9bfed..9e3ddda3 100755 --- a/system_files/desktop/shared/usr/libexec/hardware/hhd-supported-hardware +++ b/system_files/desktop/shared/usr/libexec/hardware/hhd-supported-hardware @@ -1,7 +1,7 @@ #!/usr/bin/bash # Returns true for hardware that is supported by HHD SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)" -if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:G1619-04:Win600:Loki Max:" =~ ":$SYS_ID:" ]]; then +if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AIR:AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:G1619-04:Win600:Loki Max:" =~ ":$SYS_ID:" ]]; then exit 0 else exit 1 diff --git a/system_files/desktop/shared/usr/libexec/hardware/simpledeckytdp-supported-hardware b/system_files/desktop/shared/usr/libexec/hardware/simpledeckytdp-supported-hardware index 2c1de909..096ebbf7 100755 --- a/system_files/desktop/shared/usr/libexec/hardware/simpledeckytdp-supported-hardware +++ b/system_files/desktop/shared/usr/libexec/hardware/simpledeckytdp-supported-hardware @@ -1,7 +1,7 @@ #!/usr/bin/bash # Returns true for hardware that is supported by SimpleDeckyTDP SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)" -if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then +if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AIR:" =~ ":$SYS_ID:" ]]; then exit 0 else exit 1 From 82632ef5bc4b1e5633cd16e1453e4953c4bb33a2 Mon Sep 17 00:00:00 2001 From: CharlieBros Date: Thu, 15 Feb 2024 13:07:13 -0600 Subject: [PATCH 5/7] Updated translation to be up to date to all commits as of Feb 14th (#770) Happy valentines day! --- README-SPA.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README-SPA.md b/README-SPA.md index 2cef8f28..050c16c4 100644 --- a/README-SPA.md +++ b/README-SPA.md @@ -256,7 +256,7 @@ rpm-ostree rebase ostree-unverified-registry:ghcr.io/ublue-os/bazzite-deck-gnome - Los paquetes del sistema se mantienen relativamente actualizados a su última versión. - Puedes instalar paquetes de Fedora en capas (layered) sin que se pierdan entre actualizaciones. - Enfocado en seguridad con [SELinux](https://github.com/SELinuxProject/selinux) pre-instalado y configurado fuera de la caja. -- La habilidad de cambiar de base (rebase) de una imagen libostree de Fedora, si así se desea, sin perder datos del usuario. +- La habilidad de cambiar de base (rebase) de una imagen atómica de Fedora, si así se desea, sin perder datos del usuario. - Soporte para impresoras gracias a que el servidor de impresión [CUPS](https://www.cups.org/) viene pre-instalado. ## ¿Por qué? @@ -317,6 +317,7 @@ Todos los paquetes que son porteados de SteamOS, ChimeraOS u otros que son utilz | [gnome-shell-extension-caribou-blocker](https://extensions.gnome.org/extension/1326/block-caribou/) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gnome-shell-extension-caribou-blocker/status_image/last_build.png?) | | [gnome-shell-extension-hanabi](https://github.com/jeffshee/gnome-ext-hanabi) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gnome-shell-extension-hanabi/status_image/last_build.png?) | | [gnome-shell-extension-compiz-windows-effect](https://github.com/hermes83/compiz-windows-effect) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gnome-shell-extension-compiz-windows-effect/status_image/last_build.png?) | +| [joystickwake](https://github.com/foresto/joystickwake) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/joystickwake/status_image/last_build.png?) | | jupiter-fan-control | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/jupiter-fan-control/status_image/last_build.png?) | | jupiter-hw-support-[btrfs](https://gitlab.com/popsulfr/steamos-btrfs) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/jupiter-hw-support-btrfs/status_image/last_build.png?) | | [mangohud](https://github.com/flightlessmango/MangoHud) | ![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/package/mangohud/status_image/last_build.png?) | @@ -370,6 +371,8 @@ cosign verify --key cosign.pub ghcr.io/ublue-os/bazzite ## Arranque Seguro (Secure Boot) +**ADVERTENCIA:** ¡Los usuarios de la Steam Deck **NO** deben activar Secure Boot o registrar nuestras llaves digitales! + El Arranque Seguro (Secure Boot) tiene soporte gracias a nuestra llave digital personalizada. La llave pública puede encontrarse en la raíz de [este](https://github.com/ublue-os/bazzite/blob/main/secure_boot.der) repositorio. Si gustas registrar esta llave antes de instalar Bazzite, descarga la llave y ejecuta el siguiente comando en una terminal: From 31d09dca5ebe010821111298eaa008e26321a133 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Thu, 15 Feb 2024 12:20:31 -0800 Subject: [PATCH 6/7] chore(readme): Add link to website --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2844bce8..cdc6150d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Bazzite + Bazzite

[![build-bazzite](https://github.com/ublue-os/bazzite/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/bazzite/actions/workflows/build.yml) From 965c79a28e69cd0476a8806961f2ba63e43c8ab0 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Thu, 15 Feb 2024 12:21:15 -0800 Subject: [PATCH 7/7] chore(readme): Link to bazzite for SEO (#775) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cdc6150d..53edc3f2 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ ## About & Features -Bazzite is an OCI image that serves as an alternative operating system for the [Steam Deck](https://www.steamdeck.com/), and a ready-to-game SteamOS-like for desktop computers and living room home theater PCs. +[Bazzite](https://bazzite.gg/) is an OCI image that serves as an alternative operating system for the [Steam Deck](https://www.steamdeck.com/), and a ready-to-game SteamOS-like for desktop computers and living room home theater PCs. Bazzite is built from [ublue-os/main](https://github.com/ublue-os/main) and [ublue-os/nvidia](https://github.com/ublue-os/nvidia) using [Fedora](https://fedoraproject.org/) technology, which means expanded hardware support and built in drivers are included. Additionally, Bazzite adds the following features: