From 56f5707c86ebcef24d20a1d4e874b0765f612a84 Mon Sep 17 00:00:00 2001
From: rickpeters <rickpeters@upriser.nl>
Date: Sun, 27 Sep 2026 20:06:11 +0200
Subject: [PATCH] fix: The Steamify step is added by calamares-online.sh, which
 copies CachyOS's settings over /etc/calamares/settings.conf

---
 archiso/airootfs/etc/calamares/settings.conf  | 127 ------------------
 .../usr/local/bin/calamares-online.sh         |   4 +
 2 files changed, 4 insertions(+), 127 deletions(-)
 delete mode 100644 archiso/airootfs/etc/calamares/settings.conf

diff --git a/archiso/airootfs/etc/calamares/settings.conf b/archiso/airootfs/etc/calamares/settings.conf
deleted file mode 100644
index ae8ade1..0000000
--- a/archiso/airootfs/etc/calamares/settings.conf
+++ /dev/null
@@ -1,127 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Configuration file for Calamares
----
-modules-search: [ local ]
-
-instances:
-
-- id:       online
-  module:   packages
-  config:   packages_online.conf
-
-- id:       online
-  module:   welcome
-  config:   welcome_online.conf
-
-- id:       before-online
-  module:   shellprocess
-  config:   shellprocess-before-online.conf
-
-- id:       modify_mk_hook
-  module:   shellprocess
-  config:   shellprocess_modify_mk_hook.conf
-
-- id:       reset_mk_hook
-  module:   shellprocess
-  config:   shellprocess_reset_mk_hook.conf
-
-- id:       initialize_pacman
-  module:   shellprocess
-  config:   shellprocess_initialize_pacman.conf
-
-- id:       bootloader
-  module:   packagechooser
-  config:   packagechooser_bootloader.conf
-
-- id:       desktop
-  module:   packagechooser
-  config:   packagechooser_desktop.conf
-
-- id:       enable_ufw
-  module:   shellprocess
-  config:   shellprocess_enable_ufw.conf
-
-- id:       greetd
-  module:   shellprocess
-  config:   shellprocess_greetd.conf
-
-- id:       btrfs_snapshot
-  module:   shellprocess
-  config:   shellprocess_btrfs_snapshot.conf
-
-- id:       steamify
-  module:   shellprocess
-  config:   shellprocess_steamify.conf
-
-- id:       cleanup_calamares
-  module:   shellprocess
-  config:   shellprocess_cleanup_calamares.conf
-
-
-sequence:
-- show:
-  - welcome@online
-  - locale
-  - keyboard
-  - packagechooser@bootloader
-  - partition
-  - packagechooser@desktop
-  - netinstall
-  - users
-  - summary
-- exec:
-  - partition
-  - zfs
-  - mount
-  - shellprocess@modify_mk_hook
-  - shellprocess@initialize_pacman
-  - shellprocess@before-online
-  - pacstrap
-  - machineid
-  - users
-  - locale
-  - keyboard
-  - localecfg
-  - chwd
-  - packages@online
-  - luksbootkeyfile
-  - luksopenswaphookcfg
-  - fstab
-  - plymouthcfg
-  - zfshostid
-  - initcpiocfg
-  - initcpio
-  - networkcfg
-  - displaymanager
-  - hwclock
-  - grubcfg
-  - bootloader
-  - shellprocess@reset_mk_hook
-  - services-systemd
-  - shellprocess
-  - shellprocess@enable_ufw
-  - shellprocess@greetd
-  - shellprocess@btrfs_snapshot
-  - shellprocess@steamify
-  - shellprocess@cleanup_calamares
-  - umount
-- show:
-  - finished
-
-branding: cachyos
-
-prompt-install: true
-
-dont-chroot: false
-
-oem-setup: false
-
-disable-cancel: false
-
-disable-cancel-during-exec: false
-
-hide-back-and-next-during-exec: true
-
-quit-at-end: false
diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index b587323..992767d 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -45,6 +45,10 @@ main() {
 EOF
 
     sudo cp "/usr/share/calamares/settings_${mode}.conf" /etc/calamares/settings.conf
+    # Steamify: its step (modules/shellprocess_steamify.conf) before the
+    # installer cleans up after itself.
+    sudo sed -i -e 's/^- id:       cleanup_calamares$/- id:       steamify\n  module:   shellprocess\n  config:   shellprocess_steamify.conf\n\n&/' \
+        -e 's/^  - shellprocess@cleanup_calamares$/  - shellprocess@steamify\n&/' /etc/calamares/settings.conf
     exec pkexec-wrapper calamares -D6 >> $log
 }