diff --git a/2-user.sh b/2-user.sh index 525ff07..1d7b8a9 100755 --- a/2-user.sh +++ b/2-user.sh @@ -17,17 +17,26 @@ Installing AUR Softwares # You can solve users running this script as root with this and then doing the same for the next for statement. However I will leave this up to you. source $HOME/ArchTitus/setup.conf -cd ~ -git clone "https://aur.archlinux.org/yay.git" -cd ~/yay -makepkg -si --noconfirm -cd ~ +addAUR () { + cd ~ + git clone "https://aur.archlinux.org/$1.git" + cd ~/$1 + makepkg -si --noconfirm + cd ~ +} + +if [${AURHELPER} -ne ""] then + addAUR ${AURHELPER} +fi + touch "~/.cache/zshhistory" git clone "https://github.com/ChrisTitusTech/zsh" git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/powerlevel10k ln -s "~/zsh/.zshrc" ~/.zshrc -yay -S --noconfirm --needed - < ~/ArchTitus/pkg-files/aur-pkgs.txt +for PACKAGE in $(cat ~/ArchTitus/pkg-files/aur-pkgs.txt) do + addAUR $PACKAGE +esac export PATH=$PATH:~/.local/bin cp -r ~/ArchTitus/dotfiles/* ~/.config/ diff --git a/startup.sh b/startup.sh index 1aa56bb..cdd1659 100644 --- a/startup.sh +++ b/startup.sh @@ -108,6 +108,37 @@ read -p "Your key boards layout:" keymap set_option KEYMAP $keymap } +aurHelper () { +echo -ne " +Pick your AUR helper: + 1) yay + 2) paru + 3) other + 4) none +" +read -p "AUR helper: " aurHelperNum +case $aurHelperNum in + "1") + set_option AURHELPER "yay" + ;; + "2") + set_option AURHELPER "paru" + ;; + "3") + read -p "AUR helper (must be packadge in AUR): " aurHelper + set_option AURHELPER aurHelper + ;; + "4") + set_option aurHelper "" + ;; + *) + echo "" + echo "that is a invalid option" + aurHelper + ;; +esac +} + drivessd () { echo -ne " Is this an ssd? yes/no: @@ -158,15 +189,23 @@ set_option nameofmachine $nameofmachine clear logo userinfo + +clear +logo +aurHelper + clear logo diskpart + clear logo filesystem + clear logo timezone + clear logo -keymap \ No newline at end of file +keymap