diff --git a/README.org b/README.org index 35eb42d..37de1ef 100644 --- a/README.org +++ b/README.org @@ -17,7 +17,6 @@ - [[#check-that-user-is-not-root][Check that user is NOT root!]] - [[#error-handling][Error Handling]] - [[#sync-the-repos-and-install-dialog][Sync The Repos, and Install 'dialog']] -- [[#sync-the-aur-too][Sync the AUR too.]] - [[#the-welcome-message][The Welcome Message]] - [[#adding-the-cbsh-repos-to-your-system][Adding the CBSH Repos to your system.]] - [[#adding-keyservers-to-gpgconf][Adding keyservers to gpg.conf]] @@ -28,7 +27,7 @@ - [[#installation-complete][Installation Complete!]] * About CBSH -CBSH is the name for a set of Linux Postinstall Scripts that give you my set of programs i use and my Desktop Layout, for both Arch and Debian based distros. +CBSH is the name for a set of Linux Postinstall Scripts that give you my set of programs i use and my Desktop Layout, for both Arch and [[https://gitlab.com/Cabooshyy/cbsh-deb][Debian]] based distros. * Installing CBSH ** Install Instructions @@ -125,22 +124,6 @@ echo "########################################################################" sudo pacman --noconfirm --needed -Syu dialog || error "Error syncing the repos." #+end_src -* Sync the AUR too. -#+begin_src bash -echo "###################################################" -echo "###### install yay and Sync the AUR As Well. ######" -echo "###################################################" -if [!"command -v yay"]; then - sudo pacman -S --needed git base-devel - git clone https://aur.archlinux.org/yay-bin.git - cd yay-bin - makepkg -si - yay -Syu -else - yay -Syu -fi -#+end_src - * The Welcome Message #+begin_src bash welcome () { \ @@ -186,10 +169,13 @@ All packages listed are either in the standard Arch Repos or in my CBSH repos. t #+begin_src bash # Let's install all of the packages listed in the pkglist.txt file. sudo pacman --needed --ask 4 -Syu - < pkglist.txt + +# Now that pikaur is installed, we can sync the AUR and install some needed packages (Nerd Fonts) from there. +pikaur -S nerd-fonts-source-code-pro nerd-fonts-fira-code pa-applet #+end_src * Copying over the configs from /etc/cbsh to $HOME -Pacman cannot install files to $HOME, so normally we place them in /etc/skel, but as some distro's such as Manjaro and Arco use /etc/skel for their own specific config files, we place them in /etc/cbsh so there are no conflicts on any arch based distro. the config files are placed here and then copied over to $HOME, we backup config just in case anything goes wrong. BEWARE! +Pacman cannot install files to $HOME, so normally we place them in /etc/skel, but as some distros such as Manjaro and Arco use /etc/skel for their own specific config files, we place them in /etc/cbsh so there are no conflicts on any arch based distro. the config files are placed here and then copied over to $HOME, we backup config just in case anything goes wrong. BEWARE! ~NOTE:~ The /etc/cbsh directory contains all of the files and directories that will get automatically copied to a new users $HOME when they are created using `useradd` or `adduser` depending on the distro. @@ -201,7 +187,7 @@ echo "#########################################################" [ -d /etc/cbsh ] && mkdir ~/cbsh-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf /etc/cbsh ~/cbsh-backup-$(date +%Y.%m.%d-%H%M) [ ! -d ~/.config ] && mkdir ~/.config [ -d ~/.config ] && mkdir ~/.config-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M) -cd /etc/cbsh && sudo mv .config/qtile/qtile .config/qtile && cp -Rf . ~ && cd - +cd /etc/cbsh && sudo mv .config/qtile/qtile/* .config/qtile && sudo rm -r .config/qtile/qtile && cp -Rf . ~ && cd - #+end_src #+begin_src bash diff --git a/cbsh_arch.sh b/cbsh_arch.sh index 0a222a0..72828a5 100755 --- a/cbsh_arch.sh +++ b/cbsh_arch.sh @@ -30,19 +30,6 @@ echo "###### Syncing the Repos and installing 'dialog' if not installed ######" echo "########################################################################" sudo pacman --noconfirm --needed -Syu dialog || error "Error syncing the repos." -echo "###################################################" -echo "###### install yay and Sync the AUR As Well. ######" -echo "###################################################" -if [!"command -v yay"]; then - sudo pacman -S --needed git base-devel - git clone https://aur.archlinux.org/yay-bin.git - cd yay-bin - makepkg -si - yay -Syu -else - yay -Syu -fi - welcome () { \ dialog --colors --title "\Z7\ZbInstalling CBSH!" --msgbox "\Z4This Postinstall Script will install my Qtile Desktop as well as Doom Emacs, Zsh with the Starship Prompt, the Kitty Shell and some other essential programs to make my dotfiles and programs work.\\n\\n-Cabooshy" 16 60 @@ -70,7 +57,10 @@ addkeyservers() { \ addkeyservers || err "Error adding the Keyservers to /etc/pacman.d/gnupg/gpg.conf" # Let's install all of the packages listed in the pkglist.txt file. -sudo pacman --needed --ask 4 -Sy - < pkglist.txt +sudo pacman --needed --ask 4 -Syu - < pkglist.txt + +# Now that pikaur is installed, we can sync the AUR and install some needed packages (Nerd Fonts) from there. +pikaur -S nerd-fonts-source-code-pro nerd-fonts-fira-code pa-applet echo "#########################################################" echo "## Copying the config files from /etc/cbsh into \$HOME ##" @@ -79,7 +69,7 @@ echo "#########################################################" [ -d /etc/cbsh ] && mkdir ~/cbsh-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf /etc/cbsh ~/cbsh-backup-$(date +%Y.%m.%d-%H%M) [ ! -d ~/.config ] && mkdir ~/.config [ -d ~/.config ] && mkdir ~/.config-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M) -cd /etc/dtos && sudo mv -r .config/qtile/qtile .config/qtile && cp -Rf . ~ && cd - +cd /etc/cbsh && sudo mv .config/qtile/qtile/* .config/qtile && sudo rm -r .config/qtile/qtile && cp -Rf . ~ && cd - # Change all scipts in .local/bin to be executable. find $HOME/.local/bin -type f -print0 | xargs -0 chmod 775 diff --git a/pkglist.txt b/pkglist.txt index 4e57511..182e707 100644 --- a/pkglist.txt +++ b/pkglist.txt @@ -33,6 +33,7 @@ qutebrowser ripgrep sddm starship +ttf-font-awesome ttf-ubuntu-font-family xorg-server xorg-xkill