diff --git a/installer b/installer index 3a84e86..90093b6 100755 --- a/installer +++ b/installer @@ -6,7 +6,7 @@ # AIF, Calamares, and the Arch Wiki.. Credit where credit is due # shellcheck disable=2086,2046,2254,2164,2030,2031 -VER=2.14 +VER=2.15 # default values { @@ -1970,10 +1970,12 @@ install_cleanup() fi cat >> "$MNT/etc/profile" <<- EOF + $([[ $VIRT != 'none' && $INSTALL_WMS =~ sway ]] && echo -e "# disable hardware cursor for sway in VM\nexport WLR_NO_HARDWARE_CURSORS=1") # add ~/.local/bin to the PATH echo \$PATH | grep -q "/home/$user/.local/bin:" || export PATH="/home/$user/.local/bin:\$PATH" EOF + # set the keyboard layout for sway session [[ $INSTALL_WMS =~ sway ]] && sed -i "s/\(set.*\$lang.*\)us/\1$CMAP/" "$MNT/home/$user/.config/sway/variables" @@ -3795,7 +3797,7 @@ system_identify() SYS="BIOS" fi - if hash nmtui >/dev/null 2>&1; then + if hash nmtui >/dev/null 2>&1 && [[ $(systemctl is-active NetworkManager.service) == "active" ]]; then NET_TYPE=networkmanager else NET_TYPE=iwd