mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-03-01 16:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into testing

Browse Source
This commit is contained in:
Kyle Gospodnetich 2025-01-30 19:53:33 -08:00
commit 99aa0fbd3f
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system_files/deck/silverblue/usr/share/ublue-os/just/90-bazzite-de.just
View File

@ -2,11 +2,15 @@
# Restore Bazzite customized DE settings
restore-gnome-de-settings:
#!/bin/bash
shopt -s nullglob
for file in /usr/share/ublue-os/dconfs/desktop-silverblue/*; do
dconf load / < "${file}"
echo "Loading dconf settings from: $file"
dconf load / < "$file"
done
for file in /usr/share/ublue-os/dconfs/deck-silverblue/*; do
dconf load / < "${file}"
echo "Loading dconf settings from: $file"
dconf load / < "$file"
done
# Restore Bazzite customized applications folders

17
system_files/desktop/shared/usr/bin/bazzite-steam
View File

@ -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,7 +58,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
@ -55,7 +66,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

4
system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
View File

@ -209,7 +209,7 @@ configure-watchdog ACTION="":
echo "Watchdog is $WATCHDOG_STATE"
OPTION=$(Choose "Enable Watchdog" "Disable Watchdog")
fi
if [[ "$OPTION" =~ ^enable ]]; then
if [[ "${OPTION,,}" =~ ^enable ]]; then
WATCHDOG_KARGS="--delete-if-present=nowatchdog"
if [[ "$CPU_MODEL" =~ "Intel" ]]; then
WATCHDOG_KARGS="$WATCHDOG_KARGS --delete-if-present=modprobe.blacklist=iTCO_wdt"
@ -217,7 +217,7 @@ configure-watchdog ACTION="":
WATCHDOG_KARGS="$WATCHDOG_KARGS --delete-if-present=modprobe.blacklist=sp5100_tco"
fi
rpm-ostree kargs $WATCHDOG_KARGS
elif [[ "$OPTION" =~ ^disable ]]; then
elif [[ "${OPTION,,}" =~ ^disable ]]; then
WATCHDOG_KARGS="--append-if-missing=nowatchdog"
if [[ "$CPU_MODEL" =~ "Intel" ]]; then
WATCHDOG_KARGS="$WATCHDOG_KARGS --append-if-missing=modprobe.blacklist=iTCO_wdt"