Merge pull request #35 from theupriser/release/2.7.0

Release 2.7.0

.github/workflows/bundle.yml

@@ -5,18 +5,16 @@
 # release are moved to it, so both of these always get the newest version:
 #   curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/latest/download/steamify.sh | bash
 #   curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/download/latest/steamify.sh | bash
-# Each release also has the app (v2): steamify-app.tar.gz (ui/, steamify.sh,
+# Each release also has the app: steamify-app.tar.gz (ui/, steamify.sh,
 # lib/, patches/, services/, the icon) and its launcher, run with:
 #   curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/latest/download/steamify-app.sh | bash
-# A push to feat/v2-ui (the app, not released yet) updates the pre-release
+# Pushes to release/** build and check it like pull requests; only main publishes.
-# v2-ui-preview instead, whose launcher gets that build:
-#   curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/download/v2-ui-preview/steamify-app.sh | bash
 # Pull requests only build and check it, and warn when VERSION is already released.
 name: Single-file build
 
 on:
   push:
-    branches: [main, feat/v2-ui]
+    branches: [main, 'release/**']
   pull_request:
   workflow_dispatch:
 
@@ -106,23 +104,3 @@ jobs:
             gh release create latest --title "Steamify CachyOS - latest (v$VERSION)" --notes "$latest_notes" --latest=false
           fi
           gh release upload latest dist/steamify.sh dist/steamify-app.sh dist/steamify-app.tar.gz assets/steam-gaming-settings.svg --clobber
-
-      - name: Publish the v2-ui-preview pre-release
-        if: github.event_name == 'push' && github.ref == 'refs/heads/feat/v2-ui'
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Its launcher downloads this pre-release, not the newest release.
-          sed -i 's/STEAMIFY_RELEASE:-latest/STEAMIFY_RELEASE:-v2-ui-preview/' dist/steamify-app.sh
-          grep -q 'STEAMIFY_RELEASE:-v2-ui-preview' dist/steamify-app.sh
-          git tag -f v2-ui-preview "$GITHUB_SHA" && git push -f origin v2-ui-preview
-          notes="Preview of the Steamify app (v2) from feat/v2-ui ($(git describe --always), $(git log -1 --format='%cs %s')). Not a release.
-          Run it with:
-
-              curl -fsSL https://github.com/${{ github.repository }}/releases/download/v2-ui-preview/steamify-app.sh | bash"
-          if gh release view v2-ui-preview >/dev/null 2>&1; then
-            gh release edit v2-ui-preview --title "Steamify app (v2) preview" --notes "$notes" --prerelease --latest=false
-          else
-            gh release create v2-ui-preview --target "$GITHUB_SHA" --title "Steamify app (v2) preview" --notes "$notes" --prerelease --latest=false
-          fi
-          gh release upload v2-ui-preview dist/steamify-app.sh dist/steamify-app.tar.gz --clobber

AGENTS.md

@@ -98,11 +98,36 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine
     + subject; a commit can't contain its own hash, so fill it in with the
     next commit). The section heading must be `## <VERSION> - <date>`: CI
     cuts the release notes out of the changelog by that heading.
-  - Every PR that should be released bumps `VERSION` and adds its section.
+  - **Branches: one release branch per version.** Work for a release goes
-    A push to `main` publishes release `v$VERSION` (tag + bundle + that
+    into `release/X.Y.Z` (e.g. `release/2.7.0`), branched from `main` when
+    that version starts. That branch bumps `VERSION` to `X.Y.Z` and adds the
+    `## X.Y.Z - <date>` changelog section (first commit on it).
+    - Every change gets its own branch from the release branch:
+      `feature/<name>` (new behaviour) or `bugfix/<name>` (a fix), and a
+      pull request **into the release branch**, not into `main`. Its commits
+      add their changelog lines to that version's section.
+    - When the release is done and tested (the test plan in
+      steamify-cachyos-dev, `TESTPLAN.md`), the release branch gets a pull
+      request **into `main`**. Merging it publishes the release (below).
+    - A fix for a released version: a new `release/X.Y.Z+1` from `main`,
+      with the `bugfix/` branch into it; don't reopen an old release branch.
+    - Up to the release branch, the agent manages it: create the
+      `feature/`/`bugfix/` branches, commit, push, and merge them into the
+      release branch itself once tested (with `gh`: `gh pr create --base
+      release/X.Y.Z` + `gh pr merge --merge`; no review needed). Without
+      `gh` (`command -v gh`), ask the user to install it (Ubuntu:
+      `sudo apt install gh`, then `gh auth login`) instead of working around
+      it. Only the
+      release branch's pull request into `main` is the user's: never commit
+      or merge to `main`, the user merges that one.
+      Keep a feature/bugfix branch up to date by merging (or rebasing on)
+      its release branch, the release branch by merging `main` when that
+      moved.
+  - A push to `main` publishes release `v$VERSION` (tag + bundle + that
     changelog section) and marks it latest. An existing version is never
     overwritten: without a bump nothing is released, and pull requests show
-    a warning.
+    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
@@ -279,6 +304,13 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine
   removes it so Plasma builds Vapor's layout at the first login. What needs
   that layout (single user's launcher) runs then, from a one-time autostart
   (`lib/first-login.sh`, `--first-login`) that also opens the app.
+  `--options <id>,...` (exactly these on, the rest off; an item on brings its
+  parent) and `--boot gamescope|desktop` (desktop only with `gaming`) (2.7.0,
+  `defaults_options` in `lib/menu.sh`); the ISO's installer page passes them.
+  Items this PC can't use are left off with a warning, not an error.
+  `steamify.sh --boot gamescope|desktop` on its own (2.7.0, for scripts) only
+  switches `boot` on an installed conversion: `WANTED` is `CURRENT` plus
+  that, so no updates or removals a normal run would pick.
 - `Relogin=true` means a gamescope that fails to start is relaunched in a
   tight loop; keep that in mind when changing session handling.
 

CHANGELOG.md

@@ -5,9 +5,22 @@ 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.7.0 - 2026-09-28
+
+- `4f6e6fd` **feat: --defaults takes --skip <ids> and --boot gamescope|desktop, for the Steam Machine ISO's installer pages**
+- `5bf9da4` **fix: HDMI-CEC enables cec-audio-control.socket (the TV remote's volume keys); existing installs get it as an update**
+- `14aa7c0` **fix: the app's progress screen says "Boot into desktop", not "Boot into Boot into"**
+- `c4ec755` **feat: --defaults --options <ids> (exactly these on) replaces --skip; steamify.sh --boot gamescope|desktop on its own switches where an installed conversion starts**
+- `eadbdda` **docs: release branches (release/X.Y.Z, feature/ and bugfix/ branches into it, the release into main); CI builds release/** pushes**
+- `bee18b7` **docs: the agent merges feature/bugfix branches into the release branch; the release into main stays the user's**
+- `501c0ba` **docs: gh or git for merging into the release branch**
+- `b1adacb` **docs: gh is required for the release-branch pull requests; ask the user to install it**
+- `ced4a45` **chore: the v2 app preview is gone (it is the released app): no preview pre-release step in CI, no mention in steamify-app.sh**
+- **fix: turning the theme off no longer brings back single user's launcher restriction when single user was turned off in between**
+
 ## 2.6.0 - 2026-09-27
 
-- **feat: --defaults applies the default setup without the menu, also from an installer (no session): the base for a Steam Machine ISO**
+- `b948c20` **feat: --defaults applies the default setup without the menu, also from an installer (no session): the base for a Steam Machine ISO**
 
 ## 2.5.2 - 2026-09-27
 

README.md

@@ -125,6 +125,14 @@ steamos-session-select persistent  # start where you left off last time
 steamos-session-select oneshot     # always start in gaming mode (default)
 ```
 
+Where the PC starts after a restart can also be set from a script, once the
+SteamOS conversion is on (only that changes; `sudo` may ask for your password):
+
+```bash
+steamify.sh --boot desktop     # start in the desktop from the next boot on
+steamify.sh --boot gamescope   # start in gaming mode again (default)
+```
+
 ## Something wrong?
 
 Stuck on a black screen in gaming mode: press **Ctrl+Alt+F3**, log in, and run

TECHNICAL.md

@@ -180,7 +180,9 @@ SHA-256 in Valve's package index:
 - `cecd`, Valve's CEC daemon (a user service started with the desktop and
   gaming mode): TV remote keys become normal key presses (arrows, Enter,
   Back), and it turns the TV on and off with the PC;
-- `cec-audio-control`: volume of the TV or receiver;
+- `cec-audio-control`: volume of the TV or receiver (the TV remote's volume
+  keys); its user socket is enabled by Steamify, since SteamOS enables it
+  through a preset that pacman doesn't apply;
 - `inputattach-cec-units` (with `linuxconsole` from CachyOS for
   `inputattach`): attaches USB CEC adapters (Pulse-Eight, RainShadow).
 
@@ -418,6 +420,30 @@ steamos-session-select persistent  # remember the last-used session across reboo
 steamos-session-select oneshot     # always start in gamescope (default, like a Deck)
 ```
 
+`steamify.sh --boot gamescope|desktop` sets where the PC starts after a
+restart (the menu's Boot into row) from a script: it needs the SteamOS
+conversion and changes nothing else, not even the updates a normal run would
+apply. Exit code 1 without the conversion or with another value.
+
+## Install-time mode (`--defaults`)
+
+For an installer (the Steam Machine ISO), without a session or prompts
+(passwordless sudo required):
+
+```bash
+steamify.sh --defaults                                  # what the menu would preselect
+steamify.sh --defaults --options gaming,theme,cec,machine --boot desktop
+```
+
+`--options` turns on exactly the listed items (the menu's ids: `gaming`,
+`theme`, `glyphs`, `single`, `launcher`, `notify`, `vram`, `cec`, `machine`,
+`poweroff`), everything else off; an item that's on brings its parent
+(single user the conversion, the power-off fix Steam Machine support). An
+item this PC can't use (e.g. `vram` without a VRAM region) is left off with
+a warning. `--boot desktop` needs `gaming`. Unknown options, ids, `boot` or
+`bios` in the list: exit code 1 before anything changes. What needs a
+Plasma session waits for the first login (`lib/first-login.sh`).
+
 With `Relogin=true`, a gamescope session that fails to start is restarted
 immediately, which can turn into a loop - see
 [TROUBLESHOOTING.md](TROUBLESHOOTING.md) for the way out.

lib/cec.sh

@@ -155,6 +155,9 @@ cec_enable() {
     printf '%s\n' "# Written by Steamify: overrides STEAM_ENABLE_CEC=0 from the gaming mode script." \
         '[Service]' "EnvironmentFile=-$CEC_STEAM_ENV" | sudo tee "$CEC_STEAM_DROPIN" >/dev/null
     user_systemctl daemon-reload
+    # The TV remote's volume keys: SteamOS enables this socket through its
+    # preset, which pacman doesn't apply, so nothing else does on CachyOS.
+    user_systemctl enable --now cec-audio-control.socket 2>/dev/null
     cec_link_steamos_manager
     if compgen -G "/dev/cec*" >/dev/null; then
         user_systemctl restart cecd.service 2>/dev/null

lib/menu.sh

@@ -26,7 +26,7 @@ NO_PRESELECT=(boot cec kpin hdmi)
 FEATURE_BASELINE=2.1.0
 declare -A FEATURE_VERSION=(
     [gaming]=2.1.0 [boot]=2.1.0 [theme]=2.1.0 [glyphs]=2.1.0 [single]=2.1.0
-    [launcher]=2.1.0 [cec]=2.1.0 [machine]=2.2.0 [poweroff]=2.2.0 [vram]=2.3.0 [notify]=2.5.0 [steamgame]=2.5.1
+    [launcher]=2.1.0 [cec]=2.7.0 [machine]=2.2.0 [poweroff]=2.2.0 [vram]=2.3.0 [notify]=2.5.0 [steamgame]=2.5.1
     [kpin]=2.1.0 [hdmi]=2.1.0
 )
 
@@ -179,6 +179,63 @@ detect_components() {
     fi
 }
 
+defaults_options() {
+    # defaults_options [--options <id>[,<id>...]] [--boot gamescope|desktop]:
+    # what --defaults sets up, from the Steam Machine ISO's installer page.
+    # --options: exactly these items on, every other off (without it, the
+    # menu's preselection). An item that's on brings its parent (single user
+    # the conversion, like ticking it in the menu); one this PC can't use is
+    # left off with a warning. --boot desktop needs the conversion. Returns 1
+    # on an unknown option, item or value.
+    local c ids list=false boot=""
+    while [[ $# -gt 0 ]]; do
+        # Both take a value: without one, shift 2 fails and never shifts, so
+        # the loop would spin forever.
+        [[ "$1" == --options || "$1" == --boot ]] && [[ $# -lt 2 ]] && { err "$1 needs a value"; return 1; }
+        case "$1" in
+            --options)
+                list=true
+                IFS=, read -ra ids <<< "$2"
+                shift 2 ;;
+            --boot)
+                case "$2" in
+                    gamescope|desktop) boot="$2" ;;
+                    *) err "--boot takes gamescope or desktop"; return 1 ;;
+                esac
+                shift 2 ;;
+            *) err "Unknown option: $1"; return 1 ;;
+        esac
+    done
+    if [[ "$list" == true ]]; then
+        for c in "${ids[@]}"; do
+            [[ -n "$c" ]] || continue
+            [[ -n "${LABEL[$c]:-}" ]] || { err "Unknown item: $c"; return 1; }
+            [[ "$c" == boot ]] && { err "Where to start is --boot, not an item."; return 1; }
+            is_action "$c" && { err "$c can't be part of the install."; return 1; }
+        done
+        for c in "${COMPONENTS[@]}"; do WANTED[$c]=0; done
+        for c in "${ids[@]}"; do
+            [[ -n "$c" ]] || continue
+            if component_available "$c" && component_selectable "$c"; then
+                WANTED[$c]=1
+            else
+                warn "Leaving out ${LABEL[$c]%%:*}: not available on this PC."
+            fi
+        done
+        [[ "${WANTED[single]}" == 1 ]] && WANTED[gaming]=1
+        for c in "${COMPONENTS[@]}"; do
+            [[ "${WANTED[$c]}" == 1 && -n "${PARENT[$c]:-}" ]] && WANTED[${PARENT[$c]}]=1
+        done
+    fi
+    case "$boot" in
+        desktop)
+            [[ "${WANTED[gaming]}" == 1 ]] || { err "--boot desktop needs the SteamOS conversion (gaming)."; return 1; }
+            WANTED[boot]=1 ;;
+        gamescope) WANTED[boot]=0 ;;
+    esac
+    return 0
+}
+
 toggle_component() {
     local c="$1"
     component_selectable "$c" || return 1

lib/single-user.sh

@@ -101,6 +101,24 @@ single_launcher() {
     done
 }
 
+single_launcher_drop() {
+    # The theme's layout backup is taken when it's turned on: with single
+    # user on then, it holds single's launcher keys, and restoring it after
+    # single was turned off brings them back. Drop exactly single's values
+    # (a launcher set up differently by the user is left alone).
+    local applet
+    local -a kick_args
+    for applet in $(plasma_applets org.kde.plasma.kickoff); do
+        kick_args=(--file plasma-org.kde.plasma.desktop-appletsrc --group Containments --group "${applet%%:*}"
+             --group Applets --group "${applet#*:}" --group Configuration --group General)
+        [[ "$(kreadconfig6 "${kick_args[@]}" --key primaryActions)" == 3 ]] &&
+            kwriteconfig6 "${kick_args[@]}" --key primaryActions --delete
+        [[ "$(kreadconfig6 "${kick_args[@]}" --key systemFavorites)" == 'suspend,reboot,shutdown' ]] &&
+            kwriteconfig6 "${kick_args[@]}" --key systemFavorites --delete
+    done
+    return 0
+}
+
 single_enable() {
     info "Turning off the lock screen, user switching and logging out..."
     stop_plasmashell_for_edit

lib/vapor-theme.sh

@@ -134,7 +134,11 @@ theme_disable() {
     fi
     # After the tools above, so keys that weren't set before are removed again.
     krevert theme
-    single_status && single_launcher
+    if single_status; then
+        single_launcher
+    else
+        single_launcher_drop
+    fi
     restart_plasmashell_if_stopped
     qdbus6 org.kde.KWin /KWin org.kde.KWin.reconfigure >/dev/null 2>&1 || true
 

steamify.sh

@@ -15,7 +15,7 @@
 set -uo pipefail
 
 # Release version, see CHANGELOG.md.
-VERSION=2.6.0
+VERSION=2.7.0
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
@@ -28,10 +28,15 @@ require_root_helper
 
 BACKEND=false
 [[ "${1:-}" == --backend ]] && BACKEND=true
-# --defaults: apply what the menu would preselect, without the menu or any
+# --defaults [--options <id>,...] [--boot gamescope|desktop]: apply what the
+# menu would preselect (or exactly the listed items), without the menu or any
 # prompt (the Steam Machine ISO's first login runs this; sudo must not ask).
 DEFAULTS=false
 [[ "${1:-}" == --defaults ]] && DEFAULTS=true
+# --boot gamescope|desktop: only change where an installed conversion
+# starts, everything else stays as it is (for scripts; no menu).
+BOOT_ONLY=false
+[[ "${1:-}" == --boot ]] && BOOT_ONLY=true
 
 if [[ "$BACKEND" == false ]]; then
     echo -e "${c_bold}Steamify CachyOS${c_reset} v$VERSION"
@@ -128,6 +133,7 @@ if [[ "$DEFAULTS" == true ]]; then
     REAPPLY=false
     sudo -n true 2>/dev/null || { err "--defaults needs sudo without a password."; exit 1; }
     detect_components
+    defaults_options "${@:2}" || exit 1
     plan_changes
     apply_changes
     # Run by the installer: the rest waits for the first desktop login.
@@ -137,6 +143,30 @@ if [[ "$DEFAULTS" == true ]]; then
     exit 0
 fi
 
+if [[ "$BOOT_ONLY" == true ]]; then
+    RESTART_FOR_LOGIN=false
+    REAPPLY=false
+    case "${2:-}" in
+        gamescope|desktop) ;;
+        *) err "--boot takes gamescope or desktop"; exit 1 ;;
+    esac
+    detect_components
+    [[ "${CURRENT[gaming]}" == 1 ]] || { err "--boot needs the SteamOS conversion; turn it on first."; exit 1; }
+    # What is on stays on, and nothing else changes: not the updates or
+    # removals a normal run would pick.
+    for c in "${COMPONENTS[@]}"; do WANTED[$c]=${CURRENT[$c]:-0}; done
+    WANTED[boot]=0; [[ "$2" == desktop ]] && WANTED[boot]=1
+    plan_changes
+    if [[ ${#TO_DISABLE[@]} -eq 0 && ${#TO_ENABLE[@]} -eq 0 ]]; then
+        ok "Already starting in $2."
+        exit 0
+    fi
+    apply_changes
+    [[ ${#FAILED[@]} -eq 0 ]] || { warn "These had problems (see above): ${FAILED[*]}"; exit 1; }
+    ok "Starts in $2 from the next boot on."
+    exit 0
+fi
+
 # Menu loop: after each run the menu comes back with the new state, until
 # the user quits; the restart question comes then, once, for everything.
 RESTART_FOR_LOGIN=false

ui/qml/ApplyingScreen.qml

@@ -37,7 +37,9 @@ Item {
                                font.pixelSize: 13; font.weight: Font.Bold }
                         RotationAnimator on rotation { running: step.st === "run"; from: 0; to: 360; duration: 1000; loops: Animation.Infinite } }
                     Row { width: 380; anchors.verticalCenter: parent.verticalCenter; spacing: 10
-                        Text { text: (Texts.actions[step.modelData.action] || [])[3] + Texts.label(step.modelData.id)
+                        // Boot into's label is its prefix already: "Boot into desktop", not "Boot into Boot into".
+                        Text { text: step.modelData.id === "boot" ? (Texts.actions[step.modelData.action] || [])[3] + Texts.actions[step.modelData.action][0].toLowerCase()
+                                     : (Texts.actions[step.modelData.action] || [])[3] + Texts.label(step.modelData.id)
                                color: step.st === "wait" ? Theme.faint : Theme.textHi; font.family: Theme.body; font.pixelSize: 16; font.weight: Font.DemiBold
                                anchors.verticalCenter: parent.verticalCenter; elide: Text.ElideRight
                                width: Math.min(implicitWidth, parent.width - (badge.visible ? badge.width + parent.spacing : 0)) }

ui/steamify-app.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
-# Steamify CachyOS - get and start the app (v2), for `curl | bash`:
+# Steamify CachyOS - get and start the app, for `curl | bash`:
 #   curl -fsSL https://github.com/theupriser/steamify-cachyos/releases/latest/download/steamify-app.sh | bash
 # Downloads the newest release's app package (steamify-app.tar.gz: the app,
 # steamify.sh, lib/, patches/ and services/) to ~/.local/share/steamify/app, installs PySide6 if
 # it's missing, adds a launcher entry, and starts the app.
-# STEAMIFY_RELEASE=<tag> takes that release instead of the newest (the
+# STEAMIFY_RELEASE=<tag> takes that release instead of the newest.
-# v2-ui-preview build's copy of this script sets it). STEAMIFY_BRANCH=<branch>
+# STEAMIFY_BRANCH=<branch> takes that branch's source instead (for testing
-# takes that branch's source instead (for testing before a build).
+# before a build).
 set -euo pipefail
 
 REPO="theupriser/steamify-cachyos"