From 9fa749886d388b90ca870bf826677bd1f04fdc31 Mon Sep 17 00:00:00 2001
From: bhaiest <thevakhovske@petalmail.com>
Date: Sun, 22 May 2022 17:50:31 +0300
Subject: [PATCH] HoloISO Lord Gaben's treasure (snapshot4) 20220522_1750

---
 airootfs/usr/local/bin/holoinstall | 41 ++++++++++++++----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/airootfs/usr/local/bin/holoinstall b/airootfs/usr/local/bin/holoinstall
index 2c1a6aa..b9c891b 100755
--- a/airootfs/usr/local/bin/holoinstall
+++ b/airootfs/usr/local/bin/holoinstall
@@ -71,18 +71,15 @@ base_os_install() {
 	parted ${DEVICE} set 1 boot on
 	parted ${DEVICE} set 1 esp on
 	parted ${DEVICE} mkpart primary btrfs 256M 24G
-	parted ${DEVICE} mkpart primary ext4 24G 29G
-    parted ${DEVICE} mkpart primary ext4 29G 100%
+    	parted ${DEVICE} mkpart primary ext4 24G 100%
 	root_partition="${INSTALLDEVICE}2"
 	mkfs -t vfat ${INSTALLDEVICE}1
 	fatlabel ${INSTALLDEVICE}1 HOLOEFI
 	mkfs -t btrfs -f ${root_partition}
 	mkfs -t ext4 ${INSTALLDEVICE}3
-	mkfs -t ext4 ${INSTALLDEVICE}4
-	home_partition="${INSTALLDEVICE}4"
+	home_partition="${INSTALLDEVICE}3"
 	btrfs filesystem label ${root_partition} holo-root
-	e2label "${INSTALLDEVICE}3" holo-recovery
-	e2label "${INSTALLDEVICE}4" holo-home
+	e2label "${INSTALLDEVICE}3" holo-home
 
 	echo "\nPartitioning complete, mounting and pacstrapping..."
 	echo "${UCODE_INSTALL_MSG}"
@@ -160,27 +157,27 @@ base_os_install() {
 full_install() {
     echo "Installing full SteamOS 3..."
     sleep 1
-    echo "Please choose your current GPU:"
-    echo "1) AMD only: Will install updated Gamescope with Mangohud and FSR support"
-    echo "2) Intel: Will install older Gamescope that's compatible with Intel GPUs but without Mangohud and FSR support"
-    read "?Enter your choice here: " HOLO_GPU_TYPE
-
-    if [[ "${HOLO_GPU_TYPE}" == "1" ]]; then
-        echo "Installing gamescope for AMD GPUs..."
-        GAMESCOPE_INSTALL="gamescope mesa lib32-mesa"
-    elif [[ "${HOLO_GPU_TYPE}" == "2" ]]; then
-        echo "Installing gamescope for Intel GPUs..."
-        GAMESCOPE_INSTALL="extra/mesa multilib/lib32-mesa holo/gamescope"
-    else
-        echo "Nothing choosed or Invalid choice. Installing gamescope for Intel GPUs..."
-        GAMESCOPE_INSTALL="extra/mesa multilib/lib32-mesa holo/gamescope"
-    fi
     # The actual installation begins here:
 	arch-chroot ${HOLO_INSTALL_DIR} ${CMD_PACMAN_UPDATE}
 	arch-chroot ${HOLO_INSTALL_DIR} ${CMD_PACMAN_INSTALL} holoiso-main holoiso-updateclient wireplumber vulkan-radeon lib32-vulkan-radeon extra/vulkan-intel multilib/lib32-vulkan-intel
+	sleep 1
+   	echo "Please choose your current GPU:"
+    	echo "1) AMD only: Will install updated Gamescope with Mangohud and FSR support"
+    	echo "2) Intel: Will install older Gamescope that's compatible with Intel GPUs but without Mangohud and FSR support"
+    	read "?Enter your choice here: " HOLO_GPU_TYPE
 
+    	if [[ "${HOLO_GPU_TYPE}" == "1" ]]; then
+        	echo "Installing gamescope for AMD GPUs..."
+        	GAMESCOPE_INSTALL=(/usr/bin/pacman --noconfirm -S --needed --overwrite="*" gamescope)
+    	elif [[ "${HOLO_GPU_TYPE}" == "2" ]]; then
+        	echo "Installing gamescope for Intel GPUs..."
+        	GAMESCOPE_INSTALL=(/usr/bin/pacman --noconfirm -S --needed --overwrite="*" extra/mesa multilib/lib32-mesa holo/gamescope)
+    	else
+        	echo "Nothing choosed or Invalid choice. Installing gamescope for Intel GPUs..."
+        	GAMESCOPE_INSTALL=(/usr/bin/pacman --noconfirm -S --needed --overwrite="*" extra/mesa multilib/lib32-mesa holo/gamescope)
+    fi
 	echo "\nConfiguring Steam Deck UI by default..."
-	arch-chroot ${HOLO_INSTALL_DIR} ${CMD_PACMAN_INSTALL} ${GAMESCOPE_INSTALL}
+	arch-chroot ${HOLO_INSTALL_DIR} ${GAMESCOPE_INSTALL}
 	mkdir ${HOLO_INSTALL_DIR}/etc/sddm.conf.d
 	echo "[General]\nDisplayServer=wayland\n\n[Autologin]\nUser=${HOLOUSER}\nSession=gamescope-wayland.desktop" >> ${HOLO_INSTALL_DIR}/etc/sddm.conf.d/autologin.conf
 	mkdir /mnt/home/${HOLOUSER}/Desktop