Merge branch 'main' into testing

README.md

@@ -13,7 +13,7 @@
 ---
 
 # Table of Contents
-- [🇺🇸 🇪🇸 🇮🇩 :cn:](#---cn)
+- [Language](#---cn)
 - [Table of Contents](#table-of-contents)
   - [About \& Features](#about--features)
     - [Desktop](#desktop)
@@ -129,7 +129,7 @@ Variant designed for usage as an alternative to SteamOS on the Steam Deck, and f
 - Applies SteamOS's kernel parameters.
 - Color calibrated display profiles for matte and reflective Steam Deck screens included.
 - Default-disabled power-user features, including:
-    - Service for low-risk undervolting of the Steam Deck via [RyzenAdj](https://github.com/FlyGoat/RyzenAdj) and [Ryzen SMU](https://gitlab.com/leogx9r/ryzen_smu), see `ryzenadj.service` and `/etc/default/ryzenadj`.
+    - Service for low-risk undervolting of the Steam Deck as well as AMD Framework Laptops via [RyzenAdj](https://github.com/FlyGoat/RyzenAdj) and [Ryzen SMU](https://gitlab.com/leogx9r/ryzen_smu), see `ryzenadj.service` and `/etc/default/ryzenadj`.
     - Service for limiting the max charge level of the battery, see `batterylimit.service` and `/etc/default/batterylimit`. <sup><sub>(Works even when the device is off)</sub></sup>
     - Built in support for display overclocking. For example, add `GAMESCOPE_OVERRIDE_REFRESH_RATE=40,70` to `/etc/environment`.
     - 32GB RAM mod your Steam Deck? Enjoy double the maximum VRAM amount, automatically applied. <sup><sub>(Can you share your soldering skills?)</sub></sup>

system_files/desktop/shared/usr/bin/waydroid-launcher

@@ -1,7 +1,14 @@
 #!/usr/bin/bash
 
+set -eux
+
 source /etc/default/waydroid-launcher
 
+# for backwards compatibility, default to show-full-ui
+if (($# == 0)); then
+	set -- show-full-ui
+fi
+
 # Kill any previous remnants
 if [ "$(systemctl is-active waydroid-container.service)" == 'active' ]; then
 	pkexec /usr/libexec/waydroid-container-stop
@@ -12,10 +19,18 @@ if grep -qz 'not initialized' <<< $(/usr/bin/waydroid status); then
 	/usr/bin/ujust init-waydroid
 fi
 
+launch_waydroid() {
+        wlr-randr --output X11-1 --custom-mode "$1"
+        sleep 1
+        shift
+        exec waydroid "$@" &> /dev/null
+}
+export -f launch_waydroid
+
 # 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 -uxc 'launch_waydroid "$@"' _ "${WAYDROID_WIDTH:-1280}x${WAYDROID_HEIGHT:-800}" "$@" &
 fi
 
 # Fix controllers, we know Waydroid has started because surfaceflinger is running

system_files/desktop/shared/usr/libexec/bazzite-hardware-setup

@@ -182,10 +182,16 @@ else
   echo "No minimum-free ZRAM changes needed"
 fi
 
-# FRAMEWORK 13 AMD FIXES
+# FRAMEWORK AMD FIXES
 if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
-  if [[ $SYS_ID == "Laptop ("* ]]; then
-    if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; then
+  if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; then
+    # Load Ryzen SMU on AMD Framework Laptops
+    if ! [[ -f "/etc/modules-load.d/ryzen_smu.conf" ]]; then
+      mkdir -p "/etc/modules-load.d"
+      printf "# Load ryzen_smu driver upon startup\nryzen_smu\n" >> "/etc/modules-load.d/ryzen_smu.conf"
+    fi
+    # Framework 13 AMD fixes
+    if [[ $SYS_ID == "Laptop ("* ]]; then
       if [[ ! -f /etc/modprobe.d/alsa.conf ]]; then
         echo 'Fixing 3.5mm jack'
         sudo tee /etc/modprobe.d/alsa.conf <<< "options snd-hda-intel index=1,0 model=auto,dell-headset-multi"

system_files/desktop/shared/usr/libexec/bazzite-user-setup

@@ -17,7 +17,7 @@ BAZZITE_CONFIG_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/bazzite"
 mkdir -p "$BAZZITE_CONFIG_DIR"
 
 # SCRIPT VERSION
-USER_SETUP_VER=33
+USER_SETUP_VER=34
 USER_SETUP_VER_FILE="$BAZZITE_CONFIG_DIR/version"
 USER_SETUP_FEDORA_VER_FILE="$BAZZITE_CONFIG_DIR/fedora_version"
 USER_SETUP_IMAGE_VER_FILE=$BAZZITE_CONFIG_DIR/image_name""
@@ -49,11 +49,6 @@ flatpak remote-modify --user --enable flathub
 # Handle privileged tasks
 pkexec /usr/libexec/bazzite-privileged-user-setup "$USER"
 
-# Refresh fontconfig
-if [[ -f "$HOME/.config/fontconfig" ]]; then
-  rm -rf "$HOME/.config/fontconfig"
-fi
-
 # Set up optional Gradience themes
 GRADIENCE_THEME_DIR="/usr/etc/skel/.var/app/com.github.GradienceTeam.Gradience/config/presets/user"
 GRADIENCE_DIR="$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user"
@@ -122,12 +117,18 @@ else
     fi
 
     echo 'Setting up templates'
-    mkdir -p "$HOME/Templates"
-    if [[ ! -f "$HOME/Templates/vkBasalt.conf" ]]; then
-      ln -s "/etc/vkBasalt.conf" "$HOME/Templates/vkBasalt.conf"
+    TEMPLATES_DIR=$(/usr/bin/xdg-user-dir TEMPLATES || true)
+    if [[ -z "$TEMPLATES_DIR" || "$TEMPLATES_DIR" == "$HOME" ]]; then
+      # xdg-user-dir might return only $HOME, in that case, use fallback $HOME/Templates.
+      echo "Using fallback '$HOME/Templates'"
+      TEMPLATES_DIR="$HOME/Templates"
     fi
-    if [[ ! -f "$HOME/Templates/dxvk.conf" ]]; then
-      ln -s "/etc/dxvk-example.conf" "$HOME/Templates/dxvk.conf"
+    mkdir -p "$TEMPLATES_DIR"
+    if [[ ! -f "$TEMPLATES_DIR/vkBasalt.conf" && -f "/etc/vkBasalt.conf" ]]; then
+      ln -s "/etc/vkBasalt.conf" "$TEMPLATES_DIR/vkBasalt.conf"
+    fi
+    if [[ ! -f "$TEMPLATES_DIR/dxvk.conf" && -f "/etc/dxvk-example.conf" ]]; then
+      ln -s "/etc/dxvk-example.conf" "$TEMPLATES_DIR/dxvk.conf"
     fi
 
     echo 'Tweaking GNOME indexer'

system_files/desktop/shared/usr/libexec/waydroid-fix-controllers

@@ -1,3 +1,3 @@
 #!/usr/bin/bash
 
-sudo /usr/bin/bash -c 'echo add > /sys/devices/virtual/input/input*/event*/uevent'
+echo add | exec sudo tee /sys/devices/virtual/input/input*/event*/uevent