diff --git a/archlabs-installer b/archlabs-installer index df238a2..209e56b 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -1462,9 +1462,7 @@ install_user() if [[ $MYSHELL != *zsh ]]; then chrun "usermod -s $MYSHELL root" 2>$ERR errshow 1 "usermod -s $MYSHELL root" - if [[ $MYSHELL == "/usr/bin/mksh" ]]; then - cp -fv $MNT/etc/skel/.mkshrc /root/.mkshrc - fi + [[ $MYSHELL == "/usr/bin/mksh" ]] && cp -fv $MNT/etc/skel/.mkshrc /root/.mkshrc fi local groups='audio,autologin,floppy,log,network,rfkill,scanner,storage,optical,power,wheel' @@ -1482,28 +1480,6 @@ install_user() cp -rfv $MNT/home/$NEWUSER/.vim/colors $MNT/home/$NEWUSER/.config/nvim/colors fi - if [[ $MYSHELL == '/usr/bin/mksh' ]]; then - cat >> $MNT/home/$NEWUSER/.mkshrc << EOF -# colors in less (manpager) -export LESS_TERMCAP_mb=$'\e[01;31m' -export LESS_TERMCAP_md=$'\e[01;31m' -export LESS_TERMCAP_me=$'\e[0m' -export LESS_TERMCAP_se=$'\e[0m' -export LESS_TERMCAP_so=$'\e[01;44;33m' -export LESS_TERMCAP_ue=$'\e[0m' -export LESS_TERMCAP_us=$'\e[01;32m' - -export EDITOR=$([[ $USER_PKGS == *neovim* ]] && printf "n")vim - -# source shell configs -for f in "\$HOME/.mksh/"*?.sh; do - . "\$f" -done - -al-info -EOF - fi - [[ $INSTALL_WMS == *dwm* ]] && install_suckless [[ $LOGIN_WM =~ (startkde|gnome-session) ]] && sed -i '/super/d' $MNT/home/$NEWUSER/.xprofile /root/.xprofile @@ -1513,17 +1489,7 @@ EOF install_login() { SERVICE="$MNT/etc/systemd/system/getty@tty1.service.d" - - # remove welcome message sed -i '/printf/d' $MNT/root/.zshrc - - # remove unneeded shell files from installation - case $MYSHELL in - "/bin/bash") rm -rf $MNT/home/$NEWUSER/.{zsh,mksh}* $MNT/root/.{zsh,mksh}* ;; - "/usr/bin/mksh") rm -rf $MNT/home/$NEWUSER/.{zsh,bash}* $MNT/home/$NEWUSER/.inputrc $MNT/root/.{zsh,bash}* $MNT/root/.inputrc ;; - "/usr/bin/zsh") rm -rf $MNT/home/$NEWUSER/.{bash,mksh}* $MNT/home/$NEWUSER/.inputrc $MNT/root/.{bash,mksh}* $MNT/root/.inputrc ;; - esac - install_${LOGIN_TYPE:-xinit} } @@ -1539,7 +1505,7 @@ install_xinit() if [[ $AUTOLOGIN ]]; then sed -i "s/root/${NEWUSER}/g" $SERVICE/autologin.conf - cat > $MNT/home/$NEWUSER/$LOGINRC << EOF + cat > $MNT/home/$NEWUSER/$LOGINRC <