From 38aa5990bc0c2d1f64147d100779d4084527d22e Mon Sep 17 00:00:00 2001
From: Nico Jensch <njcrypted@protonmail.com>
Date: Wed, 11 Nov 2020 16:18:59 +0100
Subject: [PATCH] Eyecandy assistant + remove unneeded sudo permissions

---
 usr/bin/setup-assistant | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index 8116259..15823af 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -24,8 +24,8 @@ function upgrade2ultimate
 
     clear
     echo "What about Snaps, Flatpak & Appimage support? (y,n)"
-    echo "This enables you to use software not available in Chaotic-AUR."
-    echo "If an application is available already we advise to use the version in the repo."
+    echo "This enables you to use software not available in our repos."
+    echo "If an application is available we advise to use the native version!"
     read snap
     if [ $snap = "y" ]; then
         echo "sudo pacman -R pamac-aur pamac-tray-appindicator" >> /tmp/setup-assistant/prepare.sh
@@ -36,18 +36,21 @@ function upgrade2ultimate
         snapd 
         snapd-glib 
         flatpak" >> /tmp/setup-assistant/pkgs.txt
-        echo "sudo systemctl enable --now snapd" >> /tmp/setup-assistant/setup.sh
+        echo "sudo systemctl enable --now snapd.socket" >> /tmp/setup-assistant/setup.sh
+        echo "sudo systemctl enable --now apparmor.service" >> /tmp/setup-assistant/setup.sh
+        echo "sudo systemctl enable --now snapd.apparmor.service" >> /tmp/setup-assistant/setup.sh
+
     fi
 
     clear
-    echo "Do you need gaming applications installed? (y,n)"
+    echo "Do you need gaming applications installed? 🎮 (y,n)"
     echo "This will install the Garuda Gamer app in which every component needed to game can be enabled."
     echo ""
     read gaming
     if [ $gaming = "y" ]; then
         echo "garuda-gamer" >> /tmp/setup-assistant/pkgs.txt
         echo "systemctl --user enable --now gamemoded >/dev/null 2>&1 &" >> /tmp/setup-assistant/setup.sh
-        echo "setup_dxvk install 2>&1 &" >> /tmp/setup-assistant/setup.sh
+        echo "sudo setup_dxvk install 2>&1 &" >> /tmp/setup-assistant/setup.sh
     fi
 
     clear
@@ -61,10 +64,11 @@ function upgrade2ultimate
         garuda-pipewire 
         pulseaudio-ctl 
         playerctl" >> /tmp/setup-assistant/pkgs.txt
+        echo "sudo systemctl enable --now bluetooth-autoconnect" >> /tmp/setup-assistant/setup.sh
     fi
 
     clear
-    echo "Are you printing and scanning with this machine?"
+    echo "Are you printing and scanning with this machine? 🖨"
     echo "Also, do you need Samba support? (y,n)"
     echo ""
     read gaming
@@ -78,7 +82,7 @@ function upgrade2ultimate
     clear
     : office-selection
     echo "Now you are free to choose your favorite office suite."
-    echo "There are quite a lot of them in our repo. A guideline for new users:"
+    echo "There are quite a lot of them to choose from. A guideline for new users:"
     echo "LibreOffice is the most used and complete office application in the Linux world."
     echo "If a simpler word processor is fine for you Abiword might also be a good choice."
     echo ""
@@ -113,7 +117,7 @@ function upgrade2ultimate
     fi
 
     clear
-    echo "This question is about general desktop applications."
+    echo "This question is about general desktop applications. ☁️"
     echo "It contains apps such as Telegram, Nextcloud-client & Syncthing."
     echo "Are these going to be installed? (y,n)"
     read general
@@ -133,28 +137,28 @@ function upgrade2ultimate
 
     : virt-selection
     clear
-    echo "Are you rather a fan of virtualbox or virt-manager?"
+    echo "Are you rather a fan of virtualbox or virt-manager? 💻"
     echo ""
     echo "1) Virtualbox all the way!"
     echo "2) Id rather choose Virt-manager."
     read virt
     if [ $virt = "1" ]; then
         echo "garuda-virtualbox" >> /tmp/setup-assistant/pkgs.txt
-        echo "usermod -aG vboxusers $USER" >> /tmp/setup-assistant/setup.sh
+        echo "sudo usermod -aG vboxusers $USER" >> /tmp/setup-assistant/setup.sh
     elif [ $virt = "2" ]; then
         echo "garuda-virt-manager" >> /tmp/setup-assistant/pkgs.txt
         echo "sudo systemctl enable --now libvirtd" >> /tmp/setup-assistant/setup.sh
-        echo "usermod -aG libvirt $USER" >> /tmp/setup-assistant/setup.sh
-        echo "usermod -aG kvm $USER" >> /tmp/setup-assistant/setup.sh
+        echo "sudo usermod -aG libvirt $USER" >> /tmp/setup-assistant/setup.sh
+        echo "sudo usermod -aG kvm $USER" >> /tmp/setup-assistant/setup.sh
     else echo "Thats not a valid choice! ❌"
         goto "virt-selection"
     fi
 
     clear 
-    sudo sh /tmp/setup-assistant/prepare.sh
+    sh /tmp/setup-assistant/prepare.sh
     cat /tmp/setup-assistant/pkgs.txt | sed '/^$/d;s/[[:blank:]]//g' > /tmp/setup-assistant/pkgs-install.txt
     sudo pacman --needed -S - < /tmp/setup-assistant/pkgs-install.txt
-    sudo sh /tmp/setup-assistant/setup.sh
+    sh /tmp/setup-assistant/setup.sh
 
     rm -rf /tmp/setup-assistant
 }
@@ -205,6 +209,6 @@ elif [ $selection = "5" ]; then
     upgrade2ultimate
 elif [ $selection = "6" ]; then
     exit
-else "Thats not a valid choice!"
+else "Thats not a valid choice! ❌"
     goto "start"
 fi