From 22c568a2a62bef046a22bec476ae0c379ba713f6 Mon Sep 17 00:00:00 2001 From: Adam Jafarov Date: Thu, 26 May 2022 14:40:53 +0300 Subject: [PATCH] Installer: NVIDIA support + Refine intel stuff --- airootfs/usr/local/bin/holoinstall | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/airootfs/usr/local/bin/holoinstall b/airootfs/usr/local/bin/holoinstall index 59b4e1e..a8e5c64 100755 --- a/airootfs/usr/local/bin/holoinstall +++ b/airootfs/usr/local/bin/holoinstall @@ -160,7 +160,6 @@ base_os_install() { arch-chroot ${HOLO_INSTALL_DIR} locale-gen echo "LANG=$(echo ${SYSTEM_LOCALE} | cut -d' ' -f1)" > ${HOLO_INSTALL_DIR}/etc/locale.conf } - full_install() { echo "Installing full SteamOS 3..." sleep 1 @@ -171,18 +170,23 @@ full_install() { while true do 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" + echo "1) AMD: Will install Gamescope with Mangohud and FSR support" + echo "2) Intel: Will install Gamescope with Mangohud and FSR or NIR support" + echo "3) NVIDIA (9xx+ only): Will install proprietary drivers and Gamescope with Mangohud and NIR support" read "?Enter your choice here: " HOLO_GPU_TYPE if [[ "${HOLO_GPU_TYPE}" == "1" ]]; then echo "Installing gamescope for AMD GPUs..." - arch-chroot ${HOLO_INSTALL_DIR} sed -i "s#IgnorePkg = gamescope #IgnorePkg = #g" /etc/pacman.conf - GAMESCOPE_INSTALL=(/usr/bin/pacman --noconfirm -S --needed --overwrite="*" vulkan-radeon lib32-vulkan-radeon gamescope) + GAMESCOPE_INSTALL=(/usr/bin/pacman --noconfirm -S --needed --overwrite="*" vulkan-radeon-steamos lib32-vulkan-radeon-steamos gamescope mesa-steamos lib32-mesa-steamos) break elif [[ "${HOLO_GPU_TYPE}" == "2" ]]; then echo "Installing gamescope for Intel GPUs..." - GAMESCOPE_INSTALL=(/usr/bin/pacman --noconfirm -S --needed --overwrite="*" extra/vulkan-intel multilib-lib32-vulkan-intel extra/mesa multilib/lib32-mesa holo/gamescope) + GAMESCOPE_INSTALL=(/usr/bin/pacman --noconfirm -S --needed --overwrite="*" vulkan-intel-steamos lib32-vulkan-intel-steamos mesa-steamos lib32-mesa-steamos gamescope) + break + elif [[ "${HOLO_GPU_TYPE}" == "3" ]]; then + echo "Installing gamescope for NVIDIA GPUs..." + GAMESCOPE_INSTALL=(/usr/bin/pacman --noconfirm -S --needed --overwrite="*" holoiso/nvidia-utils holoiso/nvidia-dkms holoiso/opencl-nvidia gamescope) + GRUB_UPD_CMD=(sed -i 's/splash/splash nvidia-drm.modeset=1/g' ${HOLO_INSTALL_DIR}/etc/grub.d/10_linux) break else echo -e "You have made an invalid selection, please try again...\n" @@ -204,6 +208,8 @@ full_install() { arch-chroot ${HOLO_INSTALL_DIR} ${CMD_PACMAN_INSTALL} flatpak packagekit-qt5 rsync unzip vim arch-chroot ${HOLO_INSTALL_DIR} flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo arch-chroot ${HOLO_INSTALL_DIR} echo "recoveryinit" > /root/.bashrc + ${GRUB_UPD_CMD} + arch-chroot ${HOLO_INSTALL_DIR} grub-mkconfig -o /boot/grub/grub.cfg }