diff --git a/0-preinstall.sh b/0-preinstall.sh index 3485cae..a38faa0 100755 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -18,14 +18,15 @@ setfont ter-v22b sed -i 's/^#Para/Para/' /etc/pacman.conf pacman -S --noconfirm reflector rsync mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup -echo -e "-------------------------------------------------------------------------" -echo -e " █████╗ ██████╗ ██████╗██╗ ██╗████████╗██╗████████╗██╗ ██╗███████╗" -echo -e " ██╔══██╗██╔══██╗██╔════╝██║ ██║╚══██╔══╝██║╚══██╔══╝██║ ██║██╔════╝" -echo -e " ███████║██████╔╝██║ ███████║ ██║ ██║ ██║ ██║ ██║███████╗" -echo -e " ██╔══██║██╔══██╗██║ ██╔══██║ ██║ ██║ ██║ ██║ ██║╚════██║" -echo -e " ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║" -echo -e " ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝" -echo -e "-------------------------------------------------------------------------" +echo -e " - -----------------------------------------------------------------------------------" +echo -e " ▀███▀▀▀██▄ ██ ██ ██ ███ " +echo -e " ██ ██ ██ ██ ▄██▄ ██ " +echo -e " ██ ██ ▄▄█▀██████████████ ▄▄█▀██▀███▄███ ▄█▀██▄ ▀███▄███ ▄██▀██ ███████▄ " +echo -e " ██▀▀▀█▄▄▄█▀ ██ ██ ██ ▄█▀ ██ ██▀ ▀▀ ▄█ ▀██ ██▀ ▀▀██▀ ██ ██ ██ " +echo -e " ██ ▀███▀▀▀▀▀▀ ██ ██ ██▀▀▀▀▀▀ ██ ████████ ██ ██ ██ ██ " +echo -e " ██ ▄███▄ ▄ ██ ██ ██▄ ▄ ██ █▀ ██ ██ ██▄ ▄██ ██ " +echo -e " ▄████████ ▀█████▀ ▀████ ▀████ ▀█████▀████▄ ▄███▄ ▄████▄████▄ █████▀████ ████▄ " +echo -e " - -----------------------------------------------------------------------------------" reflector -a 48 -c $iso -f 5 -l 20 --sort rate --save /etc/pacman.d/mirrorlist mkdir /mnt @@ -105,7 +106,7 @@ linux /vmlinuz-linux-hardened initrd /initramfs-linux-hardened.img options root=LABEL=ROOT rw rootflags=subvol=@ EOF -cp -R ~/ArchTitus /mnt/root/ +cp -R ~/BetterArch /mnt/root/ cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist echo "--------------------------------------" echo "-- SYSTEM READY FOR 0-setup --" diff --git a/1-setup.sh b/1-setup.sh index 7bb48f7..9bd3605 100755 --- a/1-setup.sh +++ b/1-setup.sh @@ -1,12 +1,15 @@ #!/usr/bin/env bash -#------------------------------------------------------------------------- -# █████╗ ██████╗ ██████╗██╗ ██╗████████╗██╗████████╗██╗ ██╗███████╗ -# ██╔══██╗██╔══██╗██╔════╝██║ ██║╚══██╔══╝██║╚══██╔══╝██║ ██║██╔════╝ -# ███████║██████╔╝██║ ███████║ ██║ ██║ ██║ ██║ ██║███████╗ -# ██╔══██║██╔══██╗██║ ██╔══██║ ██║ ██║ ██║ ██║ ██║╚════██║ -# ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║ -# ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝ -#------------------------------------------------------------------------- +#------------------------------------------------------------------------------------ +# ▄▄ +#▀███▀▀▀██▄ ██ ██ ██ ███ +# ██ ██ ██ ██ ▄██▄ ██ +# ██ ██ ▄▄█▀██████████████ ▄▄█▀██▀███▄███ ▄█▀██▄ ▀███▄███ ▄██▀██ ███████▄ +# ██▀▀▀█▄▄▄█▀ ██ ██ ██ ▄█▀ ██ ██▀ ▀▀ ▄█ ▀██ ██▀ ▀▀██▀ ██ ██ ██ +# ██ ▀███▀▀▀▀▀▀ ██ ██ ██▀▀▀▀▀▀ ██ ████████ ██ ██ ██ ██ +# ██ ▄███▄ ▄ ██ ██ ██▄ ▄ ██ █▀ ██ ██ ██▄ ▄██ ██ +#▄████████ ▀█████▀ ▀████ ▀████ ▀█████▀████▄ ▄███▄ ▄████▄████▄ █████▀████ ████▄ +# +#------------------------------------------------------------------------------------ echo "--------------------------------------" echo "-- Network Setup --" echo "--------------------------------------" @@ -273,14 +276,14 @@ fi echo -e "\nDone!\n" if ! source install.conf; then read -p "Please enter username:" username -echo "username=$username" >> ${HOME}/ArchTitus/install.conf +echo "username=$username" >> ${HOME}/BetterArch/install.conf fi if [ $(whoami) = "root" ]; then useradd -m -G wheel,libvirt -s /bin/bash $username passwd $username - cp -R /root/ArchTitus /home/$username/ - chown -R $username: /home/$username/ArchTitus + cp -R /root/BetterArch /home/$username/ + chown -R $username: /home/$username/BetterArch else echo "You are already a user proceed with aur installs" fi diff --git a/2-user.sh b/2-user.sh index 27fb0db..6afa471 100755 --- a/2-user.sh +++ b/2-user.sh @@ -1,12 +1,15 @@ #!/usr/bin/env bash -#------------------------------------------------------------------------- -# █████╗ ██████╗ ██████╗██╗ ██╗████████╗██╗████████╗██╗ ██╗███████╗ -# ██╔══██╗██╔══██╗██╔════╝██║ ██║╚══██╔══╝██║╚══██╔══╝██║ ██║██╔════╝ -# ███████║██████╔╝██║ ███████║ ██║ ██║ ██║ ██║ ██║███████╗ -# ██╔══██║██╔══██╗██║ ██╔══██║ ██║ ██║ ██║ ██║ ██║╚════██║ -# ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║ -# ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝ -#------------------------------------------------------------------------- +#------------------------------------------------------------------------------------ +# ▄▄ +#▀███▀▀▀██▄ ██ ██ ██ ███ +# ██ ██ ██ ██ ▄██▄ ██ +# ██ ██ ▄▄█▀██████████████ ▄▄█▀██▀███▄███ ▄█▀██▄ ▀███▄███ ▄██▀██ ███████▄ +# ██▀▀▀█▄▄▄█▀ ██ ██ ██ ▄█▀ ██ ██▀ ▀▀ ▄█ ▀██ ██▀ ▀▀██▀ ██ ██ ██ +# ██ ▀███▀▀▀▀▀▀ ██ ██ ██▀▀▀▀▀▀ ██ ████████ ██ ██ ██ ██ +# ██ ▄███▄ ▄ ██ ██ ██▄ ▄ ██ █▀ ██ ██ ██▄ ▄██ ██ +#▄████████ ▀█████▀ ▀████ ▀████ ▀█████▀████▄ ▄███▄ ▄████▄████▄ █████▀████ ████▄ +# +#------------------------------------------------------------------------------------ echo -e "\nINSTALLING AUR SOFTWARE\n" # 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. @@ -55,9 +58,9 @@ for PKG in "${PKGS[@]}"; do done export PATH=$PATH:~/.local/bin -cp -r $HOME/ArchTitus/dotfiles/* $HOME/.config/ +cp -r $HOME/BetterArch/dotfiles/* $HOME/.config/ pip install konsave -konsave -i $HOME/ArchTitus/kde.knsv +konsave -i $HOME/BetterArch/kde.knsv sleep 1 konsave -a kde diff --git a/3-post-setup.sh b/3-post-setup.sh index 4668ae6..775c681 100755 --- a/3-post-setup.sh +++ b/3-post-setup.sh @@ -1,13 +1,15 @@ #!/usr/bin/env bash -#------------------------------------------------------------------------- -# █████╗ ██████╗ ██████╗██╗ ██╗████████╗██╗████████╗██╗ ██╗███████╗ -# ██╔══██╗██╔══██╗██╔════╝██║ ██║╚══██╔══╝██║╚══██╔══╝██║ ██║██╔════╝ -# ███████║██████╔╝██║ ███████║ ██║ ██║ ██║ ██║ ██║███████╗ -# ██╔══██║██╔══██╗██║ ██╔══██║ ██║ ██║ ██║ ██║ ██║╚════██║ -# ██║ ██║██║ ██║╚██████╗██║ ██║ ██║ ██║ ██║ ╚██████╔╝███████║ -# ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝ -#------------------------------------------------------------------------- - +#------------------------------------------------------------------------------------ +# ▄▄ +#▀███▀▀▀██▄ ██ ██ ██ ███ +# ██ ██ ██ ██ ▄██▄ ██ +# ██ ██ ▄▄█▀██████████████ ▄▄█▀██▀███▄███ ▄█▀██▄ ▀███▄███ ▄██▀██ ███████▄ +# ██▀▀▀█▄▄▄█▀ ██ ██ ██ ▄█▀ ██ ██▀ ▀▀ ▄█ ▀██ ██▀ ▀▀██▀ ██ ██ ██ +# ██ ▀███▀▀▀▀▀▀ ██ ██ ██▀▀▀▀▀▀ ██ ████████ ██ ██ ██ ██ +# ██ ▄███▄ ▄ ██ ██ ██▄ ▄ ██ █▀ ██ ██ ██▄ ▄██ ██ +#▄████████ ▀█████▀ ▀████ ▀████ ▀█████▀████▄ ▄███▄ ▄████▄████▄ █████▀████ ████▄ +# +#------------------------------------------------------------------------------------ echo -e "\nFINAL SETUP AND CONFIGURATION" # ------------------------------------------------------------------------ diff --git a/README.md b/README.md index ee001c7..39a4fcc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ArchTitus Installer Script +# BetterArch Installer Script @@ -17,9 +17,9 @@ From initial Prompt type the following commands: ``` pacman -Sy git -git clone https://github.com/71Zombie/ArchTitus -cd ArchTitus -./archtitus.sh +git clone https://github.com/71Zombie/BetterArch +cd BetterArch +./BetterArch.sh ``` ### System Description diff --git a/archtitus.sh b/archtitus.sh index db537b3..39a36cc 100755 --- a/archtitus.sh +++ b/archtitus.sh @@ -1,7 +1,7 @@ #!/bin/bash bash 0-preinstall.sh - arch-chroot /mnt /root/ArchTitus/1-setup.sh - source /mnt/root/ArchTitus/install.conf - arch-chroot /mnt /usr/bin/runuser -u $username -- /home/$username/ArchTitus/2-user.sh - arch-chroot /mnt /root/ArchTitus/3-post-setup.sh \ No newline at end of file + arch-chroot /mnt /root/BetterArch/1-setup.sh + source /mnt/root/BetterArch/install.conf + arch-chroot /mnt /usr/bin/runuser -u $username -- /home/$username/BetterArch/2-user.sh + arch-chroot /mnt /root/BetterArch/3-post-setup.sh \ No newline at end of file diff --git a/kderice-backup.sh b/kderice-backup.sh index dbc109f..d359a87 100755 --- a/kderice-backup.sh +++ b/kderice-backup.sh @@ -1,5 +1,5 @@ #!/bin/bash -cp -r $HOME/.config/kitty $HOME/ArchTitus/dotfiles/kitty +cp -r $HOME/.config/kitty $HOME/BetterArch/dotfiles/kitty konsave -s kde konsave -e kde \ No newline at end of file diff --git a/kderice-restore.sh b/kderice-restore.sh index ee2b8aa..628072a 100755 --- a/kderice-restore.sh +++ b/kderice-restore.sh @@ -1,8 +1,8 @@ #!/bin/bash export PATH=$PATH:~/.local/bin -cp -r $HOME/ArchTitus/dotfiles/* $HOME/.config/ +cp -r $HOME/BetterArch/dotfiles/* $HOME/.config/ pip install konsave -konsave -i $HOME/ArchTitus/kde.knsv +konsave -i $HOME/BetterArch/kde.knsv sleep 1 konsave -a kde