Updated formfactors

chrootInstall.sh

@@ -86,7 +86,7 @@ fi
 # disable kernel watchdog
 echo 'blacklist iTCO_wdt' > /etc/modprobe.d/blacklist.conf
 
-if [ "$formfactor" == 1 ]; then
+if [ "$formfactor" == 2 ]; then
     pacman -R xorg-xbacklight --noconfirm
     pacman -S powertop acpid-openrc acpilight --needed --noconfirm
     rc-update add acpid
@@ -100,13 +100,13 @@ fi
 chmod -R 700 /home
 
 # installing desktop environment and addons + utilities
-if [ "$formfactor" -lt 3 ] || [ "$formfactor" == 4 ]; then
+if [ "$formfactor" -lt 4 ]; then
     pacman -S pipewire pipewire-pulse pipewire-jack pipewire-alsa plasma-desktop sddm-openrc sddm-kcm kscreen kdeplasma-addons spectacle gwenview plasma-nm plasma-pa breeze-gtk kde-gtk-config kio-extras khotkeys kwalletmanager pcmanfm-qt yakuake ark kate bluedevil bluez --needed --noconfirm
     rc-update add sddm
 fi
 
 # installing and configuring basic software packages
-if [ "$formfactor" == 3 ]; then
+if [ "$formfactor" == 4 ]; then
     pacman -S openssh --needed --noconfirm
     mkdir /home/"$username"/.ssh
     touch /home/"$username"/.ssh/authorized_keys

install.sh

@@ -10,7 +10,7 @@ read -n 1 -s -r -p 'Press any key to continue'
 
 # start questions
 echo Special Devices:
-echo -e '\nspecial devices:\n1. asus rog zephyrus g14 2020\ngeneric:\n2. laptop\n3. desktop\n4. server\n'
+echo -e '\nspecial devices:\n1. asus rog zephyrus g14 2020 (not yet supported)\ngeneric:\n2. laptop\n3. desktop\n4. server\n'
 read -n 1 -r -p "formfactor: " formfactor
 
 fdisk -l
@@ -152,9 +152,7 @@ echo "$hostname" > /mnt/etc/hostname
 
 # installing base packages
 base_devel='autoconf automake binutils bison fakeroot file findutils flex gawk gcc gettext grep groff pigz pbzip2 libtool m4 make pacman patch pkgconf sed opendoas texinfo which'
-if [ "$formfactor" -lt 3 ]; then
 basestrap /mnt base $base_devel openrc elogind-openrc linux linux-firmware
-fi
 
 # exporting variables
 mkdir /mnt/tempfiles