diff --git a/archlabs-installer b/archlabs-installer index 00a9f96..547a3c1 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -30,7 +30,7 @@ BASE_PKGS+="ffmpeg gstreamer gst-libav gst-plugins-base gst-plugins-good bash-co AL_BASE_PKGS="archlabs-icons archlabs-fonts archlabs-themes archlabs-baph " AL_BASE_PKGS+="archlabs-wallpapers archlabs-scripts archlabs-skel-base" -WM_BASE_PKGS="arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome " +WM_BASE_PKGS="arandr nitrogen polkit-gnome network-manager-applet " WM_BASE_PKGS+="volumeicon xclip exo laptop-detect xdotool compton wmctrl feh " WM_BASE_PKGS+="gnome-keyring dunst gsimplecal xfce4-power-manager xfce4-settings" @@ -1357,14 +1357,12 @@ install_user() done fi - [[ $MYSHELL != 'bash' ]] && rm -f "$MNT/home/$NEWUSER/.bash_profile" - [[ $WM_PKGS == *xfce* ]] && echo 'volumeicon &' >> "$MNT/home/$NEWUSER/.xprofile" + [[ $MYSHELL != 'bash' ]] && rm -rf "$MNT/home/$NEWUSER/.bash"* # remove some commands from ~/.xprofile when using KDE or Gnome as the login session if [[ $LOGIN_WM =~ (startkde|gnome-session) || ($LOGIN_TYPE != 'xinit' && $WM_PKGS =~ (plasma|gnome)) ]]; then sed -i '/super/d; /nitrogen/d; /compton/d' "$MNT/home/$NEWUSER/.xprofile" "$MNT/root/.xprofile" - elif [[ $INSTALL_WMS == 'dwm' ]]; then - # and dwm + elif [[ $INSTALL_WMS == 'dwm' ]]; then # and dwm sed -i '/super/d; /compton/d' "$MNT/home/$NEWUSER/.xprofile" "$MNT/root/.xprofile" fi @@ -1423,6 +1421,7 @@ install_packages() else [[ $INSTALL_WMS =~ ^(plasma|gnome|cinnamon)$ ]] || inpkg+="archlabs-ksuperkey " [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps|fluxbox) ]] && inpkg+="$WM_BASE_PKGS " + [[ $inpkg =~ (term|gnome|xfce|plasma|cinnamon|rxvt|tilda|tilix|sakura) ]] || inpkg+="xterm " fi # update and install crucial packages first to avoid issues