From 3669ece6039297c744a187240e86b5cde48a47ea Mon Sep 17 00:00:00 2001
From: Maddox Werts <accounts@objnull.net>
Date: Thu, 21 Aug 2025 22:28:09 -0400
Subject: [PATCH] Optimized the Installer File

---
 Installation/arch.sh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Installation/arch.sh b/Installation/arch.sh
index 51d58b2..9d6e99b 100644
--- a/Installation/arch.sh
+++ b/Installation/arch.sh
@@ -9,11 +9,11 @@ gnome_install() {
     FLH_INSTALL='sudo flatpak install -y'
 
     # Installing System Packages
+    $SYS_INSTALL gparted
     $SYS_INSTALL fractal
     $SYS_INSTALL cartridges
 
     # Installing FLH Apps
-    $FLH_INSTALL flathub ar.xjuan.Cambalache
     $FLH_INSTALL flathub net.nokyan.Resources
 }
 gnome_debloat() {
@@ -56,7 +56,7 @@ kde_install() {
     $SYS_INSTALL korganizer kaddressbook
     $SYS_INSTALL kvantum
     $SYS_INSTALL fish
-    $SYS_INSTALL element-desktop
+    $SYS_INSTALL element-desktop filezilla
 }
 kde_themes() {
     echo "## KDE THEMING ##"
@@ -78,11 +78,16 @@ sway_install() {
     # All System Commands
     SYS_INSTALL='sudo pacman -Sy --noconfirm'
     FLH_INSTALL='sudo flatpak install -y'
+    AUR_INSTALL='yay -S --noconfirm'
 
     # Installing System Packages
     $SYS_INSTALL alacritty rclone yazi rofi wl-clipboard btop pacman-contrib
     $SYS_INSTALL galculator 7zip
-    $SYS_INSTALL gvim 
+    $SYS_INSTALL gvim
+    $SYS_INSTALL filezilla
+
+    # System Packages
+    $AUR_INSTALL qimgv
 }
 sway_debloat() {
     # All System Commands
@@ -153,13 +158,13 @@ install_pacman() {
 
 	# Internet
 	$SYS_INSTALL resolvconf dnsutils dnsmasq
-	$SYS_INSTALL filezilla thunderbird
+	$SYS_INSTALL thunderbird
 
 	# Security
 	$SYS_INSTALL keepassxc
 
 	# Utilities
-	$SYS_INSTALL libreoffice gparted easytag
+	$SYS_INSTALL libreoffice easytag
 	$SYS_INSTALL audacity
 
 	# Development
@@ -179,9 +184,6 @@ install_aur() {
     # Base Dependencies
     $AUR_INSTALL zen-browser-bin
 
-    # System
-    $AUR_INSTALL qimgv
-
     # Internet
     $AUR_INSTALL cinny-desktop-bin
 
@@ -210,6 +212,9 @@ install_flat() {
 
 # Entry Point
 main() {
+    # Installing Pre-Reqs
+    install_yay
+
     ## Desktop Specific Operations ##
     if [ "$XDG_CURRENT_DESKTOP" == "Gnome" ]; then
         gnome
@@ -220,7 +225,6 @@ main() {
     fi
 
     # Installing Software
-    install_yay
     install_pacman
     install_aur
     install_flat