diff --git a/.install/arch.sh b/.install/arch.sh index 4e366c1..68b9933 100644 --- a/.install/arch.sh +++ b/.install/arch.sh @@ -11,15 +11,15 @@ output::section "Arch Packages" -# List created using: yay -Qqen > packages.native.list +# List created using: paru -Qqen > packages.native.list if output::prompt "Do you want to install Arch packages?"; then output::log "Updating package database" - yay -Syy |& output::debug + paru -Syy |& output::debug output::success "Package database successfully updated" package_count=$(< "${INSTALL_DIR}/packages/packages.native.list" wc -l) output::log "Installing ${package_count} packages" - yay -S \ + paru -S \ --asexplicit \ --noconfirm \ --sudoloop \ diff --git a/.install/aur.sh b/.install/aur.sh index f611c4d..da200b7 100644 --- a/.install/aur.sh +++ b/.install/aur.sh @@ -11,15 +11,15 @@ output::section "AUR Packages" -# List created using: yay -Qqem > packages.aur.list +# List created using: paru -Qqem > packages.aur.list if output::prompt "Do you want to install AUR packages?"; then output::log "Updating package database" - yay -Syy |& output::debug + paru -Syy |& output::debug output::success "Package database successfully updated" package_count=$(< "${INSTALL_DIR}/packages/packages.aur.list" wc -l) output::log "Installing ${package_count} packages. This may take a few hours" - yay -S \ + paru -S \ --asexplicit \ --noconfirm \ --sudoloop \ diff --git a/.install/prerequisites.sh b/.install/prerequisites.sh index 117f24d..61ad254 100644 --- a/.install/prerequisites.sh +++ b/.install/prerequisites.sh @@ -15,18 +15,18 @@ output::log "Installing requirements for install script" sudo pacman -S sudo ccache git base-devel --noconfirm --needed |& output::debug output::success "Requirements successfully installed" -is_yay_installed=$(command -v yay) -output::log "Installing yay" -if [ -z "${is_yay_installed}" ]; then +is_paru_installed=$(command -v paru) +output::log "Installing paru" +if [ -z "${is_paru_installed}" ]; then TMP_DIR=$(mktemp -d) - git clone https://aur.archlinux.org/yay.git "${TMP_DIR}" |& output::debug + git clone https://aur.archlinux.org/paru.git "${TMP_DIR}" |& output::debug ( cd "${TMP_DIR}"|| exit makepkg -si --noconfirm --skippgpcheck |& output::debug ) - output::success "yay installed" + output::success "paru installed" else - output::success "Yay is already installed" + output::success "paru is already installed" fi \ No newline at end of file diff --git a/.install/symlinks.sh b/.install/symlinks.sh index 065e7aa..0b50fc5 100644 --- a/.install/symlinks.sh +++ b/.install/symlinks.sh @@ -35,6 +35,7 @@ CONFIG_LINKED_FILES_HOME=( ".config/npm" ".config/octave" ".config/pacman" + ".config/paru" ".config/polybar" ".config/python" ".config/redshift" diff --git a/system/.config/paru/paru.conf b/system/.config/paru/paru.conf new file mode 100644 index 0000000..9d5acac --- /dev/null +++ b/system/.config/paru/paru.conf @@ -0,0 +1,7 @@ +[options] +NewsOnUpgrade +Devel +SudoLoop +UpgradeMenu +RemoveMake +NoCheck \ No newline at end of file diff --git a/system/.config/polybar/scripts/update-count b/system/.config/polybar/scripts/update-count index 0fea0a2..22aeebc 100755 --- a/system/.config/polybar/scripts/update-count +++ b/system/.config/polybar/scripts/update-count @@ -12,6 +12,6 @@ # USAGE: # ./update-count UPDATES=$(checkupdates | wc -l) -AUR_UPDATES=$(yay -Qua --devel 2>&1 | wc -l) +AUR_UPDATES=$(paru -Qua --devel 2>&1 | wc -l) echo "${UPDATES} / ${AUR_UPDATES}" \ No newline at end of file diff --git a/system/.local/bin/clean b/system/.local/bin/clean index 8250be6..73ba920 100755 --- a/system/.local/bin/clean +++ b/system/.local/bin/clean @@ -14,8 +14,8 @@ . utils print_section "Remove unneeded dependencies" -mapfile -t UNNEEDED_DEPENDENCIES < <(yay -Qdtq) -yay -Rsnu "${UNNEEDED_DEPENDENCIES[@]}" +mapfile -t UNNEEDED_DEPENDENCIES < <(paru -Qdtq) +paru -Rsnu "${UNNEEDED_DEPENDENCIES[@]}" print_section "Cleaning files in ${YELLOW}/var/cache/pacman/pkg/${RESET}" paccache -rk 1 -c "/var/cache/pacman/pkg/"