Merge branch 'main' into testing

This commit is contained in:
Kyle Gospodnetich 2024-01-29 16:51:37 -08:00
commit 3646f09d9c
13 changed files with 54 additions and 34 deletions

View File

@ -86,8 +86,6 @@ process-scheduler enable=true {
dbus-broker dbus-broker
ds-inhibit ds-inhibit
fancontrol.py fancontrol.py
fig
fig_desktop
gamemoderun gamemoderun
gamescope gamescope
handycon handycon

View File

@ -1,3 +1,3 @@
*Using a handheld other than the Steam Deck?* Be sure to follow our [alternative handheld documentation](https://github.com/ublue-os/bazzite#alternative-handhelds). *Using a handheld other than the Steam Deck?* Be sure to follow our [alternative handheld documentation](https://github.com/ublue-os/bazzite#alternative-handhelds).
*Want to install Decky Loader?* There's a `ujust` command for that! `ujust get-decky` *Want to install Decky Loader?* There's a `ujust` command for that! `ujust get-decky`
The updater built into game mode has been modified to update Bazzite, Flatpaks, and Distrobox containers. The updater built into game mode has been modified to update Bazzite, Flatpaks, and Distrobox containers. *Just ignore the changelog.*

View File

@ -42,7 +42,7 @@ if [[ ! -f $INITRAMFS_REBUILD_TRIGGER ]]; then
if [[ -f $KNOWN_IMAGE_NAME_FILE && -f $KNOWN_IMAGE_FLAVOR_FILE && -f $KNOWN_FEDORA_VERSION_FILE && -f $KNOWN_IMAGE_BRANCH_FILE ]]; then if [[ -f $KNOWN_IMAGE_NAME_FILE && -f $KNOWN_IMAGE_FLAVOR_FILE && -f $KNOWN_FEDORA_VERSION_FILE && -f $KNOWN_IMAGE_BRANCH_FILE ]]; then
# Run script if image has been rebased # Run script if image has been rebased
if [[ $IMAGE_NAME = "$KNOWN_IMAGE_NAME" && $IMAGE_FLAVOR = "$KNOWN_IMAGE_FLAVOR" && $FEDORA_VERSION = "$KNOWN_FEDORA_VERSION" && $IMAGE_BRANCH = "$KNOWN_IMAGE_BRANCH" ]]; then if [[ $IMAGE_NAME = "$KNOWN_IMAGE_NAME" && $IMAGE_FLAVOR = "$KNOWN_IMAGE_FLAVOR" && $FEDORA_VERSION = "$KNOWN_FEDORA_VERSION" && $IMAGE_BRANCH = "$KNOWN_IMAGE_BRANCH" ]]; then
echo "Hardware setup has already run. Exiting..." echo "Hardware setup v$HWS_VER has already run. Exiting..."
exit 0 exit 0
fi fi
fi fi
@ -108,7 +108,7 @@ fi
# KERNEL ARGUMENTS # KERNEL ARGUMENTS
echo "Current kargs: $KARGS" echo "Current kargs: $KARGS"
if [[ ":Jupiter:" =~ ":$SYS_ID:" || ":Galileo:" =~ ":$SYS_ID:" ]]; then if /usr/libexec/hardware/valve-hardware; then
echo "Checking for needed karg changes (Jupiter/Galileo)" echo "Checking for needed karg changes (Jupiter/Galileo)"
if [[ ! $KARGS =~ "amd_iommu" ]]; then if [[ ! $KARGS =~ "amd_iommu" ]]; then
@ -139,7 +139,7 @@ if [[ ":83E1:" =~ ":$SYS_ID:" ]]; then
fi fi
fi fi
if [[ ":ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then if /usr/libexec/hardware/hhd-supported-hardware; then
if [[ ! $KARGS =~ "iomem" ]]; then if [[ ! $KARGS =~ "iomem" ]]; then
echo "Adding needed kargs for ryzenadj" echo "Adding needed kargs for ryzenadj"
NEEDED_KARGS+=("--append-if-missing=iomem=relaxed") NEEDED_KARGS+=("--append-if-missing=iomem=relaxed")
@ -176,11 +176,11 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegam
systemctl enable --now vpower.service systemctl enable --now vpower.service
else else
echo "Generic device detected. Performing setup..." echo "Generic device detected. Performing setup..."
if [[ ":ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then if /usr/libexec/hardware/hhd-supported-hardware; then
echo "HHD supported handheld detected, disabling handycon & ds-inhibit..." echo "HHD supported handheld detected, disabling handycon & ds-inhibit..."
systemctl disable --now handycon.service systemctl disable --now handycon.service
systemctl disable --now ds-inhibit.service systemctl disable --now ds-inhibit.service
elif [[ ":AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:G1619-04:Win600:" =~ ":$SYS_ID:" ]]; then elif /usr/libexec/hardware/handycon-supported-hardware; then
echo "HandyGCCS supported handheld detected, enabling handycon & ds-inhibit..." echo "HandyGCCS supported handheld detected, enabling handycon & ds-inhibit..."
systemctl enable --now handycon.service systemctl enable --now handycon.service
systemctl enable --now ds-inhbit.service systemctl enable --now ds-inhbit.service

View File

@ -4,7 +4,6 @@ IMAGE_INFO="/usr/share/ublue-os/image-info.json"
IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO) IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO)
BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO) BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO) FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)
SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
# INIT # INIT
BAZZITE_CONFIG_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/bazzite" BAZZITE_CONFIG_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/bazzite"
@ -14,6 +13,7 @@ mkdir -p "$BAZZITE_CONFIG_DIR"
USER_SETUP_VER=25 USER_SETUP_VER=25
USER_SETUP_VER_FILE="$BAZZITE_CONFIG_DIR/version" USER_SETUP_VER_FILE="$BAZZITE_CONFIG_DIR/version"
USER_SETUP_FEDORA_VER_FILE="$BAZZITE_CONFIG_DIR/fedora_version" USER_SETUP_FEDORA_VER_FILE="$BAZZITE_CONFIG_DIR/fedora_version"
USER_SETUP_IMAGE_VER_FILE=$BAZZITE_CONFIG_DIR/image_name""
if [[ -f "$HOME/.bazzite-configured" ]]; then if [[ -f "$HOME/.bazzite-configured" ]]; then
mv -f "$HOME/.bazzite-configured" "$USER_SETUP_VER_FILE" mv -f "$HOME/.bazzite-configured" "$USER_SETUP_VER_FILE"
@ -25,10 +25,11 @@ fi
USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE) USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE)
USER_SETUP_FEDORA_VER_RAN=$(cat $USER_SETUP_FEDORA_VER_FILE) 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 # Run script if updated
if [[ -f $USER_SETUP_VER_FILE && $USER_SETUP_VER = $USER_SETUP_VER_RAN ]]; then 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 ]]; then if [[ -f $USER_SETUP_FEDORA_VER_FILE && $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..." echo "User setup v$USER_SETUP_VER has already run. Exiting..."
exit 0 exit 0
fi fi
@ -115,13 +116,13 @@ fi
# Deck Build Setup # Deck Build Setup
if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then
# HHD Setup # HHD Setup
if [[ "ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then if /usr/libexec/hardware/hhd-supported-hardware; then
echo 'Enabling HHD' echo 'Enabling HHD'
pkexec /usr/libexec/bazzite-enable-hhd "$USER" pkexec /usr/libexec/bazzite-enable-hhd "$USER"
fi fi
# SDGyroDSU Setup # SDGyroDSU Setup
if [[ ":Jupiter:Galileo:" =~ ":$SYS_ID:" ]]; then if /usr/libexec/hardware/valve-hardware; then
systemctl --user enable --now sdgyrodsu.service systemctl --user enable --now sdgyrodsu.service
else else
systemctl --user disable --now sdgyrodsu.service systemctl --user disable --now sdgyrodsu.service
@ -135,7 +136,7 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegam
rm -f "$AUTOSTART_FOLDER/autostart/bazzite-handle-legion-go-rotation.desktop" rm -f "$AUTOSTART_FOLDER/autostart/bazzite-handle-legion-go-rotation.desktop"
fi fi
if [[ ":ROG Ally RC71L_RC71L:83E1:Loki Max:G1618-04:" =~ ":$SYS_ID:" ]] && [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then if /usr/libexec/rotation-fix-hardware && [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then
if [[ ! -f "$AUTOSTART_FOLDER/autostart/bazzite-rotation-fix.desktop" ]]; then if [[ ! -f "$AUTOSTART_FOLDER/autostart/bazzite-rotation-fix.desktop" ]]; then
echo 'Adding rotation fix' echo 'Adding rotation fix'
mkdir -p "$AUTOSTART_FOLDER/autostart" mkdir -p "$AUTOSTART_FOLDER/autostart"
@ -151,3 +152,4 @@ fi
echo "Writing state file" echo "Writing state file"
echo $USER_SETUP_VER > $USER_SETUP_VER_FILE echo $USER_SETUP_VER > $USER_SETUP_VER_FILE
echo $FEDORA_VERSION > $USER_SETUP_FEDORA_VER_FILE echo $FEDORA_VERSION > $USER_SETUP_FEDORA_VER_FILE
echo $BASE_IMAGE_NAME > $USER_SETUP_IMAGE_VER_FILE

View File

@ -1,7 +0,0 @@
if test -d "$HOME"; then
if test ! -e "$HOME"/.config/no-show-user-motd; then
if test -x "/usr/libexec/ublue-motd"; then
/usr/libexec/ublue-motd
fi
fi
fi

View File

@ -1,6 +1,3 @@
// WARNING: Modifications to this file will not be preserved on upgrade.
// To configure, make a config.kdl file under /etc/system76-scheduler/.
// Version of the configuration file // Version of the configuration file
version "2.0" version "2.0"
@ -87,8 +84,6 @@ process-scheduler enable=true {
chrt chrt
dbus dbus
dbus-broker dbus-broker
fig
fig_desktop
gamemoderun gamemoderun
gamescope gamescope
input-remapper-service input-remapper-service

View File

@ -0,0 +1,7 @@
#!/usr/bin/bash
SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
if [[ ":AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:G1619-04:Win600:" =~ ":$SYS_ID:" ]]; then
exit 0
else
exit 1
fi

View File

@ -0,0 +1,7 @@
#!/usr/bin/bash
SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
if [[ ":ROG Ally RC71L_RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:" =~ ":$SYS_ID:" ]]; then
exit 0
else
exit 1
fi

View File

@ -0,0 +1,7 @@
#!/usr/bin/bash
SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
if [[ ":ROG Ally RC71L_RC71L:83E1:Loki Max:G1618-04:" =~ ":$SYS_ID:" ]]; then
exit 0
else
exit 1
fi

View File

@ -0,0 +1,7 @@
#!/usr/bin/bash
SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
if [[ ":Jupiter:Galileo:" =~ ":$SYS_ID:" ]]; then
exit 0
else
exit 1
fi

View File

@ -1,4 +1,6 @@
It is **always** better to install packages with Distrobox than to layer them with rpm-ostree. `ujust distrobox` makes it easy! It is **always** better to install packages with Distrobox rather than layer them with rpm-ostree. `ujust distrobox` makes it easy! - [More about supported packages](https://universal-blue.discourse.group/docs?topic=35)
Packages installed in Distrobox can be exported to appear like any other application - [View documentation](https://github.com/89luca89/distrobox/blob/main/docs/usage/distrobox-export.md). Packages installed in Distrobox can be exported to appear like any other application - [View documentation](https://github.com/89luca89/distrobox/blob/main/docs/usage/distrobox-export.md).
*Update break something?* You can roll back and pin the previous release or rebase by build date - [View our guide](https://universal-blue.discourse.group/docs?topic=513). *Update break something?* You can roll back and pin the previous release or rebase by build date - [View our guide](https://universal-blue.discourse.group/docs?topic=36).
*This isn't a distro*, this is a custom image built on Fedora technology - [View our mission](https://universal-blue.org/mission/) *This isn't a distro*, this is a custom image built on  Fedora technology - [View our mission](https://universal-blue.org/mission/)
*Looking to dual-boot with Windows?* [Check out our dual booting guide](https://universal-blue.discourse.group/docs?topic=129).
**Support the app store!** [Donate to  Flatpak](https://opencollective.com/flatpak)

View File

@ -1,7 +1,9 @@
*Installing a Windows game that isn't on Steam?* Lutris is pre-installed and recommended for better handling of wine prefixes. *Installing a Windows game that isn't on Steam?* Lutris is pre-installed and recommended for better handling of wine prefixes - [View gaming guide](https://universal-blue.discourse.group/docs?topic=31)
BTRFS is used by default for external drives, and we recommend that or EXT4 over NTFS - [More info](https://github.com/ValveSoftware/Proton/wiki/Using-a-NTFS-disk-with-Linux-and-Windows). BTRFS is used by default for external drives, and we recommend that or EXT4 over NTFS in all circumstances - [More info](https://github.com/ValveSoftware/Proton/wiki/Using-a-NTFS-disk-with-Linux-and-Windows)
*No Flatpak or distro packaging available?* The Gear Lever app is included to make managing and integrating AppImages easy! *No Flatpak or distro packaging available?* The Gear Lever app is included to make managing and integrating AppImages easy!
Want to control your device from your phone? The KDE Connect app functions with all Bazzite images - [More info](https://kdeconnect.kde.org/) *Want to control your device from your phone?* The KDE Connect app functions with all Bazzite images - [More info](https://kdeconnect.kde.org/)
*Trying to use Feral Gamemode?* System76-Scheduler in Bazzite replaces it, offering automatic nice value adjustments for applications based on the currently focused one and built-in rules. *Trying to use Feral Gamemode?* System76-Scheduler in Bazzite replaces it, offering automatic nice value adjustments for applications based on the currently focused window and preconfigured rules - [More info](https://github.com/pop-os/system76-scheduler#scheduler-config)
Discover Overlay is preinstalled, allowing Discord to overlay your games during voice chats - [More info](https://trigg.github.io/Discover/) Discover Overlay is preinstalled, allowing Discord to overlay your games during voice chats - [More info](https://trigg.github.io/Discover/)
*Looking to setup Waydroid?* - [View our documentation](https://universal-blue.discourse.group/docs?topic=32) *Looking to setup Waydroid?* - [View our documentation](https://universal-blue.discourse.group/docs?topic=32)
Bazzite uses ZSTD compression in BTRFS by default, and deduplicates files across your entire drive. **More space for your games!**
*Have a large library of ROMs to manage?* ROM Properties Page shell extension is installed by default and makes it much easier, with thumbnails and additional info for all of your files.

View File

@ -3,7 +3,7 @@ paths = ["/etc/ublue-os/topgrade.toml"]
[misc] [misc]
no_self_update = true no_self_update = true
disable = ["self_update", "toolbx", "containers"] disable = ["self_update", "toolbx", "containers", "shell"]
ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "pip3", "helm", "home_manager", "firmware"] ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "pip3", "helm", "home_manager", "firmware"]
assume_yes = true assume_yes = true
no_retry = false no_retry = false