From 3f1eff13db75b1cb6d438e5f0898844f7d9a5973 Mon Sep 17 00:00:00 2001
From: librewish <librewish@gmail.com>
Date: Thu, 29 Oct 2020 21:38:59 +0530
Subject: [PATCH] update script

---
 .../.config/autostart/setup-assistant.desktop |  2 +-
 usr/bin/setup-assistant                       | 20 +++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/etc/skel/.config/autostart/setup-assistant.desktop b/etc/skel/.config/autostart/setup-assistant.desktop
index 96f8fc6..24c3c61 100755
--- a/etc/skel/.config/autostart/setup-assistant.desktop
+++ b/etc/skel/.config/autostart/setup-assistant.desktop
@@ -2,6 +2,6 @@
 Name=Setup Assistant
 Comment=Starts Garudas setup assistant
 Icon=variety
-Exec=alacritty -e /usr/bin/setup-assistant
+Exec=alacritty -e /usr/bin/setup-assistant && rm -rf ~/.config/autostart/setup-assistant.desktop
 Terminal=false
 Type=Application
diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index 276d764..90530b3 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -10,15 +10,9 @@ function goto
 
 function upgrade2ultimate
 {
-    ## Graphical    
-    sudo pacman -S --needed pamac-all
-
-    ## APPIMAGE Support
-    sudo pacman -S --noconfirm --needed appimagelauncher fwupd apparmor snapd snapd-glib flatpak
     sudo pacman -S --noconfirm --needed garuda-alsa garuda-pulse garuda-pipewire pulseaudio-ctl playerctl
     sudo pacman -S --noconfirm --needed qomui-git
     sudo pacman -S --noconfirm --needed garuda-settings-samba system-config-samba garuda-printer garuda-scanner
-    sudo pacman -S --noconfirm --needed evdev-right-click-emulation
 
     ## Desktop Utils
     sudo pacman -S --noconfirm --needed libdvdcss libva-utils vdpauinfo vulkan-tools mesa-demos lib32-mesa-demos
@@ -29,11 +23,6 @@ function upgrade2ultimate
     ## Internet applications
     sudo pacman -S --noconfirm --needed telegram-desktop joplin murmur mumble discord streamlink-twitch-gui syncthing-gtk nextcloud-client firefox-extension-bitwarden fractal firefox-extension-xdm-browser-monitor
     sudo pacman -S --noconfirm --needed garuda-virt-manager
-    sudo pacman -S --noconfirm --needed garuda-wine
-    sudo pacman -S --noconfirm --needed ialauncher-git steam steam-native-runtime lutris gamehub itch minigalaxy legendary 
-    sudo pacman -S --noconfirm --needed openrgb-git piper fancontrol-gui-git corectrl gwe goverlay-git mangohud lib32-mangohud gamemode lib32-gamemode dxvk-mingw-git vkbasalt proton-tkg-git
-    sudo pacman -S --noconfirm --needed antimicrox linuxconsole xboxdrv xpadneo-dkms-git steamos-xpad-dkms xow-git xbox-generic-controller game-devices-udev retroarch-autoconfig-udev-git
-    sudo pacman -S --noconfirm --needed libretro
     sync
 }
 
@@ -122,14 +111,19 @@ elif [ $selection = "6" ]; then
 elif [ $selection = "7" ]; then 
     echo ""
     sudo pacman -R pamac-aur pamac-tray-appindicator
-    sudo pacman -Syu --noconfirm snapd snapd-glib apparmor flatpak pamac-all appimagelauncher
+    sudo pacman -Syu --noconfirm pamac-all appimagelauncher fwupd apparmor snapd snapd-glib flatpak
     echo ""
     echo "Snap & Flatpak support should now be enabled."
     goto "start"
 elif [ $selection = "8" ]; then 
     echo ""
-    sudo pacman -Syu --noconfirm gamemode lib32-gamemode lutris garuda-wine steam steam-native-runtime mangohud lib32-mangohud proton-tkg-git dxvk-mingw-git
+    sudo pacman -S --noconfirm --needed garuda-wine
+    sudo pacman -S --noconfirm --needed ialauncher-git steam steam-native-runtime lutris gamehub itch minigalaxy legendary 
+    sudo pacman -S --noconfirm --needed openrgb-git piper fancontrol-gui-git corectrl gwe goverlay-git mangohud lib32-mangohud gamemode lib32-gamemode dxvk-mingw-git vkbasalt proton-tkg-git
+    sudo pacman -S --noconfirm --needed antimicrox linuxconsole xboxdrv xpadneo-dkms-git steamos-xpad-dkms xow-git xbox-generic-controller game-devices-udev retroarch-autoconfig-udev-git
+    sudo pacman -S --noconfirm --needed libretro
     systemctl --user enable --now gamemoded
+    setup_dxvk install 2>&1 &
     echo ""
     echo "All gaming apps should now be installed. 🕹"
     goto "start"