Merge pull request #54 from ublue-os/main

[pull] main from ublue-os:main

Containerfile

@@ -252,8 +252,7 @@ RUN rpm-ostree override remove \
         pipewire-jack-audio-connection-kit-libs \
         pipewire-libs \
         pipewire-pulseaudio \
-        pipewire-utils \
-        xorg-x11-server-Xwayland && \
+        pipewire-utils && \
     rpm-ostree install \
         mesa-va-drivers-freeworld \
         mesa-vdpau-drivers-freeworld.x86_64 && \

spec_files/discover-overlay/discover-overlay.spec

@@ -1,5 +1,5 @@
 %global forgeurl https://github.com/trigg/Discover
-Version:        0.7.1
+Version:        0.7.3
 %forgemeta
 
 Name:           discover-overlay

system_files/deck/kinoite/usr/libexec/bazzite-rotation-fix

@@ -36,7 +36,7 @@ if /usr/libexec/hardware/valve-hardware; then
 	kscreen-doctor output.1.scale.1.00 2>&1 | tee -a /tmp/bazrotfix.log
 elif [[ ! -z "$IS_GAMEMODE" ]]; then
 	kscreen-doctor output.1.rotation.normal 2>&1 | tee -a /tmp/bazrotfix.log
-elif [[ ":83E1:Loki Max:AIR Plus:" =~ ":$SYS_ID:" ]]; then
+elif [[ ":83E1:Loki Max:AIR Plus:SLIDE:" =~ ":$SYS_ID:" ]]; then
 	kscreen-doctor output.1.rotation.left 2>&1 | tee -a /tmp/bazrotfix.log
 else
 	kscreen-doctor output.1.rotation.normal 2>&1 | tee -a /tmp/bazrotfix.log

system_files/deck/shared/usr/libexec/bazzite-enable-hhd

@@ -1,4 +1,9 @@
 #!/usr/bin/bash
 
+if [ "$1" == "root" ]; then
+	echo "Do not run this for root."
+	exit 0
+fi
+
 systemctl enable --now hhd@$(systemd-escape $1).service
 systemctl disable --now [email protected]

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

@@ -1,5 +1,10 @@
 #!/usr/bin/bash
 
+if [ "${EUID:-$(id -u)}" -eq 0 ]; then
+  echo "Bazzite user setup ran as root user. Exiting."
+  exit 0
+fi
+
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"
 IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO)
 BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)