From 7680fd747fd92ae008b32a462eb749a16a286b4b Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Tue, 23 Jul 2024 17:13:32 +0330
Subject: [PATCH] changed build phase, fixed sudo added plasma

---
 setup/trinity | 16 ++++++++--------
 setup/xfce    | 19 +++++--------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/setup/trinity b/setup/trinity
index c6fcb1c..7f71914 100755
--- a/setup/trinity
+++ b/setup/trinity
@@ -7,19 +7,19 @@ sed -i 's/#\(en_US.UTF-8 UTF-8\)/\1/g' /etc/locale.gen
 locale-gen
 echo 'LANG=en_US.UTF-8' > /etc/locale.conf
 
+
+# Fix Pacman.conf
+rm -f /etc/pacman.conf
+curl https://raw.githubusercontent.com/parchlinux-ports/Parchlinuxarm-images/main/examples/pacman.conf.example >> /etc/pacman.conf
+
+# Enable Sudo
+sudo sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
+
 pacman-key --recv-keys 0x8685AD8B
 
 # Add archsink repo
 cat <<EOF >> /etc/pacman.conf
 
-[archsink]
-Server = https://github.com/archsink/\$arch/releases/latest/download
-SigLevel = Never
-
-[ppr]
-Server = https://raw.githubusercontent.com/parchlinux-arm/ppr/main/aarch64/
-SigLevel = Never
-
 [trinity]
 Server = https://mirror.ppa.trinitydesktop.org/trinity/archlinux/\$arch
 SigLevel = Never
diff --git a/setup/xfce b/setup/xfce
index cb28dac..df10cfe 100755
--- a/setup/xfce
+++ b/setup/xfce
@@ -7,21 +7,12 @@ sed -i 's/#\(en_US.UTF-8 UTF-8\)/\1/g' /etc/locale.gen
 locale-gen
 echo 'LANG=en_US.UTF-8' > /etc/locale.conf
 
-# Add archsink repo
-cat <<EOF >> /etc/pacman.conf
+# Fix Pacman.conf
+rm -f /etc/pacman.conf
+curl https://raw.githubusercontent.com/parchlinux-ports/Parchlinuxarm-images/main/examples/pacman.conf.example >> /etc/pacman.conf
 
-[archsink]
-Server = https://github.com/archsink/\$arch/releases/latest/download
-SigLevel = Never
-
-[ppr]
-Server = https://raw.githubusercontent.com/parchlinux-arm/ppr/main/aarch64/
-SigLevel = Never
-
-EOF
-
-# Enable parallel downloads
-sed -i 's/#\(ParallelDownloads \)/\1/g' /etc/pacman.conf
+# Enable Sudo
+sudo sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
 
 # Install useful packages
 packages=(