Merge pull request #26 from theupriser/fix/install-fallback-cec-steam-machine-only

steamify-install: fallback selection only turns on HDMI-CEC on a Steam Machine

archiso/airootfs/etc/modprobe.d/nvidia-loader.conf

@@ -1,6 +0,0 @@
-# Forwards all NVIDIA module load requests to a "smart" loader that selects
-# correct version of the module depending on used hardware.
-install nvidia /usr/local/bin/nvidia-module-loader
-install nvidia_drm /usr/local/bin/nvidia-module-loader
-install nvidia_uvm /usr/local/bin/nvidia-module-loader
-install nvidia_modeset /usr/local/bin/nvidia-module-loader

archiso/airootfs/usr/local/bin/nvidia-module-loader

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-# Quick pass if one of the modules is already loaded.
-if [[ -e /sys/module/nvidia || -e /sys/module/nouveau ]]; then
-    exit 0
-fi
-
-# Load compatible version of NVIDIA modules for current hardware
-if chwd --list | awk '{ if($2 == "nouveau" || $2 == "nvidia-dkms-470xx" || $2 == "nvidia-dkms-580xx") f=1 } END {exit (f == 1) ? 0 : 1 }'; then
-    modprobe nouveau
-elif chwd --list | awk '{ if($2 == "nvidia-open-dkms") f=1 } END {exit (f == 1) ? 0 : 1 }'; then
-    # Load some basic dependencies of nvidia modules
-    modprobe video
-    modprobe drm_ttm_helper
-    modprobe drm_kms_helper
-    # load nvidia modules
-    modprobe --ignore-install -a nvidia nvidia-modeset nvidia-drm nvidia-uvm
-fi
-
-# Otherwise, do a fallback to nouveau anyway
-if [[ ! -e /sys/module/nouveau && ! -e /sys/module/nvidia ]]; then
-    modprobe nouveau
-fi

archiso/airootfs/usr/local/bin/steamify-install

@@ -9,9 +9,15 @@
 # takes the last matching rule, and a later %wheel rule would ask again. Never fails the install: a
 # problem leaves the log and Steamify can be run again from the desktop.
 root="$1" user="$2" choice="${3:-}"
-# Not filled in by Calamares (empty, or the literal ${gs[...]}): the page's
-# default, everything on.
-[[ -z "$choice" || "$choice" == *'${'* ]] && choice=gaming,theme,glyphs,single,launcher,notify,vram,cec,machine,poweroff
+# Not filled in by Calamares (empty, or the literal ${gs[...]}): the page's default. HDMI-CEC and the
+# Steam Machine items are ticked there only on a Steam Machine (Steamify's detect_valve_fremont).
+if [[ -z "$choice" || "$choice" == *'${'* ]]; then
+    choice=gaming,theme,glyphs,single,launcher,notify,vram
+    vendor="$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)" product="$(cat /sys/class/dmi/id/product_name 2>/dev/null)"
+    if [[ "$vendor" == Valve && "$product" == Fremont ]] || [[ "$vendor" == OEM && "$product" == F7F ]]; then
+        choice+=,cec,machine,poweroff
+    fi
+fi
 boot=gamescope options=""
 for id in ${choice//,/ }; do
     case "$id" in

archiso/packages_desktop.x86_64

@@ -17,6 +17,7 @@ btrfs-progs
 cachy-chroot
 cachyos-calamares-next
 cachyos-cli-installer-new
+cachyos-drm-awaiter
 cachyos-fish-config
 cachyos-hello
 cachyos-hooks