Beta 25.04.04-2: made setup functionnal again

setup.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
-version="Beta 25.04.04"
+version="Beta 25.04.04-2"
 
-echo "Atlas Desktop Installer - ${version}\n"
+echo -e "Atlas Desktop Installer - ${version}\n"
 
 # Definitions
 
@@ -15,14 +15,14 @@ dotfiles_path="~/.dotfiles"
 
 ## Functions
 function install() {
-    echo "Downloading $1 packages"
-    # sudo pacman -Syu --noconfirm --color auto $(cat $pkgs_path/$1.pkgs)
-    echo "Done"
+    echo -e "\nDownloading $1 packages...\n"
+    sudo pacman -Syu --noconfirm --color auto $(cat $pkgs_path/$1.pkgs)
+    echo -e "\n\nDone\n"
 }
-function install-aur() {
-    echo "Downloading $1 packages"
-    # paru -Syu --noconfirm $(cat $pkgs_path/$1.pkgs)
-    echo "Done"
+function install_aur() {
+    echo -e "\nDownloading $1 packages...\n"
+    paru -Syu --noconfirm --color auto $(cat $pkgs_path/$1.pkgs)
+    echo -e "\nDone\n"
 }
 
 
@@ -36,61 +36,76 @@ if [ $? != 0 ]; then
 fi
 
 ## Scripts presence
-if [ ! -d $pkgs_path ]; then
+if [ ! -d "$pkgs_path" ]; then
     echo "Couldn't find 'packages' folder inside ${script_path}"
     exit 1
 fi
 
-if [ ! -d $config_path ]; then
+if [ ! -d "$config_path" ]; then
     echo "Couldn't find 'config' folder inside ${script_path}"
     exit 1
 fi
-# Install packages
 
-echo "--- Downloading packages ---"
 
-## 
+# Installation
+
+echo "--- Installation ---"
+
+## Main packages
 install core
 install cli-dev-tools
 install fonts
 install desktop
 install theming
 
-## Install vendor specific software 
+## Vendor specific packages 
 if [ $CPU_vendor == "Genuine Intel" ]; then 
     install intel
 fi
 
-## Install paru
+## Paru
 git clone https://aur.archlinux.org/paru.git /tmp/paru &&
+echo "Installing paru" &&
 cd /tmp/paru &&
 makepkg -si
 cd $script_path
 
-install-aur aur
+## AUR packages
+install_aur aur
+
 
 # Configuration
 
+echo -e "\n--- Configuration ---\n"
+
 ## Dotfiles
+echo "Copying configuration files"
 cp $config_path $dotfiles_path &&
 cd $dotfiles_path &&
 stow .
 cd $script_path
 
+## Install launcher theme (albert)
+sudo ln -s .config/albert/schemes/Seventy\ Eight.qss /usr/share/albert/widgetsboxmodel/themes/
+
 ## Swap (Zram)
 is_zram_active=$(sudo systemctl is-active systemd-zram-setup@zram0.service)
 if [ is_zram_active != "active" ]; then 
-    ...
+    echo -e "\n========================================"
+    echo "WARNING: you don't have Zram enabled"
+    echo "Since this script is not yet capable of activating zram, you'll have to do it yourself"
+    echo "Please refer to https://wiki.archlinux.org/title/Zram#Using_zram-generator"
+    echo -e "========================================\n"
 fi
 
 ## Mandatory Access Control (Apparmor)
 is_aa_active=$(sudo systemctl is-active apparmor.service)
 if [ is_aa_active != "active" ]; then 
-    echo "========================================"
-    echo "WARNING: you don't have apparmor enabled"
-    echo "Since this script is not yet capable to handle kernel parameters, you'll have to do it yourself"
+    echo -e "\n========================================"
+    echo "WARNING: you don't have AppArmor enabled"
+    echo "Since this script is not yet capable of managing kernel parameters, you'll have to do it yourself"
     echo "Please refer to https://wiki.archlinux.org/title/AppArmor"
-    echo "========================================"
+    echo -e "========================================\n"
 fi
 
 ## Display manager (Greetd)
@@ -106,4 +121,5 @@ fastfetch
 echo
 echo "Installation finished"
 echo "Please check the previous outputs for warnings"
-echo "You can make final adjustements before rebooting"
+echo "You can make final adjustements before rebooting"
+echo "- In particular, if you are using a qwerty keyboard, changing input-fr to input-en in ~/.config/hypr/hyprland.conf"