[pull] main from ublue-os:main (#29)

* fix(just): fix configure-grub error (ublue-os#3896)

Fixes the "Recipe `configure-grub` failed with exit code 1" error when menu_auto_hide is not set in grubenv

* fix(dnf) hide erroneous error messages from the user (ublue-os#3897)

the custom dnf handler script opens the webpage via xdg-open, which seems to be buggy in both GNOME and KDE and will give erroneous error messages in both (while still working). We can redirect error output to /dev/null to suppress the messages.

* fix(beesd): Move override file (ublue-os#3907)

* feat(beesd): Various improvements (ublue-os#3913)

* fix(beesd): Move override file

* fix(beesd): rename override.conf to bees-timeout.conf

* feat(beesd): Cleanup leftover .beeshome subvolume upon configuration removal

* feat(beesd): Set thread factor parameter

* fix(beesd): Manually mount the root subvolume if not already mounted elsewhere (ublue-os#3914)

* fix(beesd): This should be an empty string check (ublue-os#3915)

* fix: Add zlib-devel to terra ignore list

* fix: Remove old and broken ujust

* chore: Clean up some layers from ujust, lets start disincentivizing this when possible.

* feat(kcminputrc): add global pointer defaults for KDE with no acceleration (ublue-os#3884)

* chore: Move to -deck

* fix: Disable mouse accel on gnome-deck

* chore(deps): update system_files/desktop/silverblue/usr/share/gnome-shell/extensions/tmp/caffeine digest to 07643c3 (ublue-os#3921)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

---------

Co-authored-by: biebel <badk666@hotmail.com>
Co-authored-by: stellaberrant <104581805+stellaberrant@users.noreply.github.com>
Co-authored-by: Bradley Bellairs <11426553+BWBellairs@users.noreply.github.com>
Co-authored-by: Kyle Gospodnetich <me@kylegospodneti.ch>
Co-authored-by: Xarishark <Xarishark@outlook.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Author: 7 people

Containerfile

@@ -67,7 +67,7 @@ RUN --mount=type=cache,dst=/var/cache \
     sed -i 's|baseurl=https://pkg.surfacelinux.com/fedora/f\$releasever/|baseurl=https://pkg.surfacelinux.com/fedora/f42/|' /etc/yum.repos.d/linux-surface.repo && \
     dnf5 -y config-manager setopt "linux-surface".enabled=false && \
     dnf5 -y config-manager setopt "*bazzite*".priority=1 && \
-    dnf5 -y config-manager setopt "*terra*".priority=3 "*terra*".exclude="nerd-fonts topgrade scx-tools scx-scheds steam python3-protobuf" && \
+    dnf5 -y config-manager setopt "*terra*".priority=3 "*terra*".exclude="nerd-fonts topgrade scx-tools scx-scheds steam python3-protobuf zlib-devel" && \
     dnf5 -y config-manager setopt "terra-mesa".enabled=true && \
     eval "$(/ctx/dnf5-setopt setopt '*negativo17*' priority=4 exclude='mesa-* *xone*')" && \
     dnf5 -y config-manager setopt "*rpmfusion*".priority=5 "*rpmfusion*".exclude="mesa-*" && \
@@ -423,7 +423,6 @@ RUN --mount=type=cache,dst=/var/cache \
     echo "import \"/usr/share/ublue-os/just/81-bazzite-fixes.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-apps.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-beesd.just\"" >> /usr/share/ublue-os/justfile && \
-    echo "import \"/usr/share/ublue-os/just/82-bazzite-cdemu.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-sunshine.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-waydroid.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/83-bazzite-audio.just\"" >> /usr/share/ublue-os/justfile && \

system_files/deck/kinoite/etc/skel/.config/kcminputrc

@@ -0,0 +1,3 @@
+[Libinput]
+PointerAcceleration=0.0
+PointerAccelerationProfile=2

system_files/deck/shared/usr/share/ublue-os/just/85-bazzite-image.just

@@ -169,15 +169,6 @@ restore-virtual-keyboard:
       fi
     fi
 
-_toggle-autologin:
-    #!/usr/bin/bash
-    DESKTOP_AUTOLOGIN="/etc/bazzite/desktop_autologin"
-    if [[ -f $DESKTOP_AUTOLOGIN ]]; then
-      sudo rm -f $DESKTOP_AUTOLOGIN
-    else
-      sudo touch $DESKTOP_AUTOLOGIN
-    fi
-
 # Restore the "Return to Gaming Mode" shortcut on the Desktop
 restore-gamemode-shortcut:
     #!/usr/bin/bash

system_files/deck/silverblue/etc/dconf/db/distro.d/10-bazzite-deck-input

@@ -0,0 +1,5 @@
+# Relocatable schemas are located here in dconf
+# Some Gnome extensions don't ship gschema XML, so their settings also need to go in dconf
+
+[org/gnome/desktop/peripherals/mouse]
+accel-profile='flat'

…c/systemd/beesd@.service.d/override.conf …ystem/beesd@.service.d/bees-timeout.confsystem_files/desktop/shared/etc/systemd/beesd@.service.d/override.conf renamed to system_files/desktop/shared/etc/systemd/system/beesd@.service.d/bees-timeout.conf system_files/desktop/shared/etc/systemd/beesd@.service.d/override.conf renamed to system_files/desktop/shared/etc/systemd/system/beesd@.service.d/bees-timeout.conf

@@ -0,0 +1,7 @@
+[Service]
+ExecStart=
+ExecStart=/usr/bin/timeout 10m /usr/bin/beesd --no-timestamps %i
+Restart=no
+SuccessExitStatus=124
+OOMScoreAdjust=1000
+OOMPolicy=stop

system_files/desktop/shared/etc/systemd/system/beesd@.service.d/override.conf

@@ -100,7 +100,11 @@ configure-grub ACTION="":
     # Function to get the current GRUB menu_auto_hide setting and explain it
     get_current_setting() {
       local CURRENT_SETTING
-      CURRENT_SETTING=$(sudo grub2-editenv - list | grep menu_auto_hide | cut -d= -f2)
+      if sudo grub2-editenv - list | grep -q '^menu_auto_hide='; then
+        CURRENT_SETTING=$(sudo grub2-editenv - list | awk -F= '/menu_auto_hide/ {print $2}')
+      else
+        CURRENT_SETTING=""
+      fi
       if [ -z "$CURRENT_SETTING" ]; then
         echo "Current GRUB menu_auto_hide setting: ${bold}${red}Not Set (default to 0)${normal}"
         echo "Explanation:"

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

@@ -18,6 +18,40 @@ configure-beesd ACTION="":
         sudo rm -f "/etc/systemd/system/beesd@${uuid}.service.d/override.conf"
         sudo rmdir "/etc/systemd/system/beesd@${uuid}.service.d" 2>/dev/null || true
         echo "Configuration removed and timer disabled."
+
+        echo "Cleaning leftover data"
+        fs_root=$(findmnt --source UUID="$uuid" -o TARGET,OPTIONS | grep "subvolid=5" | awk '{print $1}')
+        is_manual_mount=false
+        if [[ -z "$fs_root" ]]; then
+            fs_root="/run/bees/mnt/${uuid}"
+            sudo mkdir -p "$fs_root"
+            if ! sudo mount -o subvolid=5 UUID="$uuid" "$fs_root"; then
+                fs_root=""
+            else
+                is_manual_mount=true
+            fi
+        fi
+
+        if [[ -n "$fs_root" ]]; then
+            beeshome_id=$(sudo btrfs subvolume list "$fs_root" -t | grep "\.beeshome" | awk '{print $1}')
+            if [[ -n "$beeshome_id" ]]; then
+                echo "Found .beeshome subvolume with ID: $beeshome_id"
+                sudo btrfs subvolume delete -i "$beeshome_id" "$fs_root"
+                echo "Deleted .beeshome subvolume"
+            else
+                echo "No .beeshome subvolume found"
+            fi
+
+            if [[ "$is_manual_mount" == true ]]; then
+                sudo umount "$fs_root"
+                sleep 1
+                # Device might still be busy
+                # Not critical if this fails
+                sudo rmdir "$fs_root" >/dev/null 2>&1
+            fi
+        fi
+
+        sudo systemctl daemon-reload
     }
 
     while true; do
@@ -106,7 +140,7 @@ configure-beesd ACTION="":
         # https://github.com/Zygo/bees/blob/master/docs/options.md#load-management-options
         sudo sed -i "s/^UUID=.*/UUID=${UUID}/" "/etc/bees/${UUID}.conf"
         sudo sed -i "s/# DB_SIZE=.*/DB_SIZE=${db_size}/" "/etc/bees/${UUID}.conf"
-        sudo sed -i "s/# OPTIONS=.*/OPTIONS=\"--strip-paths --no-timestamps --throttle-factor 10\"/" "/etc/bees/${UUID}.conf"
+        sudo sed -i "s/# OPTIONS=.*/OPTIONS=\"--strip-paths --no-timestamps --thread-factor 0.5 --throttle-factor 10\"/" "/etc/bees/${UUID}.conf"
         echo "Created /etc/bees/${UUID}.conf with DB_SIZE=${db_size} bytes"
 
         # Only start the service if enough memory is free