From 8e77735b22e72c9785aff5d6564b1236252c9a36 Mon Sep 17 00:00:00 2001
From: Guus van Meerveld <mail@guusvanmeerveld.dev>
Date: Wed, 24 May 2023 22:03:58 +0000
Subject: [PATCH] improve order or scripts

---
 dotfiles                           | 7 +------
 installer                          | 4 ----
 scripts/configuration/applications | 3 +++
 scripts/install/arch               | 4 ++++
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dotfiles b/dotfiles
index 2222531..68083eb 100755
--- a/dotfiles
+++ b/dotfiles
@@ -11,14 +11,9 @@ case $1 in
     ;;
 
     install)
-				~/dotfiles/installer
+        ~/dotfiles/installer
     ;;
 
-    install-server)
-        sudo apt install python3 neovim curl zsh -y
-
-        $ROOT/install -c "$DOTFILES/install-server.yaml"
-    ;;
 
     *)
         echo "Commands:"
diff --git a/installer b/installer
index 54297e3..a8247d4 100755
--- a/installer
+++ b/installer
@@ -75,10 +75,6 @@ if ping -q -c 1 -W 1 8.8.8.8 &>/dev/null; then
 			$install_scripts/arch $dotfiles
 		fi
 
-		$scripts/configuration/utils $dotfiles
-		$scripts/configuration/applications $dotfiles
-
-		
 	else
 		echo "You don't have sudo rights, exiting..."
 	fi
diff --git a/scripts/configuration/applications b/scripts/configuration/applications
index 55bf431..b4989d2 100755
--- a/scripts/configuration/applications
+++ b/scripts/configuration/applications
@@ -13,6 +13,9 @@ systemctl enable --now --user pipewire-pulse
 echo "Adding user to docker group..."
 sudo usermod -aG docker $USER
 
+echo "Setting locale"
+$scripts/set-locale
+
 echo "Enabling ly..."
 sudo systemctl enable ly
 
diff --git a/scripts/install/arch b/scripts/install/arch
index 0c3c52b..545b55b 100755
--- a/scripts/install/arch
+++ b/scripts/install/arch
@@ -19,8 +19,12 @@ packages_list=$(sed '/^$|^#/d' $utils)
 
 yay -S --needed --noconfirm $packages_list
 
+$scripts/configuration/utils $dotfiles
+
 echo "Installing applications"
 applications=$packages/applications/arch
 packages_list=$(sed '/^$|^#/d' $applications)
 
 yay -S --needed --noconfirm $packages_list
+
+$scripts/configuration/applications $dotfiles
\ No newline at end of file