Merge pull request #66 from ublue-os/main

[pull] main from ublue-os:main

.github/pull_request_template.md

@@ -4,7 +4,7 @@ Here are some tips for you:
 
 ## Thank you for contributing to the Universal Blue project!
 
-Please [read the Contributor's Guide](https://universal-blue.org/CONTRIBUTING/) before submitting a pull request.
+Please [read the Contributor's Guide](https://universal-blue.org/contributing.html) before submitting a pull request.
 
 In this project we follow [Semantic PRs][1] and [Conventional Commits][2] to describe features and fixes we made. It would be nice if you did too as we use this to generate changelogs with the right sections: 
 

Containerfile

@@ -68,7 +68,18 @@ RUN rpm-ostree cliwrap install-to-root / && \
     ostree container commit
 
 # Setup firmware
-RUN mkdir -p /tmp/linux-firmware-neptune && \
+RUN mkdir -p /tmp/mediatek-firmware && \
+    curl -Lo /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/6b91b2ef6f4173099c1434e5d7c552e51814e26e/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false && \
+    curl -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/6b91b2ef6f4173099c1434e5d7c552e51814e26e/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false && \
+    curl -Lo /tmp/mediatek-firmware/WIFI_MT7961_patch_mcu_1_2_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/0a18a7292a66532633d9586521f0b954c68a9fbc/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false && \
+    curl -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7961_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/0a18a7292a66532633d9586521f0b954c68a9fbc/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false && \
+    xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin && \
+    xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin && \
+    xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7961_patch_mcu_1_2_hdr.bin && \
+    xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7961_1.bin && \
+    mv -vf /tmp/mediatek-firmware/* /usr/lib/firmware/mediatek/ && \
+    rm -rf /tmp/mediatek-firmware && \
+    mkdir -p /tmp/linux-firmware-neptune && \
     curl -Lo /tmp/linux-firmware-neptune/cs35l41-dsp1-spk-cali.bin https://gitlab.com/evlaV/linux-firmware-neptune/-/raw/jupiter-20231113.1/cs35l41-dsp1-spk-cali.bin && \
     curl -Lo /tmp/linux-firmware-neptune/cs35l41-dsp1-spk-cali.wmfw https://gitlab.com/evlaV/linux-firmware-neptune/-/raw/jupiter-20231113.1/cs35l41-dsp1-spk-cali.wmfw && \
     curl -Lo /tmp/linux-firmware-neptune/cs35l41-dsp1-spk-prot.bin https://gitlab.com/evlaV/linux-firmware-neptune/-/raw/jupiter-20231113.1/cs35l41-dsp1-spk-prot.bin && \
@@ -472,6 +483,8 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         rpm-ostree override replace \
         --experimental \
         --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
+            mutter \
+            mutter-common \
             gnome-shell \
             vte291 \
             vte-profile && \
@@ -598,7 +611,7 @@ RUN /usr/libexec/containerbuild/build-initramfs && \
     systemctl enable bazzite-hardware-setup.service && \
     systemctl enable tailscaled.service && \
     systemctl enable dev-hugepages1G.mount && \
-    systemctl enable joycond.service && \
+    systemctl disable joycond.service && \
     systemctl --global enable bazzite-user-setup.service && \
     systemctl --global enable podman.socket && \
     systemctl --global enable systemd-tmpfiles-setup.service && \

spec_files/gamescope/gamescope.spec

@@ -2,7 +2,7 @@
 
 %global _default_patch_fuzz 2
 %global build_timestamp %(date +"%Y%m%d")
-%global gamescope_tag 3.14.12
+%global gamescope_tag 3.14.13
 
 Name:           gamescope
 Version:        100.%{gamescope_tag}

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

@@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
 FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)
 
 # SCRIPT VERSION
-HWS_VER=39
+HWS_VER=40
 HWS_VER_FILE="/etc/bazzite/hws_version"
 HWS_VER_RAN=$(cat $HWS_VER_FILE)
 
@@ -177,6 +177,29 @@ else
   echo "No minimum-free ZRAM changes needed"
 fi
 
+# FRAMEWORK 13 AMD FIXES
+if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
+  if [[ $SYS_ID == "Laptop ("* ]]; then
+    if [[ "AuthenticAMD" == "$CPU_VENDOR" ]]; 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"
+        echo 0 | sudo tee /sys/module/snd_hda_intel/parameters/power_save
+      fi
+      if [[ ! -f /etc/udev/rules.d/20-suspend-fixes.rules ]]; then
+        echo 'Fixing suspend issue'
+        echo "ACTION==\"add\", SUBSYSTEM==\"serio\", DRIVERS==\"atkbd\", ATTR{power/wakeup}=\"disabled\"" > /etc/udev/rules.d/20-suspend-fixes.rules
+      fi
+    fi
+  fi
+fi
+
+# ALLY POWER SAVE FIX
+ALLY_LIST="ROG Ally RC71L_RC71L:ROG Ally RC71L"
+if [[ ":$ALLY_LIST:" =~ ":$SYS_ID:"  ]]; then
+  echo 0 | sudo tee /sys/devices/platform/asus-nb-wmi/mcu_powersave
+fi
+
 # WAYDROID FIX
 if [[ -f "/var/lib/waydroid/lxc/waydroid/config" ]]; then
   echo "Removing unneeded apparmor entry from Waydroid LXC"

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

@@ -3,6 +3,9 @@
 if [ "${EUID:-$(id -u)}" -eq 0 ]; then
   echo "Bazzite user setup ran as root user. Exiting."
   exit 0
+elif [ "$(whoami)" = "sddm" ]; then
+  echo "Bazzite user setup ran as sddm user. Exiting."
+  exit 0
 fi
 
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"
@@ -113,8 +116,12 @@ else
         echo 'Setting Framework logo menu'
         dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
         dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 4
-        echo 'Enabling natural scroll'
-        dconf write /org/gnome/desktop/peripherals/mouse/natural-scroll true
+        echo 'Adjusting OSD position'
+        dconf write /org/gnome/shell/extensions/just-perfection/osd-position 4
+        if [[ $SYS_ID == "Laptop ("* ]]; then
+          echo 'Applying font fix for Framework 13'
+          dconf write /org/gnome/desktop/interface/text-scaling-factor 1.25
+        fi
         touch "$BAZZITE_CONFIG_DIR/framework-initialized"
       fi
     fi

system_files/desktop/silverblue/usr/etc/environment

@@ -4,3 +4,6 @@ OBS_USE_EGL=1
 
 # Required for GNOME VRR MR
 MUTTER_DEBUG_FORCE_KMS_MODE=simple
+
+# https://gitlab.gnome.org/GNOME/mutter/-/issues/3037
+MUTTER_DEBUG_KMS_THREAD_TYPE=user

system_files/nvidia/shared/usr/etc/sddm.conf

@@ -0,0 +1,2 @@
+[General]
+DisplayServer=x11