Merge pull request #73 from theupriser/release/2.10.0

Release 2.10.0

.no-release-yet

@@ -1,5 +0,0 @@
-This branch is not ready to be released: do not merge it into the release branch.
-When the feature is complete and tested, ask the user whether it may be released;
-on a yes, delete this file, then open the pull request into the release branch.
-Open work, research and the test instructions for the NVIDIA PC are NOT in this repo:
-see steamify-cachyos-dev, folder nvidia/ (github.com/theupriser/steamify-cachyos-dev).

AGENTS.md

@@ -48,19 +48,19 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine
   `<id>_available` is checked via `component_available` (e.g. `machine`
   only on Fremont). Turn-on order is `COMPONENTS` order, turn-off reverse;
   `gaming` must stay first. Dependencies live in `toggle_component`.
-- **Hardware-specific fixes** that belong to a component but aren't a menu
-  row (e.g. `lib/nvidia.sh`: NVIDIA's kernel parameters and early modules
-  for gaming mode, called from `gaming_enable`/`gaming_disable`) detect the
-  hardware themselves, change only what's missing, and undo it on disable.
-  Add them to the source loop in `steamify.sh` and the table in
-  `TECHNICAL.md`. They can't be tested without the hardware: say so in the
-  changelog and keep the branch behind `.no-release-yet` until it was.
+- **NVIDIA** (`lib/nvidia.sh`): gamescope's session is broken on NVIDIA, so the SteamOS conversion (`gaming`, `boot`, `single`,
+  `glyphs`) is hidden there (unless already on) and `nvidia` + its sub-option `bigpicture` ("Gaming on NVIDIA") replace it:
+  Steam on the Plasma desktop, started at login. Never reintroduce a gamescope session for NVIDIA without re-testing on the
+  hardware (notes: steamify-cachyos-dev, `nvidia/`). It can't be tested without the hardware: keep the branch behind
+  `.no-release-yet` until it was.
 - **Feature versions.** Set `FEATURE_VERSION[<id>]` (`lib/menu.sh`) to the new
   `VERSION` whenever what `<id>_enable` sets up changes (a new component gets
   one too): installs recorded with an older version
   are ticked and re-applied ("update" in the plan and the app). New default
   options are ticked for installs whose parent (top-level: `gaming`) is on
-  (`feature_new`, shown as "new").
+  (`feature_new`, shown as "new"). New opt-in options (`NO_PRESELECT`) get the
+  same "new" badge without being ticked (`feature_new_optin`). Both count "Gaming
+  on NVIDIA" as a parent where the conversion isn't offered.
   Options shown but left unticked in a confirmed run are recorded as
   `off` (`feature_record_unticked`), or `feature_new` would tick them again.
   Status still comes from the system; don't add ad-hoc `<id>_repair` checks
@@ -156,9 +156,12 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine
     a warning when `VERSION` is a version that's already released (so a
     release branch that forgot its bump shows it on every PR).
   - A release that adds, removes or renames a menu row also retakes the
-    README screenshot (`assets/screenshot-menu.png`): the app from the
-    branch on a Steam Machine, every row visible (window 1280 wide, tall
-    enough), the header showing the new `VERSION`, scaled to 1600 px wide.
+    README screenshots (`assets/screenshot-menu-steam-machine.png` and
+    `assets/screenshot-menu-nvidia.png`, side by side in the README): the app from the branch on a Steam Machine and on a PC
+    with an NVIDIA card, every row visible and each window only as tall as its options need, the header showing the new
+    `VERSION`, 1600 px wide. Size the window with a KWin script (match the `steamify-ui` class exactly: a title match also hits
+    Konsole and editor windows) and crop the full-screen capture to the client rectangle; mind the display scale (the Steam
+    Machine runs at 1.75).
   - Users install through `releases/latest/download/steamify.sh`
     (GitHub's newest release). The `latest` tag and release follow the newest
     version tag too (moved, asset replaced, when a new version is released),

CHANGELOG.md

@@ -5,14 +5,14 @@ All notable changes, per version and per commit. Versions follow
 `steamify.sh`. Versions before 0.7.0 were numbered afterwards,
 one per merged pull request.
 
-## 2.9.7 - 2026-10-01
+## 2.10.0 - 2026-10-01
 
-- **feat: the SteamOS conversion fixes a corrupted gaming mode screen with an NVIDIA GPU: nvidia-drm.modeset=1 and fbdev=1 on the kernel command line, NVIDIA modules in the initramfs (lib/nvidia.sh)**
-- **test: tests/nvidia-test.sh runs the NVIDIA fix against a fake RTX 5080 beside an iGPU, a stub modinfo and temp copies of the Limine, systemd-boot and GRUB files (no root, VM or hardware); NVIDIA_DRM_DIR points detection at a fake sysfs tree**
-- **fix: NVIDIA fix on Limine edits the KERNEL_CMDLINE[default] line (an appended += line ended up as literal text on the kernel command line, found in a VM); the modules are only loaded early when every installed kernel has them, and a Limine boot entry without the parameters is an error**
-- **test: tests/nvidia-hardware-test.sh for a real NVIDIA PC: check (read-only state of the detection, the live nvidia_drm modeset/fbdev, versions), apply, and visual (was the gaming mode picture clean), with a report file to paste**
-- **fix: the NVIDIA modules are loaded early only while every installed kernel has them, decided again at every kernel or driver change by a pacman hook (steamify-nvidia-initramfs): a later kernel without the modules (another kernel, a failed DKMS build, a downgrade) no longer makes its initramfs and Limine boot entry fail**
-- **feat: the NVIDIA fix is only for RTX 20 series or newer, decided like the VRAM booster does (vram_nvidia_legacy_id: chwd's legacy card lists); older cards are left alone**
+- `d6db4f6` **feat: "Gaming on NVIDIA" (nvidia) replaces the SteamOS conversion on PCs with an NVIDIA GPU, where gamescope's gaming mode shows a corrupted picture (NVIDIA bug 5240452): Steam is installed when missing and starts at login on the Plasma desktop; the sub-option "Steam starts in Big Picture" (bigpicture) starts it in Big Picture, unticked in its normal window, on an empty Plasma session so windows of the last session don't cover it. On a supported card (RTX 20 series or newer) it also sets the NVIDIA kernel parameters and early modules. The conversion and its options are hidden there unless already on**
+- `d1373e2` **feat: single user mode also works on NVIDIA PCs, without the SteamOS conversion**
+- `5811f5c` **fix: "Add as non-Steam game" isn't offered on NVIDIA PCs (shown when already on, so it can be turned off)**
+- `83248a8` **feat: Extended controller support (extended_controller_support, off by default): the Xbox wireless dongle (xone) and Xbox controllers over Bluetooth with rumble and battery level (xpadneo), built for every installed kernel; off removes only what Steamify installed**
+- `01a77b7` **feat: a new opt-in option (unticked by default) shows the "new" badge in the menu and the app**
+- `f1983a9` **docs: README screenshots of the 2.10.0 app, side by side: on a Steam Machine and on a PC with an NVIDIA card**
 
 ## 2.9.6 - 2026-09-30
 

README.md

@@ -1,6 +1,14 @@
 # Steamify CachyOS
 
-![The Steamify app's menu on a Steam Machine](assets/screenshot-menu.png)
+The Steamify app's menu. On a Steam Machine (or any PC with an AMD or Intel
+graphics card) it offers the full SteamOS conversion, on the left. On a PC with
+an NVIDIA graphics card gamescope's gaming mode shows a corrupted picture, so the
+menu offers **Gaming on NVIDIA** instead (Steam on the desktop, started at login,
+optionally in Big Picture), on the right.
+
+| On a Steam Machine | On a PC with an NVIDIA graphics card |
+|---|---|
+| ![The Steamify app's menu on a Steam Machine](assets/screenshot-menu-steam-machine.png) | ![The Steamify app's menu on a PC with an NVIDIA graphics card](assets/screenshot-menu-nvidia.png) |
 
 Turn a CachyOS desktop PC into a SteamOS-style console: it boots straight
 into Steam's Big Picture (gamescope), and you can switch to the KDE Plasma
@@ -23,6 +31,12 @@ Steam Machine.
      as OS Version (e.g. `steamos-3.9`), `steam-machine` as OS Codename and
      Steamify's version as OS Variant. The OS name stays CachyOS
      ([details](TECHNICAL.md#what-steams-system-settings-show)).
+   - **NVIDIA graphics cards:** gamescope's gaming mode shows a corrupted
+     picture there (an open NVIDIA driver bug), so the conversion isn't
+     offered. **Gaming on NVIDIA** takes its place: Steam on the desktop,
+     installed if it's missing and started at login, in **Big Picture** or its
+     normal window as you choose
+     ([details](TECHNICAL.md#gaming-on-nvidia)).
 2. **SteamOS theme** - the Vapor look of SteamOS for the desktop, with
    **Add to Steam** in right-click menus
    ([details](TECHNICAL.md#steamos-desktop-look)).
@@ -37,7 +51,7 @@ Steam Machine.
    With **Add as non-Steam game** (on by default) it's in your Steam library
    too: started from Steam it gets your controller (a Steam Controller only
    talks to Steam), in gaming mode as well. Steam closes for a moment while
-   it's added, so that's done from the desktop.
+   it's added, so that's done from the desktop. Not offered on PCs with an NVIDIA graphics card, which have no gaming mode.
 6. **Update notifications** - on by default: a notification and a tray icon
    when there's a new Steamify, with Open Steamify and Skip this version. It
    never updates anything by itself
@@ -56,6 +70,11 @@ Steam Machine.
    the Steam Machine) or a USB CEC adapter; most graphics cards, NVIDIA
    included, don't have it. See [CEC.md](CEC.md) for which PCs do, and how to
    add it to your own build ([details](TECHNICAL.md#hdmi-cec)).
+9. **Extended controller support** (off by default) - the Xbox wireless
+   dongle (xone) and Xbox controllers over Bluetooth with rumble, the right
+   button mapping and the battery level (xpadneo). Both are installed from the
+   CachyOS repo and built for every installed kernel
+   ([details](TECHNICAL.md#extended-controller-support)).
 
 ## Steam Machine
 

TECHNICAL.md

@@ -43,6 +43,14 @@ user wallet, with anything saved in it meanwhile, is kept as
 `kdewallet.kwl.steamify-single-user` and used again the next time it's on.
 Passwords aren't shared between the two wallets.
 
+**Without the conversion (NVIDIA PCs, where gamescope's session is broken)** nothing else logs in by itself, so single user mode
+does that too: `single_login_enable` (`lib/single-user.sh`) switches to SDDM and writes
+`/etc/sddm.conf.d/zzz-steamify-autologin.conf` (`User=`, `Session=plasma.desktop`, `Relogin=true`; named to sort after
+`steam-set-session`'s `zz-steamos-autologin.conf`, which may still say gamescope from an earlier conversion), and drops any
+`[Autologin]` from `/etc/sddm.conf`. Turning it off removes the file and goes back to plasma-login-manager. With the
+conversion on, the conversion does the login as before. Ticking single user mode only ticks the conversion where the
+conversion is offered.
+
 **SDDM** is what SteamOS uses, and CachyOS's `steam-set-session` supports it
 directly: it writes `/etc/sddm.conf.d/zz-steamos-autologin.conf`, which SDDM
 honours. The script installs and enables `sddm` (active from the next boot),
@@ -206,33 +214,52 @@ or upgraded. A newly added kernel doesn't come with its headers, so
 `ensure-kernel-headers.service` checks at every boot and installs any
 missing `-headers` package, which makes DKMS build the driver for it.
 
-## NVIDIA fix for gaming mode
+## Extended controller support
 
-gamescope drives the display itself through DRM/KMS, which with NVIDIA needs
-kernel modesetting and the framebuffer driver, and the driver loaded early;
-without them gaming mode can show a corrupted image. With a supported NVIDIA GPU (RTX 20 series or newer, decided like the VRAM
-booster does: a card on chwd's legacy lists `/var/lib/chwd/ids/nvidia-*.ids`
-is older and left alone, `vram_nvidia_legacy_id`; without those lists every
-card counts) and its driver installed (`lib/nvidia.sh`), the SteamOS conversion adds
-`nvidia-drm.modeset=1 nvidia-drm.fbdev=1` to the kernel command line (Limine,
-systemd-boot or GRUB; the file is backed up first) and
-`/etc/mkinitcpio.conf.d/90-steamify-nvidia.conf` (`MODULES+=(nvidia
-nvidia_modeset nvidia_uvm nvidia_drm)`), then rebuilds the initramfs and boot
-entries. The early-load drop-in is only there while every installed kernel has the
-NVIDIA modules (mkinitcpio fails on a missing module, and `limine-mkinitcpio`
-then skips that kernel's boot entry, parameters included). That is decided again
-at every kernel or driver change by a pacman hook
-(`/etc/pacman.d/hooks/85-steamify-nvidia-initramfs.hook`, after DKMS builds,
-before the initramfs is built) running `/usr/local/libexec/steamify-nvidia-initramfs`:
-another kernel without the modules, a failed DKMS build or a downgrade removes
-the drop-in, and it comes back once every kernel has them again.
-On Limine the parameters go into the existing `KERNEL_CMDLINE[default]="..."`
-line: an extra appended `+=` line is pasted into the command line as text.
-Only what's missing is changed; it applies after a reboot. Turning
-the conversion off removes both, the hook and its script. `tests/nvidia-test.sh` tests it against a fake GPU
-and fake boot loader files; `tests/nvidia-hardware-test.sh check|apply|visual` is for a
-real NVIDIA PC (read-only check, the real apply, and a prompt for whether the picture
-was clean), and writes `~/steamify-nvidia-report.txt`.
+`extended_controller_support` (`lib/controllers.sh`, top-level, off by default, 2.10.0) installs two kernel drivers from CachyOS's own
+repo (no AUR): `xone-dkms` with `xone-dongle-firmware` for the Xbox wireless dongle (the kernel has no driver for it; wired
+Xbox controllers go through the same driver), and `xpadneo-dkms` for Xbox One/Series controllers over Bluetooth (without it
+they work as plain gamepads but miss rumble including the triggers, the right button mapping and the battery level). Both are
+DKMS modules, built for every installed kernel, so `install_kernel_headers` (`lib/steam-machine.sh`) makes sure each kernel has its
+headers first. A PC that already has the AUR's `xone-dkms-git` keeps it: it provides the same driver and conflicts with the repo's
+`xone-dkms`. Status is the three packages being installed. Off removes only what Steamify installed (state
+`extended_controller_support`, `installed_pkgs`); the headers stay. The drivers load when the device shows up: the dongle is
+plugged in again, or the controller reconnected. `tests/controllers-test.sh` tests it with a stub `pacman`.
+
+## Gaming on NVIDIA
+
+gamescope's own gaming mode shows a corrupted picture on NVIDIA graphics cards: NVIDIA's open bug 5240452 (flicker and
+artifacts in the DRM session at modes above 2560x1440@120, seen up to driver 595 and on RTX 3070 Ti, 4090, 5090 and 5080;
+no fix known). The kernel parameters `nvidia-drm.modeset=1`/`fbdev=1` and loading the NVIDIA modules early don't change it
+(the driver already reports both `Y`), and gamescope started nested inside KDE artifacts too when KWin hands its fullscreen
+window straight to the display. What does work on an RTX 5080: Steam's Big Picture (`steam -gamepadui`) as a normal window of
+the Plasma desktop session, smooth and clean.
+
+So with an NVIDIA GPU (PCI vendor 0x10de, display class, its driver providing `nvidia_drm`: `nvidia_present`) the SteamOS
+conversion (`gaming`, and its options `boot`, `single`, `glyphs`) isn't offered, unless it is already on (so it can be turned
+off). `nvidia` ("Gaming on NVIDIA", `lib/nvidia.sh`) takes its place, hidden while the conversion is on (both would start
+Steam at login): it installs `steam` when missing (recorded in state `nvidia`, removed again only then) and enables the user
+unit `steamify-steam-autostart.service` (`services/`, `ExecStart=/usr/bin/steam @ARGS@`, Plasma only). Its sub-option
+`bigpicture` ("Steam starts in Big Picture", ticked along with it) rewrites the unit with `-gamepadui` and sets
+`ksmserverrc [General] loginMode=emptySession` (`kset`, undone with `krevert bigpicture`), so windows of the last session
+(Discord, a browser) aren't restored on top of Big Picture; unticked, Steam starts in its normal window. The PC always boots into the desktop: there is no gamescope session. Takes effect at the next
+login.
+
+On a supported card (RTX 20 series or newer: not on chwd's legacy lists `/var/lib/chwd/ids/nvidia-*.ids`, the VRAM booster's
+check, `vram_nvidia_legacy_id`; `nvidia_supported`) enabling it also does what NVIDIA's DRM stack wants, though it didn't cure
+gamescope: `nvidia-drm.modeset=1 nvidia-drm.fbdev=1` on the kernel command line (Limine, systemd-boot or GRUB; the file is
+backed up first; on Limine into the existing `KERNEL_CMDLINE[default]="..."` or `+="..."` line, never an extra appended line,
+which ends up as text; the kernel treats `nvidia_drm` and `nvidia-drm` alike) and
+`/etc/mkinitcpio.conf.d/90-steamify-nvidia.conf` (`MODULES+=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)`), then the initramfs
+and boot entries are rebuilt and checked for the parameters. The early-load drop-in is only there while every installed kernel
+has the NVIDIA modules (mkinitcpio fails on a missing module, and `limine-mkinitcpio` then skips that kernel's boot entry):
+a pacman hook (`/etc/pacman.d/hooks/85-steamify-nvidia-initramfs.hook`, after DKMS, before the initramfs is built) runs
+`/usr/local/libexec/steamify-nvidia-initramfs` at every kernel or driver change and decides again. Turning it off removes
+all of it. `tests/nvidia-hardware-test.sh check|apply|visual` is for a real NVIDIA PC (writes `~/steamify-nvidia-report.txt`). `tests/nvidia-test.sh` tests it against a fake GPU, a stub `pacman` and `systemctl`, and a temp home.
+
+Tried and dropped (notes in steamify-cachyos-dev, `nvidia/HARDWARE-RESULTS.md`): a gamescope session that opens Big Picture in Plasma (it needed the `start-gamescope-session`
+command shadowed in `/usr/local/bin`, and showed the desktop for a few seconds, then a Steam window with a black border);
+a KWin session without Plasma (the mouse stuttered every second or two).
 
 ## HDMI-CEC
 
@@ -538,7 +565,8 @@ immediately, which can turn into a loop - see
 | `lib/steam-game.sh` | Add as non-Steam game: Steamify in the Steam library (`patches/steam-shortcuts.py`) |
 | `lib/update-notifier.sh` | Update notifications: the notifier from `patches/` and its user timer |
 | `lib/first-login.sh` | `--defaults` without a session (the Steam Machine ISO's installer): the one-time first-login step that sets up single user's launcher on Plasma's new layout and opens the app |
-| `lib/nvidia.sh` | NVIDIA fix for gaming mode: kernel parameters and early modules (part of the SteamOS conversion) |
+| `lib/controllers.sh` | Extended controller support: Xbox wireless dongle (xone) and Xbox Bluetooth (xpadneo) from the CachyOS repo |
+| `lib/nvidia.sh` | Gaming on NVIDIA: Steam on the desktop, started at login, optionally in Big Picture (replaces the SteamOS conversion there) |
 | `lib/vram-booster.sh` | VRAM booster (`dmemcg-booster`, `plasma-foreground-booster`) |
 | `services/` | The systemd units the scripts install (`service_file`, `@KEY@` placeholders); see its README |
 | `patches/` | Module sources and patches the scripts build or apply (`patch_file`); see its README |

lib/backend.sh

@@ -53,7 +53,7 @@ backend_status() {
         items+=",\"on\":$( [[ "$now" == 1 ]] && echo true || echo false)"
         items+=",\"wanted\":$( [[ "${WANTED[$c]:-0}" == 1 ]] && echo true || echo false)"
         items+=",\"update\":$(feature_outdated "$c" && echo true || echo false)"
-        items+=",\"new\":$(feature_new "$c" && echo true || echo false)"
+        items+=",\"new\":$({ feature_new "$c" || feature_new_optin "$c"; } && echo true || echo false)"
         items+=",\"selectable\":$(component_selectable "$c" && echo true || echo false)"
         # Why it can't be turned on, for the app's explanation.
         [[ "$c" == vram && -n "${VRAM_NVIDIA_CASE:-}" ]] &&
@@ -146,8 +146,15 @@ backend_apply() {
         for id in "${want[@]}"; do [[ "$id" == "$c" ]] && WANTED[$c]=1; done
     done
     # The same rules as the menu's toggles.
-    [[ "${WANTED[single]:-0}" == 1 ]] && WANTED[gaming]=1
+    # (Single user mode only needs the conversion where it is offered: not on NVIDIA PCs.)
+    [[ "${WANTED[single]:-0}" == 1 ]] && component_available gaming && WANTED[gaming]=1
+    if component_available gaming; then
         [[ "${WANTED[gaming]:-0}" == 0 ]] && { WANTED[single]=0; WANTED[boot]=0; }
+    else
+        WANTED[boot]=0
+    fi
+    [[ "${WANTED[bigpicture]:-0}" == 1 ]] && WANTED[nvidia]=1
+    [[ "${WANTED[nvidia]:-0}" == 0 ]] && WANTED[bigpicture]=0
     [[ "${WANTED[poweroff]:-0}" == 1 ]] && WANTED[machine]=1
     [[ "${WANTED[machine]:-0}" == 0 ]] && WANTED[poweroff]=0
     [[ "${WANTED[kpin]:-0}" == 1 ]] && WANTED[machine]=1

lib/controllers.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+# Extended controller support: the Xbox wireless dongle (xone, with its firmware) and Xbox controllers over Bluetooth (xpadneo).
+# The kernel has no driver for the dongle, and without xpadneo a Bluetooth Xbox controller works as a plain gamepad (buttons and
+# sticks) but misses rumble (trigger motors too), proper button mapping and the battery level. Both are DKMS modules from CachyOS's
+# own repo, built for every installed kernel (so every kernel needs its headers). Sourced by steamify.sh; not meant to be run on
+# its own.
+
+controller_xone_pkg() {
+    # A PC with the AUR's xone-dkms-git already works: the repo's xone-dkms would conflict with it.
+    pacman -Q xone-dkms-git >/dev/null 2>&1 && echo xone-dkms-git || echo xone-dkms
+}
+
+controller_pkgs() { echo "xpadneo-dkms $(controller_xone_pkg) xone-dongle-firmware"; }
+
+extended_controller_support_status() {
+    # shellcheck disable=SC2046 # a list of package names
+    pacman -Q $(controller_pkgs) >/dev/null 2>&1
+}
+
+extended_controller_support_enable() {
+    local p prev missing=()
+    info "Installing extended controller support (Xbox wireless dongle, Xbox Bluetooth)..."
+    install_kernel_headers || return 1
+    for p in $(controller_pkgs); do pacman -Q "$p" >/dev/null 2>&1 || missing+=("$p"); done
+    if ((${#missing[@]})); then
+        sudo pacman -S --needed --noconfirm "${missing[@]}" ||
+            { err "Installing ${missing[*]} failed."; return 1; }
+        # What a first, half-finished run installed stays on the list.
+        prev="$(state_get extended_controller_support installed_pkgs)"
+        state_set extended_controller_support installed_pkgs "$(echo "$prev ${missing[*]}" | xargs)"
+    fi
+    ok "Extended controller support on: plug the dongle in again (or reconnect the controller) to use it."
+}
+
+extended_controller_support_disable() {
+    local pkgs
+    pkgs="$(state_get extended_controller_support installed_pkgs)"
+    # Only what Steamify installed; kernel headers stay.
+    # shellcheck disable=SC2086 # a list of package names
+    [[ -n "$pkgs" ]] && sudo pacman -Rns --noconfirm $pkgs >/dev/null 2>&1
+    state_clear extended_controller_support
+    ok "Extended controller support off."
+}

lib/login-manager.sh

@@ -109,7 +109,6 @@ gaming_enable() {
     esac
     create_desktop_shortcut
     steam_enable
-    nvidia_enable || return 1
     os_name_enable || return 1
 }
 
@@ -125,7 +124,6 @@ gaming_disable() {
     steam_disable
     krevert gaming
     os_name_disable
-    nvidia_disable
     ok "The PC boots to the normal login screen again (from the next boot)."
 }
 
@@ -169,6 +167,20 @@ switch_to_sddm() {
     ok "SDDM is the login manager from the next boot on."
 }
 
+remove_sddm_base_autologin() {
+    # /etc/sddm.conf is read last: an [Autologin] there would override our fragments.
+    if [[ -f /etc/sddm.conf ]] && grep -q '^\[Autologin\]' /etc/sddm.conf; then
+        backup_file /etc/sddm.conf
+        sudo awk '
+            /^\[Autologin\]/ { skip=1; next }
+            /^\[/ { skip=0 }
+            !skip { print }
+        ' /etc/sddm.conf | sudo tee /etc/sddm.conf.tmp > /dev/null &&
+            sudo mv /etc/sddm.conf.tmp /etc/sddm.conf
+        info "Removed [Autologin] from /etc/sddm.conf (backup kept)."
+    fi
+}
+
 configure_sddm_autologin() {
     # User= and Relogin= live in our own fragment; steam-set-session keeps
     # Session= up to date in zz-steamos-autologin.conf, which sorts later
@@ -184,16 +196,7 @@ Session=gamescope-session.desktop
 Relogin=true
 EOF
 
-    if [[ -f /etc/sddm.conf ]] && grep -q '^\[Autologin\]' /etc/sddm.conf; then
-        backup_file /etc/sddm.conf
-        sudo awk '
-            /^\[Autologin\]/ { skip=1; next }
-            /^\[/ { skip=0 }
-            !skip { print }
-        ' /etc/sddm.conf | sudo tee /etc/sddm.conf.tmp > /dev/null &&
-            sudo mv /etc/sddm.conf.tmp /etc/sddm.conf
-        info "Removed [Autologin] from /etc/sddm.conf (backup kept)."
-    fi
+    remove_sddm_base_autologin
 
     # Start in gamescope, through CachyOS's own tool so its file is current.
     sudo /usr/lib/steamos/steam-set-session gamescope-session.desktop

lib/menu.sh

@@ -5,18 +5,19 @@
 
 # Menu order. Components are turned on in this order and off in reverse;
 # gaming must come first (single user builds on it).
-COMPONENTS=(gaming boot theme glyphs single launcher steamgame notify vram cec machine poweroff kpin hdmi bios)
+COMPONENTS=(gaming boot nvidia bigpicture theme glyphs single launcher steamgame notify extended_controller_support vram cec machine poweroff kpin hdmi bios)
 # One-off actions rather than on/off components: never preselected, never
 # re-applied, not listed as on or off.
 ACTIONS=(bios)
 # Sub-options, shown indented under their parent and only while it's ticked.
-declare -A PARENT=([boot]=gaming [steamgame]=launcher [poweroff]=machine [kpin]=machine [hdmi]=machine [bios]=machine)
+declare -A PARENT=([boot]=gaming [bigpicture]=nvidia [steamgame]=launcher [poweroff]=machine [kpin]=machine [hdmi]=machine [bios]=machine)
 # Never preselected on a first run: booting into the desktop is a choice,
 # gamescope is the default; HDMI-CEC is opt-in (it can wake the machine or
 # upset other devices on the TV, even on SteamOS), except on a Steam Machine,
 # which has CEC like on SteamOS. HDMI refresh boost needs someone at the
-# screen to confirm each step.
-NO_PRESELECT=(boot cec kpin hdmi)
+# screen to confirm each step. Extended controller support builds kernel modules for
+# every installed kernel: opt-in.
+NO_PRESELECT=(boot cec kpin hdmi extended_controller_support)
 # Feature versions: the Steamify version in which what a component's enable
 # sets up last changed; set it to the new VERSION whenever you change one.
 # Each successful run records it (state "features"); a component that's on
@@ -25,20 +26,23 @@ NO_PRESELECT=(boot cec kpin hdmi)
 # FEATURE_BASELINE.
 FEATURE_BASELINE=2.1.0
 declare -A FEATURE_VERSION=(
-    [gaming]=2.9.7 [boot]=2.1.0 [theme]=2.1.0 [glyphs]=2.1.0 [single]=2.1.0
-    [launcher]=2.1.0 [cec]=2.7.0 [machine]=2.9.0 [poweroff]=2.2.0 [vram]=2.3.0 [notify]=2.5.0 [steamgame]=2.5.1
+    [gaming]=2.9.0 [boot]=2.1.0 [nvidia]=2.10.0 [bigpicture]=2.10.0 [theme]=2.1.0 [glyphs]=2.1.0 [single]=2.1.0
+    [launcher]=2.1.0 [cec]=2.7.0 [machine]=2.9.0 [poweroff]=2.2.0 [vram]=2.3.0 [notify]=2.5.0 [steamgame]=2.5.1 [extended_controller_support]=2.10.0
     [kpin]=2.1.0 [hdmi]=2.1.0
 )
 
 declare -A LABEL=(
     [gaming]="SteamOS conversion: boot into gaming mode, Steam on the desktop"
     [boot]="Boot into the desktop instead of gaming mode"
+    [nvidia]="Gaming on NVIDIA: Steam on the desktop, started at login"
+    [bigpicture]="Steam starts in Big Picture: the controller-friendly Steam (untick: Steam's normal window)"
     [theme]="Install SteamOS theme: Vapor look (cachyos-vapor)"
     [glyphs]="Install Steam Deck/Machine icons: Deck button icons in gaming mode"
     [single]="Single user mode: no password, lock screen or log out (SDDM)"
     [launcher]="Steamify shortcut: the app on the desktop, Steamify Terminal in the launcher"
     [steamgame]="Add as non-Steam game: Steamify in your Steam library, for the controller and gaming mode"
     [notify]="Update notifications: a notification when there's a new Steamify, never updates by itself"
+    [extended_controller_support]="Extended controller support: Xbox wireless dongle (xone), Xbox controllers over Bluetooth (xpadneo)"
     [vram]="VRAM booster: the game in front keeps its VRAM, background apps make room"
     [cec]="HDMI-CEC: use Steam with the TV remote, TV on/off with the PC (experimental)"
     [machine]="Steam Machine support: LED bar driver, hardware settings in Steam"
@@ -51,9 +55,16 @@ declare -A CURRENT WANTED
 
 component_available() {
     case "$1" in
+        # gamescope's own session is broken on NVIDIA: the conversion is replaced by "Gaming on NVIDIA" there (shown
+        # anyway when it's already on, so it can be turned off).
+        gaming|boot|glyphs) ! nvidia_present || gaming_status ;;
+        nvidia) nvidia_available ;;
+        bigpicture) bigpicture_available ;;
         machine|poweroff) machine_available ;;
         vram) vram_available ;;
-        steamgame) steamgame_available ;;
+        # Steamify in the Steam library is for gaming mode's controller: not needed for Big Picture on the desktop (NVIDIA PCs;
+        # shown anyway when it's already on, so it can be turned off).
+        steamgame) steamgame_available && { ! nvidia_present || steamgame_status; } ;;
         kpin) kpin_available ;;
         hdmi) hdmi_available ;;
         bios) bios_available ;;
@@ -113,7 +124,7 @@ menu_label() {
     # last run.
     local l="${LABEL[$1]}" b=""
     if feature_outdated "$1"; then b="${c_yellow}(update)${c_reset}"
-    elif feature_new "$1"; then b="${c_green}(new)${c_reset}"; fi
+    elif feature_new "$1" || feature_new_optin "$1"; then b="${c_green}(new)${c_reset}"; fi
     if [[ -n "$b" ]]; then
         if [[ "$l" == *:* ]]; then l="${l%%:*} $b:${l#*:}"
         else l+=" $b"; fi
@@ -121,16 +132,30 @@ menu_label() {
     printf '%s' "$l"
 }
 
-feature_new() {
-    # A default option added after its parent was set up (e.g. the power-off
-    # fix under Steam Machine support; a top-level one counts the SteamOS
-    # conversion as its parent): never turned on or off.
-    local p="${PARENT[$1]:-gaming}"
-    [[ "$1" != gaming && "${CURRENT[$p]:-0}" == 1 && "${CURRENT[$1]:-0}" == 0 ]] &&
-        ! is_action "$1" && component_selectable "$1" && [[ " ${NO_PRESELECT[*]} " != *" $1 "* ]] &&
+feature_added() {
+    # An option added after its parent was set up (e.g. the power-off fix under
+    # Steam Machine support; a top-level one counts the SteamOS conversion, or
+    # "Gaming on NVIDIA" where that replaces it, as its parent), not on yet,
+    # with no record: shown as "new".
+    local p="${PARENT[$1]:-}" parent_on=0
+    if [[ -n "$p" ]]; then parent_on="${CURRENT[$p]:-0}"
+    elif [[ "${CURRENT[gaming]:-0}" == 1 || "${CURRENT[nvidia]:-0}" == 1 ]]; then parent_on=1; fi
+    [[ "$1" != gaming && "$parent_on" == 1 && "${CURRENT[$1]:-0}" == 0 ]] &&
+        ! is_action "$1" && component_selectable "$1" &&
         [[ -z "$(state_get features "$1")" ]]
 }
 
+feature_new() {
+    # A new default option: ticked for you (never turned on or off by itself).
+    feature_added "$1" && [[ " ${NO_PRESELECT[*]} " != *" $1 "* ]]
+}
+
+feature_new_optin() {
+    # A new opt-in option (unticked by default): the "new" badge only, it stays
+    # unticked. Boot into is a choice row of the conversion, not an item.
+    feature_added "$1" && [[ "$1" != boot && " ${NO_PRESELECT[*]} " == *" $1 "* ]]
+}
+
 component_selectable() {
     # Greyed out and not tickable when it has nothing to do.
     case "$1" in
@@ -141,6 +166,7 @@ component_selectable() {
 
 detect_components() {
     local c any=false
+    for c in "${COMPONENTS[@]}"; do CURRENT[$c]=0; WANTED[$c]=0; done
     for c in "${COMPONENTS[@]}"; do
         component_available "$c" || continue
         if "${c}_status"; then CURRENT[$c]=1; any=true; else CURRENT[$c]=0; fi
@@ -222,7 +248,7 @@ defaults_options() {
                 warn "Leaving out ${LABEL[$c]%%:*}: not available on this PC."
             fi
         done
-        [[ "${WANTED[single]}" == 1 ]] && WANTED[gaming]=1
+        [[ "${WANTED[single]}" == 1 ]] && component_available gaming && WANTED[gaming]=1
         for c in "${COMPONENTS[@]}"; do
             [[ "${WANTED[$c]}" == 1 && -n "${PARENT[$c]:-}" ]] && WANTED[${PARENT[$c]}]=1
         done
@@ -266,10 +292,14 @@ toggle_component() {
     component_selectable "$c" || return 1
     WANTED[$c]=$(( 1 - WANTED[$c] ))
     # Single user mode only makes sense on top of the SteamOS conversion.
-    if [[ "$c" == single && "${WANTED[single]}" == 1 ]]; then WANTED[gaming]=1; fi
+    # (On NVIDIA the conversion isn't offered: single user mode logs in by itself, see lib/single-user.sh.)
+    if [[ "$c" == single && "${WANTED[single]}" == 1 ]] && component_available gaming; then WANTED[gaming]=1; fi
     if [[ "$c" == gaming && "${WANTED[gaming]}" == 0 ]]; then WANTED[single]=0; WANTED[boot]=0; fi
     # Where to boot to is part of the conversion, too.
     if [[ "$c" == boot && "${WANTED[boot]}" == 1 ]]; then WANTED[gaming]=1; fi
+    # Big Picture is opt-out: ticked along with "Gaming on NVIDIA".
+    if [[ "$c" == nvidia ]]; then WANTED[bigpicture]=${WANTED[nvidia]}; fi
+    if [[ "$c" == bigpicture && "${WANTED[bigpicture]}" == 1 ]]; then WANTED[nvidia]=1; fi
     # The power-off fix is opt-out: ticked along with Steam Machine support.
     if [[ "$c" == machine ]]; then WANTED[poweroff]=${WANTED[machine]}; fi
     if [[ "$c" == poweroff && "${WANTED[poweroff]}" == 1 ]]; then WANTED[machine]=1; fi

lib/nvidia.sh

@@ -1,22 +1,104 @@
 #!/bin/bash
-# NVIDIA fix for gaming mode, part of the SteamOS conversion
-# (gaming_enable/gaming_disable). gamescope drives the display itself
-# through DRM/KMS; with NVIDIA that needs kernel modesetting and the
-# framebuffer driver (nvidia-drm.modeset=1 nvidia-drm.fbdev=1) and the
-# driver in the initramfs, or the screen shows a corrupted image.
-# Does nothing without a supported NVIDIA GPU (RTX 20 series or newer) that has
-# its driver installed.
+# Gaming on NVIDIA PCs: the SteamOS conversion (gamescope session) isn't offered there, because gamescope's DRM session shows a
+# corrupted picture on NVIDIA (NVIDIA's open bug 5240452: modes above 2560x1440@120). `nvidia` is the replacement: Steam on the
+# Plasma desktop, installed when missing and started at login; `bigpicture` (a sub-option) makes it start in Big Picture.
+# On a supported card (RTX 20 series or newer, `nvidia_supported`) it also sets up what NVIDIA's Wayland/DRM stack wants:
+# nvidia-drm.modeset=1 and fbdev=1 on the kernel command line and the NVIDIA modules in the initramfs. That didn't cure
+# gamescope's picture (the driver already reported both `Y`), but it is the standard setup and may be needed.
 # Sourced by steamify.sh; not meant to be run on its own.
 
+NVIDIA_UNIT=steamify-steam-autostart.service
 NVIDIA_PARAMS="nvidia-drm.modeset=1 nvidia-drm.fbdev=1"
-NVIDIA_INITRAMFS_CONF=/etc/mkinitcpio.conf.d/90-steamify-nvidia.conf
+NVIDIA_INITRAMFS_CONF=${NVIDIA_INITRAMFS_CONF:-/etc/mkinitcpio.conf.d/90-steamify-nvidia.conf}
 # The script and pacman hook that keep the initramfs file right at every kernel change.
 NVIDIA_SCRIPT=${NVIDIA_SCRIPT:-/usr/local/libexec/steamify-nvidia-initramfs}
 NVIDIA_HOOK=${NVIDIA_HOOK:-/etc/pacman.d/hooks/85-steamify-nvidia-initramfs.hook}
+# The running kernel's command line; the tests point this at a file.
+NVIDIA_CMDLINE=${NVIDIA_CMDLINE:-/proc/cmdline}
 # The DRM devices in sysfs; the tests point this at a fake tree.
 NVIDIA_DRM_DIR=${NVIDIA_DRM_DIR:-/sys/class/drm}
 
+nvidia_unit_file() { echo "$HOME/.config/systemd/user/$NVIDIA_UNIT"; }
+
 nvidia_present() {
+    # An NVIDIA GPU (PCI vendor 0x10de, display class) whose driver provides
+    # nvidia_drm. nouveau has none, and gamescope is not a problem there.
+    local d
+    for d in "$NVIDIA_DRM_DIR"/card[0-9]*/device; do
+        [[ "$(cat "$d/vendor" 2>/dev/null)" == 0x10de ]] || continue
+        [[ "$(cat "$d/class" 2>/dev/null)" == 0x03* ]] || continue
+        modinfo nvidia_drm >/dev/null 2>&1 && return 0
+    done
+    return 1
+}
+
+# Shown on NVIDIA PCs, unless the SteamOS conversion is already on there (it
+# has to be turned off first: both would start Steam at login).
+nvidia_available() { nvidia_present && ! gaming_status 2>/dev/null; }
+bigpicture_available() { nvidia_available; }
+
+nvidia_status() {
+    pacman -Q steam >/dev/null 2>&1 && [[ -f "$(nvidia_unit_file)" ]] &&
+        user_systemctl is-enabled -q "$NVIDIA_UNIT" 2>/dev/null
+}
+
+nvidia_write_unit() {
+    # nvidia_write_unit [args]: the autostart unit, Steam started with those arguments.
+    local unit; unit="$(nvidia_unit_file)"
+    mkdir -p "$(dirname "$unit")"
+    service_file steamify-steam-autostart.service ARGS="$1" > "$unit" || { err "Writing $unit failed."; return 1; }
+    user_systemctl daemon-reload
+}
+
+nvidia_enable() {
+    info "Gaming on NVIDIA: Steam on the desktop, started at login..."
+    if ! pacman -Q steam >/dev/null 2>&1; then
+        sudo pacman -S --needed --noconfirm steam || { err "Installing Steam failed."; return 1; }
+        state_set nvidia installed_pkgs steam
+    fi
+    # Keeps what the Big Picture option set up; a first run starts Steam normally.
+    local unit_args=""; bigpicture_status && unit_args=-gamepadui
+    nvidia_write_unit "$unit_args" || return 1
+    user_systemctl enable "$NVIDIA_UNIT" >/dev/null 2>&1 || { err "Enabling $NVIDIA_UNIT failed."; return 1; }
+    nvidia_kernel_enable || return 1
+    ok "Steam starts at your next login."
+}
+
+nvidia_disable() {
+    local pkgs unit; unit="$(nvidia_unit_file)"
+    user_systemctl disable --now "$NVIDIA_UNIT" >/dev/null 2>&1
+    rm -f "$unit"
+    user_systemctl daemon-reload
+    pkgs="$(state_get nvidia installed_pkgs)"
+    # Only what Steamify installed; games and the Steam folder stay.
+    # shellcheck disable=SC2086 # a list of package names
+    [[ -n "$pkgs" ]] && sudo pacman -Rns --noconfirm $pkgs >/dev/null 2>&1
+    state_clear nvidia
+    krevert bigpicture
+    nvidia_kernel_disable
+    ok "Steam no longer starts at login."
+}
+
+bigpicture_status() { grep -qs -- '-gamepadui' "$(nvidia_unit_file)"; }
+
+bigpicture_enable() {
+    # The unit comes from nvidia_enable (it runs first); without it there is nothing to change.
+    [[ -f "$(nvidia_unit_file)" ]] || return 0
+    nvidia_write_unit -gamepadui || return 1
+    # Windows of the last session (Discord, a browser) would be restored on top of Big Picture.
+    kset bigpicture ksmserverrc General loginMode emptySession
+    ok "Steam starts in Big Picture at your next login, on an empty desktop."
+}
+
+bigpicture_disable() {
+    krevert bigpicture
+    [[ -f "$(nvidia_unit_file)" ]] || return 0
+    nvidia_write_unit "" && ok "Steam starts in its normal window at your next login."
+}
+
+# --- Kernel parameters and early modules (a supported card only)
+
+nvidia_supported() {
     # A supported NVIDIA GPU: PCI vendor 0x10de, display class, its kernel
     # driver installed, and not older than the RTX 20 series, decided like the
     # VRAM booster does (vram_nvidia_legacy_id: chwd's legacy card lists, every
@@ -50,9 +132,11 @@ nvidia_boot_file() {
 nvidia_param_set() {
     # 0 when $1 (e.g. nvidia-drm.modeset=1) is on the kernel command line or
     # already in the boot loader's file (not booted yet).
-    local f; f="$(nvidia_boot_file)"
-    grep -qw -- "$1" /proc/cmdline 2>/dev/null ||
-        { [[ -n "$f" ]] && grep -qw -- "$1" "$f" 2>/dev/null; }
+    # The kernel treats "nvidia_drm" and "nvidia-drm" alike: CachyOS' own
+    # setup may already have written the underscore spelling.
+    local f re; f="$(nvidia_boot_file)"; re="${1//nvidia-drm/nvidia[-_]drm}"
+    grep -qwE -- "$re" "$NVIDIA_CMDLINE" 2>/dev/null ||
+        { [[ -n "$f" ]] && grep -qwE -- "$re" "$f" 2>/dev/null; }
 }
 
 nvidia_params_missing() {
@@ -105,8 +189,8 @@ nvidia_boot_has_params() {
     sudo grep -rqs 'nvidia-drm.modeset=1' "$target"
 }
 
-nvidia_enable() {
-    nvidia_present || return 0
+nvidia_kernel_enable() {
+    nvidia_supported || return 0
     local f changed=0 p; f="$(nvidia_boot_file)"
     if nvidia_params_missing; then
         if [[ -z "$f" ]]; then
@@ -116,7 +200,7 @@ nvidia_enable() {
             backup_file "$f"
             case "$f" in
                 */limine)
-                    sudo sed -i -E "s/^(KERNEL_CMDLINE\[default\]=\"[^\"]*)\"/\1 $NVIDIA_PARAMS\"/" "$f" ;;
+                    sudo sed -i -E "s/^(KERNEL_CMDLINE\[default\]\+?=\"[^\"]*)\"/\1 $NVIDIA_PARAMS\"/" "$f" ;;
                 */sdboot-manage.conf)
                     sudo sed -i -E "s/^(LINUX_OPTIONS=\"[^\"]*)\"/\1 $NVIDIA_PARAMS\"/" "$f" ;;
                 */grub)
@@ -152,7 +236,7 @@ nvidia_enable() {
     return 0
 }
 
-nvidia_disable() {
+nvidia_kernel_disable() {
     local f changed=0; f="$(nvidia_boot_file)"
     if [[ -n "$f" ]] && grep -q "$NVIDIA_PARAMS" "$f" 2>/dev/null; then
         sudo sed -i "s/ \?$NVIDIA_PARAMS//" "$f"

lib/single-user.sh

@@ -119,7 +119,36 @@ single_launcher_drop() {
     return 0
 }
 
+# Without the SteamOS conversion (NVIDIA PCs: gamescope's session is broken there) nothing logs in by itself, so single user
+# mode does it: SDDM, autologin into the Plasma session. Named to sort after steam-set-session's zz-steamos-autologin.conf,
+# which may still say gamescope from an earlier conversion.
+SINGLE_AUTOLOGIN=${SINGLE_AUTOLOGIN:-/etc/sddm.conf.d/zzz-steamify-autologin.conf}
+
+single_login_needed() { nvidia_present && ! gaming_status; }
+
+single_login_enable() {
+    single_login_needed || return 0
+    switch_to_sddm || return 1
+    info "Logging in to the desktop by itself (SDDM autologin for $TARGET_USER)..."
+    sudo mkdir -p "$(dirname "$SINGLE_AUTOLOGIN")"
+    sudo tee "$SINGLE_AUTOLOGIN" > /dev/null << EOF
+[Autologin]
+User=$TARGET_USER
+Session=plasma.desktop
+Relogin=true
+EOF
+    remove_sddm_base_autologin
+}
+
+single_login_disable() {
+    [[ -f "$SINGLE_AUTOLOGIN" ]] || return 0
+    sudo rm -f "$SINGLE_AUTOLOGIN"
+    # The way back is CachyOS's own login manager, unless the conversion is on (it keeps SDDM).
+    gaming_status || switch_to_plasmalogin
+}
+
 single_enable() {
+    single_login_enable || return 1
     info "Turning off the lock screen, user switching and logging out..."
     stop_plasmashell_for_edit
 
@@ -145,6 +174,7 @@ single_enable() {
 }
 
 single_disable() {
+    single_login_disable
     info "Restoring the lock screen, user switching and logging out..."
     stop_plasmashell_for_edit
     if has_journal single; then

services/README.md

@@ -11,6 +11,7 @@ in the shell code.
 |---|---|---|
 | `steamify-boot-desktop.service` | `lib/boot-session.sh` (Boot into: desktop) | Sets the Plasma session before the login manager starts |
 | `sync-steamos-session.path`, `.service` | `lib/login-manager.sh` (SteamOS conversion, plasma-login-manager) | The sync bridge: copies Steam's session choice into `plasmalogin.conf` |
+| `steamify-steam-autostart.service` | `lib/nvidia.sh` (Gaming on NVIDIA) | Steam at login on the Plasma desktop, normal or in Big Picture (user unit) |
 | `steam-desktop-autostart.service` | `lib/steam-desktop.sh` (SteamOS conversion) | Steam in the background on the Plasma desktop (user unit) |
 | `ensure-kernel-headers.service` | `lib/steam-machine.sh` (Steam Machine support) | Installs missing kernel headers at boot, so DKMS builds for every kernel |
 | `steamify-update-check.service`, `.timer` | `lib/update-notifier.sh` (Update notifications) | The daily and login check for a new release (user units) |

services/steamify-steam-autostart.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Steam at login (Steamify, NVIDIA PCs)
+After=graphical-session.target
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+# Only in the Plasma desktop session.
+ExecCondition=/bin/sh -c '[ "$XDG_CURRENT_DESKTOP" = KDE ]'
+ExecStart=/usr/bin/steam @ARGS@
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=graphical-session.target

steamify.sh

@@ -15,11 +15,11 @@
 set -uo pipefail
 
 # Release version, see CHANGELOG.md.
-VERSION=2.9.7
+VERSION=2.10.0
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-for lib in common state packages login-manager single-user steam-desktop steam-machine fremont-poweroff vram-booster hdmi-refresh nvidia cec boot-session vapor-theme steamos-extras bios desktop-shortcut wizard-shortcut steam-game update-notifier first-login menu backend; do
+for lib in common state packages login-manager single-user steam-desktop steam-machine fremont-poweroff vram-booster hdmi-refresh nvidia controllers cec boot-session vapor-theme steamos-extras bios desktop-shortcut wizard-shortcut steam-game update-notifier first-login menu backend; do
     # shellcheck source=/dev/null
     source "$SCRIPT_DIR/lib/$lib.sh"
 done

tests/controllers-test.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+# Tests lib/controllers.sh (extended controller support: xone, the Xbox wireless dongle, and xpadneo, Xbox Bluetooth) with a stub pacman
+# and a temp home. No root, VM or hardware needed: bash tests/controllers-test.sh
+cd "$(dirname "$0")/.." || exit 1
+T="$(mktemp -d)"; trap 'rm -rf "$T"' EXIT
+fail=0
+check() { if eval "$2"; then echo "ok   $1"; else echo "FAIL $1"; fail=1; fi; }
+
+SCRIPT_DIR="$PWD"; HOME="$T/home"; mkdir -p "$HOME"
+source lib/common.sh; source lib/state.sh; source lib/controllers.sh; source lib/menu.sh
+# Runs as the user, and refuses anything under the real system folders: a test must never touch them.
+sudo() { local a; for a in "$@"; do case "$a" in /etc/*|/usr/*|/boot/*|/var/*) echo "REFUSED sudo $*" >&2; return 1 ;; esac; done; "$@"; }
+info() { :; }; ok() { :; }; warn() { :; }; err() { echo "ERR $*"; }
+kwriteconfig6() { local f="" k="" v=""; while [[ $# -gt 0 ]]; do case "$1" in --file) f="$2"; shift ;; --key) k="$2"; shift ;; --group) shift ;; *) v="$1" ;; esac; shift; done; mkdir -p "$(dirname "$f")"; sed -i "/^$k=/d" "$f" 2>/dev/null; printf '%s=%s\n' "$k" "$v" >> "$f"; }
+kreadconfig6() { local f="" k=""; while [[ $# -gt 0 ]]; do case "$1" in --file) f="$2"; shift ;; --key) k="$2"; shift ;; --group|--default) shift ;; esac; shift; done; sed -n "s/^$k=//p" "$f" 2>/dev/null; }
+# A pretend package database.
+PKGS=""; PACMAN_LOG="$T/pacman.log"; : > "$PACMAN_LOG"; PACMAN_FAIL=0
+pacman() {
+    case "$1" in
+        -Q) local p; for p in "${@:2}"; do [[ " $PKGS " == *" $p "* ]] || return 1; done ;;
+        -S) [[ $PACMAN_FAIL == 1 ]] && return 1; echo "S ${*:4}" >> "$PACMAN_LOG"; PKGS+=" ${*:4}" ;;
+        -Rns) echo "R ${*:3}" >> "$PACMAN_LOG"; local p; for p in ${*:3}; do PKGS=" ${PKGS// $p / } "; done ;;
+    esac
+}
+HEADERS=0; install_kernel_headers() { HEADERS=$((HEADERS + 1)); }
+
+check "off to begin with" '! extended_controller_support_status'
+extended_controller_support_enable
+check "installs the repo's xpadneo-dkms, xone-dkms and the dongle firmware" 'pacman -Q xpadneo-dkms xone-dkms xone-dongle-firmware'
+check "kernel headers are made sure of first" '[[ $HEADERS == 1 ]]'
+check "what we installed is recorded" '[[ "$(state_get extended_controller_support installed_pkgs)" == "xpadneo-dkms xone-dkms xone-dongle-firmware" ]]'
+check "it is on" extended_controller_support_status
+n="$(wc -l < "$PACMAN_LOG")"; extended_controller_support_enable
+check "a second run installs nothing again" '[[ "$(wc -l < "$PACMAN_LOG")" == "$n" ]]'
+extended_controller_support_disable
+check "off: the three packages are removed again" '! pacman -Q xpadneo-dkms 2>/dev/null && ! pacman -Q xone-dkms 2>/dev/null && ! pacman -Q xone-dongle-firmware 2>/dev/null && [[ -z "$(state_get extended_controller_support installed_pkgs)" ]]'
+
+# The AUR's xone-dkms-git conflicts with the repo's xone-dkms: it counts, and is kept.
+PKGS=" xone-dkms-git xone-dongle-firmware xpadneo-dkms"; : > "$PACMAN_LOG"
+check "xone-dkms-git counts as xone: already on" extended_controller_support_status
+extended_controller_support_enable; extended_controller_support_disable
+check "with xone-dkms-git: nothing installed and nothing removed" '[[ ! -s "$PACMAN_LOG" ]] && pacman -Q xone-dkms-git xpadneo-dkms xone-dongle-firmware'
+PKGS=" xone-dkms-git"
+extended_controller_support_enable
+check "xone-dkms-git present: only the missing ones are installed, never xone-dkms" 'grep -q "^S xpadneo-dkms xone-dongle-firmware$" "$PACMAN_LOG" && ! pacman -Q xone-dkms 2>/dev/null'
+extended_controller_support_disable
+check "and off removes only those two, xone-dkms-git stays" 'pacman -Q xone-dkms-git && ! pacman -Q xpadneo-dkms 2>/dev/null'
+
+# A failed install is an error and records nothing.
+PKGS=""; PACMAN_FAIL=1
+check "a failed pacman is an error" '! extended_controller_support_enable >/dev/null'
+check "...and records nothing" '[[ -z "$(state_get extended_controller_support installed_pkgs)" ]]'
+PACMAN_FAIL=0
+
+# Packages that were already there are never removed by turning it off.
+PKGS=" xpadneo-dkms xone-dkms xone-dongle-firmware"; : > "$PACMAN_LOG"
+extended_controller_support_enable; extended_controller_support_disable
+check "packages you had before stay" 'pacman -Q xpadneo-dkms xone-dkms xone-dongle-firmware && [[ ! -s "$PACMAN_LOG" ]]'
+
+# The menu.
+check "offered on every PC" 'component_available extended_controller_support'
+check "not preselected: it builds kernel modules for every kernel" '[[ " ${NO_PRESELECT[*]} " == *" extended_controller_support "* ]]'
+check "a top-level item with a label" '[[ -z "${PARENT[extended_controller_support]:-}" && -n "${LABEL[extended_controller_support]}" ]]'
+
+# The "new" badge: an opt-in option added after setup shows it, but is never ticked for you.
+component_selectable() { return 0; }
+declare -A CURRENT=([gaming]=1 [nvidia]=0 [extended_controller_support]=0 [vram]=0 [boot]=0)
+rm -f "$STATE_DIR/features.state"
+check "new opt-in option (conversion on, no record): the new badge" 'feature_new_optin extended_controller_support'
+check "...but it is not ticked for you (not a new default option)" '! feature_new extended_controller_support'
+check "...and the menu label says (new)" '[[ "$(menu_label extended_controller_support)" == *"(new)"* ]]'
+check "a new default option is still ticked for you, and is not the opt-in kind" 'feature_new vram && ! feature_new_optin vram'
+check "Boot into never gets the badge (it is a choice row)" '! feature_new_optin boot'
+state_set_features() { kwriteconfig6 --file "$STATE_DIR/features.state" --group State --key "$1" "$2"; }
+state_set_features extended_controller_support off
+check "once a run recorded it as off, the badge is gone" '! feature_new_optin extended_controller_support'
+rm -f "$STATE_DIR/features.state"
+CURRENT[gaming]=0; CURRENT[nvidia]=1
+check "on an NVIDIA PC (Gaming on NVIDIA on, no conversion) it shows too" 'feature_new_optin extended_controller_support'
+CURRENT[nvidia]=0
+check "with neither the conversion nor Gaming on NVIDIA on (a fresh PC) nothing is new" '! feature_new_optin extended_controller_support && ! feature_new vram'
+CURRENT[gaming]=1; CURRENT[extended_controller_support]=1
+check "already on: not new" '! feature_new_optin extended_controller_support'
+exit $fail

tests/nvidia-hardware-test.sh

@@ -6,6 +6,8 @@
 #   bash tests/nvidia-hardware-test.sh visual   after trying gaming mode: was the picture clean? (asks you)
 # Every run appends to ~/steamify-nvidia-report.txt: paste that file when asking for help.
 cd "$(dirname "$0")/.." || exit 1
+# patch_file (lib/common.sh) reads the hook script from $SCRIPT_DIR/patches.
+SCRIPT_DIR="$PWD"
 REPORT="${NVIDIA_REPORT:-$HOME/steamify-nvidia-report.txt}"
 source lib/common.sh; source lib/hdmi-refresh.sh; source lib/vram-booster.sh; source lib/nvidia.sh
 mode="${1:-check}"

tests/nvidia-test.sh

@@ -1,59 +1,148 @@
 #!/bin/bash
-# Tests lib/nvidia.sh against a fake RTX 5080 (PCI 10de:2c02) beside an
-# Intel iGPU, a stub modinfo, and temp copies of the boot loader files. No
-# root, VM or NVIDIA hardware needed: bash tests/nvidia-test.sh
+# Tests lib/nvidia.sh ("Gaming on NVIDIA" and its Big Picture option) and the menu rules around it, against a fake RTX 5080
+# (PCI 10de:2c02) beside an Intel iGPU, a stub modinfo, pacman and systemctl, and a temp home. No root, VM or NVIDIA
+# hardware needed: bash tests/nvidia-test.sh
 cd "$(dirname "$0")/.." || exit 1
 T="$(mktemp -d)"; trap 'rm -rf "$T"' EXIT
 fail=0
 check() { if eval "$2"; then echo "ok   $1"; else echo "FAIL $1"; fail=1; fi; }
 
-SCRIPT_DIR="$PWD"; source lib/common.sh; source lib/hdmi-refresh.sh; source lib/vram-booster.sh; source lib/nvidia.sh
-sudo() { "$@"; }
+SCRIPT_DIR="$PWD"; HOME="$T/home"; mkdir -p "$HOME"
+source lib/common.sh; source lib/state.sh; source lib/login-manager.sh; source lib/single-user.sh; source lib/hdmi-refresh.sh; source lib/vram-booster.sh; source lib/nvidia.sh; source lib/menu.sh
+# Runs as the user, and refuses anything under the real system folders: a test must never touch them.
+sudo() { local a; for a in "$@"; do case "$a" in /etc/*|/usr/*|/boot/*|/var/*) echo "REFUSED sudo $*" >&2; return 1 ;; esac; done; "$@"; }
 info() { :; }; ok() { :; }; warn() { :; }; err() { echo "ERR $*"; }
-backup_file() { [[ -f "$1.bak" ]] || cp "$1" "$1.bak"; }
-modinfo() { [[ "$FAKE_DRIVER" == 1 ]]; }
-REBUILDS=0; nvidia_rebuild_boot() { REBUILDS=$((REBUILDS + 1)); }
-NVIDIA_INITRAMFS_CONF="$T/90-steamify-nvidia.conf"
+# KDE's config tools on plain files under the temp home (a relative file name is relative to ~/.config, as in KDE).
+kwriteconfig6() {
+    local f="" k="" v="" del=0
+    while [[ $# -gt 0 ]]; do case "$1" in --file) f="$2"; shift ;; --key) k="$2"; shift ;; --group) shift ;; --delete) del=1 ;; *) v="$1" ;; esac; shift; done
+    [[ "$f" == /* ]] || f="$HOME/.config/$f"; mkdir -p "$(dirname "$f")"
+    if [[ $del == 1 ]]; then sed -i "/^$k=/d" "$f" 2>/dev/null; else sed -i "/^$k=/d" "$f" 2>/dev/null; printf '%s=%s\n' "$k" "$v" >> "$f"; fi
+}
+kreadconfig6() {
+    local f="" k="" d="" r
+    while [[ $# -gt 0 ]]; do case "$1" in --file) f="$2"; shift ;; --key) k="$2"; shift ;; --default) d="$2"; shift ;; --group) shift ;; esac; shift; done
+    [[ "$f" == /* ]] || f="$HOME/.config/$f"
+    r="$(sed -n "s/^$k=//p" "$f" 2>/dev/null)"; printf '%s\n' "${r:-$d}"
+}
+# A pretend package database and systemd: what the tests assert on.
+PKGS=""; PACMAN_LOG="$T/pacman.log"; : > "$PACMAN_LOG"; ENABLED=0
+pacman() {
+    case "$1" in
+        -Q) [[ " $PKGS " == *" $2 "* ]] ;;
+        -S) echo "S $*" >> "$PACMAN_LOG"; PKGS+=" ${*: -1}" ;;
+        -Rns) echo "R $*" >> "$PACMAN_LOG"; PKGS=" ${PKGS//${*: -1}/} " ;;
+    esac
+}
+user_systemctl() {
+    case "$1" in
+        enable) ENABLED=1 ;;
+        disable) ENABLED=0 ;;
+        is-enabled) [[ $ENABLED == 1 ]] ;;
+    esac
+    return 0
+}
+FAKE_DRIVER=1; modinfo() { [[ "$FAKE_DRIVER" == 1 ]]; }
+GAMING_ON=0; gaming_status() { [[ "$GAMING_ON" == 1 ]]; }
+UNIT="$HOME/.config/systemd/user/$NVIDIA_UNIT"
+
 mkdir -p "$T/drm/card0/device" "$T/drm/card1/device"
 echo 0x8086 > "$T/drm/card0/device/vendor"; echo 0x030000 > "$T/drm/card0/device/class"
 echo 0x10de > "$T/drm/card1/device/vendor"; echo 0x030000 > "$T/drm/card1/device/class"
 echo 0x2c02 > "$T/drm/card1/device/device"
 NVIDIA_DRM_DIR="$T/drm"
-mkdir -p "$T/mods/6.1.0-cachyos/kernel"; : > "$T/mods/6.1.0-cachyos/kernel/nvidia-drm.ko.zst"; : > "$T/mods/6.1.0-cachyos/pkgbase"
+backup_file() { [[ -f "$1.bak" ]] || cp "$1" "$1.bak"; }
+REBUILDS=0; nvidia_rebuild_boot() { REBUILDS=$((REBUILDS + 1)); }
+: > "$T/cmdline"; NVIDIA_CMDLINE="$T/cmdline"   # the running kernel's command line: without the parameters
+NVIDIA_INITRAMFS_CONF="$T/90-steamify-nvidia.conf"
 NVIDIA_SCRIPT="$T/libexec/steamify-nvidia-initramfs"; NVIDIA_HOOK="$T/hooks/85-steamify-nvidia-initramfs.hook"
+mkdir -p "$T/mods/6.1.0-cachyos/kernel"; : > "$T/mods/6.1.0-cachyos/kernel/nvidia-drm.ko.zst"; : > "$T/mods/6.1.0-cachyos/pkgbase"
 NVIDIA_MODULES_DIR="$T/mods"
 NVIDIA_LIMINE_CONF="$T/none/limine.conf"; NVIDIA_SDBOOT_DIR="$T/none/entries"; NVIDIA_GRUB_CFG="$T/none/grub.cfg"   # not generated here: not checked
-
 mkdir -p "$T/chwd"; VRAM_CHWD_IDS="$T/chwd"
-FAKE_DRIVER=1; check "finds the NVIDIA card as card1 beside an iGPU (no legacy lists)" nvidia_present
-printf '1c03\n1b80\n' > "$T/chwd/nvidia-580.ids"   # a GTX 1060 and a GTX 1080: chwd's 580xx legacy list
-check "RTX 5080 (2c02) is not on a legacy list: supported" nvidia_present
-echo 0x1c03 > "$T/drm/card1/device/device"
-check "GTX 1060 (on chwd's legacy list, older than RTX 20): not supported" '! nvidia_present'
-check "...and reported as a legacy GPU" nvidia_legacy_gpu
-echo 0x2c02 > "$T/drm/card1/device/device"; check "RTX 5080 is not a legacy GPU" '! nvidia_legacy_gpu'
-printf '2c02\n' > "$T/chwd/nvidia-580.ids"; check "a card id that is on a legacy list is skipped, whatever it is" '! nvidia_present'
-printf '1c03\n' > "$T/chwd/nvidia-580.ids"
-FAKE_DRIVER=0; check "skips when the driver isn't installed" '! nvidia_present'
-FAKE_DRIVER=1; NVIDIA_DRM_DIR="$T/none"; check "skips without an NVIDIA GPU" '! nvidia_present'
+# The component's kernel step edits this boot loader file (systemd-boot's) in the tests, never a real one.
+printf 'LINUX_OPTIONS="quiet"\n' > "$T/sdboot-manage.conf"; nvidia_boot_file() { echo "$T/sdboot-manage.conf"; }
+
+# --- detection
+check "finds the NVIDIA card as card1 beside an iGPU" nvidia_present
+FAKE_DRIVER=0; check "no nvidia_drm module (nouveau): not an NVIDIA PC" '! nvidia_present'
+FAKE_DRIVER=1; NVIDIA_DRM_DIR="$T/none"; check "no NVIDIA GPU: not an NVIDIA PC" '! nvidia_present'
 NVIDIA_DRM_DIR="$T/drm"
 
-for loader in limine sdboot grub; do
+# --- which items the menu shows
+check "NVIDIA PC: the SteamOS conversion and its gamescope options are hidden" '! component_available gaming && ! component_available boot && ! component_available glyphs'
+check "NVIDIA PC: Gaming on NVIDIA and Big Picture are shown" 'component_available nvidia && component_available bigpicture'
+GAMING_ON=1
+check "NVIDIA PC with the conversion already on: it is shown, so it can be turned off" 'component_available gaming && component_available boot'
+check "...and Gaming on NVIDIA is hidden (both would start Steam)" '! component_available nvidia && ! component_available bigpicture'
+GAMING_ON=0; NVIDIA_DRM_DIR="$T/none"
+check "no NVIDIA: the conversion is shown as before" 'component_available gaming && component_available boot'
+check "...and Gaming on NVIDIA is hidden" '! component_available nvidia && ! component_available bigpicture'
+NVIDIA_DRM_DIR="$T/drm"
+
+# --- "Add as non-Steam game" is for gaming mode's controller: not offered on an NVIDIA PC (unless already on)
+steamgame_available() { return 0; }; STEAMGAME_ON=0; steamgame_status() { [[ "$STEAMGAME_ON" == 1 ]]; }
+check "NVIDIA PC: Add as non-Steam game is hidden" '! component_available steamgame'
+STEAMGAME_ON=1; check "...unless it is already on (so it can be turned off)" 'component_available steamgame'; STEAMGAME_ON=0
+NVIDIA_DRM_DIR="$T/none"; check "no NVIDIA: it is offered as before" 'component_available steamgame'
+steamgame_available() { return 1; }; check "no NVIDIA, no Steam account yet: still not offered" '! component_available steamgame'
+steamgame_available() { return 0; }; NVIDIA_DRM_DIR="$T/drm"
+
+# --- turning it on
+check "off to begin with" '! nvidia_status && ! bigpicture_status'
+nvidia_enable
+check "Steam is installed when missing, and recorded as ours" 'grep -q "^S " "$PACMAN_LOG" && [[ "$(state_get nvidia installed_pkgs)" == steam ]]'
+check "the autostart unit is written: Steam without arguments" 'grep -q "^ExecStart=/usr/bin/steam $" "$UNIT"'
+check "it is on" 'nvidia_status && ! bigpicture_status'
+n="$(wc -l < "$PACMAN_LOG")"; nvidia_enable
+check "a second run installs nothing again" '[[ "$(wc -l < "$PACMAN_LOG")" == "$n" ]]'
+
+# --- Big Picture
+bigpicture_enable
+check "Big Picture: Steam starts with -gamepadui" 'grep -q "^ExecStart=/usr/bin/steam -gamepadui$" "$UNIT" && bigpicture_status'
+nvidia_enable
+check "turning Gaming on NVIDIA on again keeps Big Picture" 'bigpicture_status'
+check "Big Picture: Plasma starts with an empty session" '[[ "$(kreadconfig6 --file ksmserverrc --group General --key loginMode)" == emptySession ]]'
+bigpicture_disable
+check "Big Picture off: Steam's normal window again" '! bigpicture_status && nvidia_status'
+check "...and the session setting is back as it was (not set)" '[[ -z "$(kreadconfig6 --file ksmserverrc --group General --key loginMode)" ]]'
+
+# --- turning it off
+bigpicture_enable; nvidia_disable
+check "off: the unit is gone and Steam, which we installed, is removed" '! nvidia_status && [[ ! -e "$UNIT" ]] && ! pacman -Q steam && [[ -z "$(state_get nvidia installed_pkgs)" ]]'
+check "Big Picture without the unit does nothing" 'bigpicture_enable && bigpicture_disable && [[ ! -e "$UNIT" ]]'
+
+# --- Steam that was there already is never removed
+PKGS=" steam"; : > "$PACMAN_LOG"
+nvidia_enable; nvidia_disable
+check "Steam installed before is kept, and not installed again" '[[ ! -s "$PACMAN_LOG" ]] && pacman -Q steam'
+
+# --- kernel parameters and early modules (a supported card only: RTX 20 series or newer)
+check "RTX 5080 (2c02) is supported: no chwd legacy lists" nvidia_supported
+printf '1c03\n1b80\n' > "$T/chwd/nvidia-580.ids"   # a GTX 1060 and a GTX 1080: chwd's 580xx legacy list
+check "RTX 5080 is not on a legacy list" 'nvidia_supported && ! nvidia_legacy_gpu'
+echo 0x1c03 > "$T/drm/card1/device/device"
+check "GTX 1060 (older than RTX 20): no kernel setup, but still an NVIDIA PC" '! nvidia_supported && nvidia_legacy_gpu && nvidia_present'
+echo 0x2c02 > "$T/drm/card1/device/device"
+
+for loader in limine limineplus sdboot grub; do
     case $loader in
         limine) F="$T/limine"; printf 'KERNEL_CMDLINE[default]="quiet splash"\n' > "$F" ;;
+        # CachyOS writes its line as "+=" and may already have nvidia_drm.modeset=1 in it.
+        limineplus) F="$T/limine"; printf 'KERNEL_CMDLINE[default]+="quiet splash nvidia_drm.modeset=1"\n' > "$F" ;;
         sdboot) F="$T/sdboot-manage.conf"; printf 'LINUX_OPTIONS="quiet splash"\n' > "$F" ;;
         grub)   F="$T/grub";   printf 'GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"\n' > "$F" ;;
     esac
     nvidia_boot_file() { echo "$F"; }
     rm -f "$NVIDIA_INITRAMFS_CONF"; REBUILDS=0; ORIG="$(cat "$F")"
-    nvidia_enable
+    nvidia_kernel_enable
     check "$loader: parameters added" 'grep -q "nvidia-drm.modeset=1" "$F" && grep -q "nvidia-drm.fbdev=1" "$F"'
     check "$loader: initramfs drop-in written" 'grep -q nvidia_drm "$NVIDIA_INITRAMFS_CONF"'
     check "$loader: script and pacman hook installed" '[[ -x "$NVIDIA_SCRIPT" ]] && grep -q "^Exec = $NVIDIA_SCRIPT sync" "$NVIDIA_HOOK"'
     check "$loader: backup made, rebuilt once" '[[ -f "$F.bak" && $REBUILDS == 1 ]]'
-    SUM="$(cat "$F")"; nvidia_enable
+    SUM="$(cat "$F")"; nvidia_kernel_enable
     check "$loader: second run changes nothing" '[[ "$(cat "$F")" == "$SUM" && $REBUILDS == 1 ]]'
-    nvidia_disable
+    nvidia_kernel_disable
     check "$loader: disable restores the file, drops the drop-in, script and hook" '[[ "$(cat "$F")" == "$ORIG" && ! -f "$NVIDIA_INITRAMFS_CONF" && ! -e "$NVIDIA_SCRIPT" && ! -e "$NVIDIA_HOOK" ]]'
 done
 
@@ -69,20 +158,49 @@ syncit; check "hook script: a new kernel without modules -> drop-in removed" '[[
 syncit; check "hook script: the modules arrive (DKMS built) -> drop-in back" '[[ -f "$NVIDIA_INITRAMFS_CONF" ]]'
 rm -rf "$T/mods/6.6.0-lts"; mkdir -p "$T/mods/5.0.0-leftover"; : > "$T/mods/5.0.0-leftover/modules.dep"
 syncit; check "hook script: a leftover folder of a removed kernel is ignored" '[[ -f "$NVIDIA_INITRAMFS_CONF" ]]'
-rm -rf "$T/mods/5.0.0-leftover"; nvidia_disable
+rm -rf "$T/mods/5.0.0-leftover"; nvidia_kernel_disable
 # A second kernel without the NVIDIA modules: no early-load drop-in, parameters still set.
 mkdir -p "$T/mods/6.6.0-lts/kernel"; : > "$T/mods/6.6.0-lts/pkgbase"; F="$T/sdboot-manage.conf"; printf 'LINUX_OPTIONS="quiet"\n' > "$F"
-nvidia_boot_file() { echo "$F"; }; rm -f "$NVIDIA_INITRAMFS_CONF"; REBUILDS=0; nvidia_enable
+nvidia_boot_file() { echo "$F"; }; rm -f "$NVIDIA_INITRAMFS_CONF"; REBUILDS=0; nvidia_kernel_enable
 check "kernel without nvidia modules: no drop-in, parameters set" '[[ ! -f "$NVIDIA_INITRAMFS_CONF" ]] && grep -q "nvidia-drm.fbdev=1" "$F"'
 rm -rf "$T/mods/6.6.0-lts"
 # Generated boot entries without the parameters (the initramfs build failed): an error.
 printf 'linux /vmlinuz root=/dev/sda1\n' > "$T/grub.cfg"; NVIDIA_GRUB_CFG="$T/grub.cfg"
 F="$T/grub"; printf 'GRUB_CMDLINE_LINUX_DEFAULT="quiet"\n' > "$F"; nvidia_boot_file() { echo "$F"; }; rm -f "$NVIDIA_INITRAMFS_CONF"
-check "boot entries without the parameters: error" '! nvidia_enable >/dev/null'
+check "boot entries without the parameters: error" '! nvidia_kernel_enable >/dev/null'
 NVIDIA_GRUB_CFG="$T/none/grub.cfg"
 # A config file without the setting to edit: an error, not "applied".
 F="$T/sdboot-manage.conf"; printf '#LINUX_OPTIONS=""\n' > "$F"; nvidia_boot_file() { echo "$F"; }; REBUILDS=0
-check "no setting to edit: error, nothing rebuilt" '! nvidia_enable >/dev/null && [[ $REBUILDS == 0 ]]'
-FAKE_DRIVER=0; printf 'LINUX_OPTIONS="quiet"\n' > "$T/sdboot"; F="$T/sdboot"; REBUILDS=0; nvidia_enable
+check "no setting to edit: error, nothing rebuilt" '! nvidia_kernel_enable >/dev/null && [[ $REBUILDS == 0 ]]'
+FAKE_DRIVER=0; NVIDIA_DRM_DIR="$T/drm"; printf 'LINUX_OPTIONS="quiet"\n' > "$T/sdboot"; F="$T/sdboot"; REBUILDS=0; nvidia_kernel_enable
 check "no NVIDIA driver: nothing touched" '[[ "$(cat "$F")" == "LINUX_OPTIONS=\"quiet\"" && $REBUILDS == 0 ]]'
+
+# --- single user mode on NVIDIA: its own login step (SDDM, autologin into Plasma) without the conversion
+FAKE_DRIVER=1; NVIDIA_DRM_DIR="$T/drm"   # an earlier section ended without the driver
+SW="$T/switches.log"; : > "$SW"; TARGET_USER=tester; SINGLE_AUTOLOGIN="$T/sddm.conf.d/zzz-steamify-autologin.conf"
+switch_to_sddm() { echo sddm >> "$SW"; }; switch_to_plasmalogin() { echo plasmalogin >> "$SW"; }
+remove_sddm_base_autologin() { :; }   # would look at the real /etc/sddm.conf
+GAMING_ON=0
+check "single user mode is offered on NVIDIA without the conversion..." 'component_available single'
+GAMING_ON=1; check "...and with it" 'component_available single'; GAMING_ON=0
+single_login_enable
+check "single user: SDDM, autologin of the user into the Plasma session" 'grep -qx "User=tester" "$SINGLE_AUTOLOGIN" && grep -qx "Session=plasma.desktop" "$SINGLE_AUTOLOGIN" && grep -qx "Relogin=true" "$SINGLE_AUTOLOGIN" && grep -qx sddm "$SW"'
+c1="$(cat "$SINGLE_AUTOLOGIN")"; single_login_enable
+check "single user login: a second run changes nothing" '[[ "$(cat "$SINGLE_AUTOLOGIN")" == "$c1" ]]'
+single_login_disable
+check "single user off: the file is gone and plasma-login-manager is the login manager again" '[[ ! -e "$SINGLE_AUTOLOGIN" ]] && grep -qx plasmalogin "$SW"'
+: > "$SW"; GAMING_ON=1; single_login_enable
+check "with the conversion on, single user mode leaves the login to it" '[[ ! -e "$SINGLE_AUTOLOGIN" && ! -s "$SW" ]]'
+GAMING_ON=0
+# --- the menu rules
+declare -A WANTED=([nvidia]=1 [bigpicture]=1 [gaming]=0 [boot]=0 [single]=0 [machine]=0 [poweroff]=0 [launcher]=0 [steamgame]=0)
+component_selectable() { return 0; }
+toggle_component nvidia
+check "unticking Gaming on NVIDIA unticks Big Picture" '[[ "${WANTED[nvidia]}" == 0 && "${WANTED[bigpicture]}" == 0 ]]'
+toggle_component bigpicture
+check "ticking Big Picture ticks Gaming on NVIDIA" '[[ "${WANTED[nvidia]}" == 1 && "${WANTED[bigpicture]}" == 1 ]]'
+WANTED[single]=0; WANTED[gaming]=0; toggle_component single
+check "ticking single user mode does not tick the conversion where it isn't offered" '[[ "${WANTED[single]}" == 1 && "${WANTED[gaming]}" == 0 ]]'
+check "Big Picture follows Gaming on NVIDIA in the menu" '[[ " ${COMPONENTS[*]} " == *" nvidia bigpicture "* && "${PARENT[bigpicture]}" == nvidia ]]'
+
 exit $fail

ui/qml/AppState.qml

@@ -75,8 +75,11 @@ Item {
         var w = Object.assign({}, want);
         w[id] = !w[id];
         // The same rules as the terminal menu (toggle_component).
+        var hasGaming = items.some(function (i) { return i.id === "gaming"; });
         if (id === "gaming" && !w.gaming) w.single = false;
-        if (id === "single" && w.single) w.gaming = true;
+        if (id === "single" && w.single && hasGaming) w.gaming = true;
+        if (id === "nvidia") w.bigpicture = w.nvidia;
+        if (id === "bigpicture" && w.bigpicture) w.nvidia = true;
         if (id === "machine") w.poweroff = w.machine;
         if (id === "poweroff" && w.poweroff) w.machine = true;
         if (id === "machine" && !w.machine) w.kpin = false;

ui/qml/Texts.qml

@@ -10,6 +10,12 @@ QtObject {
         boot: { label: "Boot into", hint: "Where the PC starts",
                 body: "Where the PC starts after a restart. Switching back and forth works the same either way.",
                 changes: ["Desktop: the Plasma session is set before login", "Gaming: the SteamOS default"] },
+        nvidia: { label: "Gaming on NVIDIA", hint: "Steam on the desktop, started at login",
+                  body: "gamescope's own gaming mode shows a corrupted picture on NVIDIA graphics cards (an open NVIDIA driver bug), so it isn't offered here. This puts Steam on the Plasma desktop instead and starts it when you log in.",
+                  changes: ["Steam is installed when it's missing", "Steam starts at login (a systemd user service)", "Off: the service is removed again; Steam is only removed if Steamify installed it"] },
+        bigpicture: { label: "Steam starts in Big Picture", hint: "The controller-friendly Steam, or the normal window",
+                      body: "Steam opens in Big Picture at login, which works well with a controller on the TV. Untick it for Steam's normal window.",
+                      changes: ["Steam is started with -gamepadui", "Plasma starts with an empty session, so old windows don't cover Big Picture", "Off: Steam starts in its normal window"] },
         theme: { label: "SteamOS theme", hint: "Vapor look for the desktop, Add to Steam",
                  body: "The Vapor look of SteamOS for the desktop, with its panel, launcher icon and wallpaper.",
                  changes: ["cachyos-vapor global theme", "Add to Steam in right-click menus", "Nested Desktop, Steam keyboard window rule"] },
@@ -27,6 +33,9 @@ QtObject {
         notify: { label: "Update notifications", hint: "A notification when there's a new Steamify",
                   body: "Checks once a day and when you log in to the desktop. When there's a new Steamify you get a notification and a tray icon: open the app to see what's new and choose what to update, or skip that version. It never updates anything by itself.",
                   changes: ["A daily check (systemd user timer), only on the desktop", "Tray icon only while an update is waiting", "Skip this version: quiet until the next one"] },
+        extended_controller_support: { label: "Extended controller support", hint: "Xbox wireless dongle, Xbox controllers over Bluetooth",
+                  body: "Drivers for Xbox controllers that Linux doesn't handle well by itself. xone makes the Xbox wireless dongle work (the kernel has no driver for it), xpadneo gives an Xbox controller over Bluetooth rumble including the triggers, the right button mapping and its battery level. They are built for every installed kernel, which takes a minute or two each.",
+                  changes: ["xone (the dongle) with its firmware, and xpadneo (Bluetooth), from the CachyOS repo", "Kernel headers for every installed kernel, so the drivers build for each", "Off: only what Steamify installed is removed again"] },
         vram: { label: "VRAM booster", hint: "The game in front keeps its VRAM",
                 body: "Like SteamOS 3.9: the game you're playing keeps its video memory, and background apps are moved out first. Without it a game that needs most of the video memory can spill into system RAM and stutter. Shown for GPUs whose driver supports it (AMD, Intel, NVIDIA with its open kernel modules from driver 615) on kernel 7.2 or newer.",
                 changes: ["dmemcg-booster (system and user service)", "plasma-foreground-booster, which tells it which window is in front", "Off: removed again, unless you had installed them yourself"] },