From d005fc6fa4e08d7a527906c0a18c8e73ccfa3493 Mon Sep 17 00:00:00 2001
From: yuriy <yuriyz@disroot.org>
Date: Mon, 27 Mar 2023 00:10:41 -0400
Subject: [PATCH] gui updates

---
 Linux-Setup-Script.sh | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/Linux-Setup-Script.sh b/Linux-Setup-Script.sh
index 962e2f6..f6096da 100644
--- a/Linux-Setup-Script.sh
+++ b/Linux-Setup-Script.sh
@@ -3,9 +3,35 @@
 # paru -S plasma-wayland-session --noconfirm
 
 
-#status = $yad --form --field check1:chk --field check2:chk --field check3:chk --field check4:chk --field ph:chk
+yadResults=$(yad \
+ --title="Linux Setup Script" \
+ --form --columns=2 \
+ --field Installations:LBL \
+ --field Debloat:chk \
+ --field paru:chk \
+ --field htop:chk \
+ --field nomachine:chk \
+ --field librewolf-bin:chk \
+ --field brave-bin:chk \
+ --field pacseek-bin:chk \
+ --field docker:chk \
+ --field 'Install pkgs from List':chk \
+ --field 'Export pkgs to List':chk \
+ --field Configuration:LBL \
+ --field "Grub Timeout:chk" \
+ --field Konsave:chk \
+ --field Flexo:chk \
+ --field "Enable SSH:chk" \
+ --field ' ':LBL \
+ --field ' ':LBL \
+ --field ' ':LBL \
+ --field ' ':LBL \
+ --field ' ':LBL )
+
+
+
+
 
-yadResults=$(yad --form --columns=3 --field Debloat:chk --field paru:chk --field htop:chk --field nomachine:chk --field librewolf-bin:chk --field pacseek-bin:chk --field docker:chk --field ph:chk --field ph:chk --field ph:chk --column=2 --field Config:LBL --field Grub-Timeout:chk --field Konsave:chk --field Flexo:chk --field Enable-SSH:chk --field ph:chk --field ph:chk --field ph:chk --field ph:chk --field ph:chk --field nop:chk --field:H --field:H --field:H --field:H --field:H --field:H --field:H --field nop:chk)
 #DRIVEPART="`echo $PARTS | cut -d "|" -f 2`"
 echo $yadResults
 
@@ -35,7 +61,7 @@ for i in "${SECTIONS[@]}"; do   # access each element of array
 if [[ $index -eq 0 ]]
 then # DEBLOAT
     if [[ $i == *"TRUE"* ]]; then
-        echo "Uninstalling EOS Extras"
+        echo "Uninstalling EOS Extras: firewalld eos-update-notifier welcome eos-quickstart"
         sudo pacman -R firewalld eos-update-notifier welcome eos-quickstart --noconfirm
     fi
 fi
@@ -120,7 +146,7 @@ if [[ $index -eq 13 ]]
 then
     if [[ $i == *"TRUE"* ]]; then
     echo "Adding Flexo to mirrorlist"
-    echo 'Server = http://206.210.43.222:7878/$repo/os/$arch' | sudo tee -a /etc/pacman.d/mirrorlist
+    echo 'Server = http://10.0.0.101:7878/$repo/os/$arch' | sudo tee -a /etc/pacman.d/mirrorlist
     fi
 fi