From cb1174f27e3434742aec63987908b6fc5dac1e7e Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Sat, 4 Mar 2023 02:40:58 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20cleanup=20offline=20install?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 archiso/airootfs/usr/local/bin/removeun | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/archiso/airootfs/usr/local/bin/removeun b/archiso/airootfs/usr/local/bin/removeun
index 9fbd2d6..4f2569d 100755
--- a/archiso/airootfs/usr/local/bin/removeun
+++ b/archiso/airootfs/usr/local/bin/removeun
@@ -19,6 +19,9 @@ _clean_packages() {
 local _packages_to_remove=(
   gparted
   grsync
+  cachyos-calamares-grub
+  cachyos-calamares-systemd
+  cachyos-calamares-refind
   cachyos-calamares
   cachyos-calamares-config
   edk2-shell
@@ -39,21 +42,16 @@ local _packages_to_remove=(
   mkinitcpio-archiso
 )
 
-  local _nvidia_packages_to_remove=(nvidia-dkms nvidia-utils)
-
   local _check_nvidia_card="$(mhwd --is_nvidia_card | grep -q 'NVIDIA card found!'; echo $?)"
   if [[ "${_check_nvidia_card}" -ne 0 ]]; then
     echo "No NVIDIA card detected. Removing nvidia drivers"
-
-    local xx
-    # @ does one by one to avoid errors in the entire process
-    for xx in "${_nvidia_packages_to_remove[@]}"; do pacman -Rc "$xx" --noconfirm; done
+    _packages_to_remove+=(nvidia-dkms nvidia-utils egl-wayland)
   fi
 
   local xx
   # @ does one by one to avoid errors in the entire process
   # taken from Erik Dubois script
-  for xx in "${_packages_to_remove[@]}"; do pacman -Rsc "$xx" --noconfirm; done
+  for xx in "${_packages_to_remove[@]}"; do pacman -Rsnc "$xx" --noconfirm; done
 }
 
 _clean_packages