diff --git a/.config/i3/blocks/updates b/.config/i3/blocks/updates index 0e06ade..2f58109 100755 --- a/.config/i3/blocks/updates +++ b/.config/i3/blocks/updates @@ -5,7 +5,7 @@ import os button = os.environ.get('BLOCK_BUTTON') if button == '1': - os.system("i3-sensible-terminal -e 'yaourt -Syua'") + os.system("i3-sensible-terminal -e 'pacaur -Syu'") updates = commands.getstatusoutput("/usr/bin/checkupdates | wc -l")[1] if updates and updates != '0': diff --git a/.config/pacaur/config b/.config/pacaur/config new file mode 100644 index 0000000..11a7b51 --- /dev/null +++ b/.config/pacaur/config @@ -0,0 +1,10 @@ +#!/bin/bash + +displaybuildfiles=none # display build files (none|diff|full) +sudoloop=false # prevent sudo timeout + +#editor="${EDITOR:-vi}" # build files editor +#fallback=true # pacman fallback to the AUR +#silent=false # silence output +#sortby=popularity # sort method (name|votes|popularity) +#sortorder=descending # sort order (ascending|descending) diff --git a/.yaourtrc b/.yaourtrc deleted file mode 100644 index d44f681..0000000 --- a/.yaourtrc +++ /dev/null @@ -1,66 +0,0 @@ -# yaourtrc - Configuration for yaourt -# -# See yaourtrc(5) for more information -# -# - -# General -#AUTOSAVEBACKUPFILE=0 -#DEVELSRCDIR="" -#DEVEL=0 -#VISUAL="$VISUAL" -#EDITOR="$EDITOR" -#FORCEENGLISH=0 -#FORCE=0 -#TMPDIR="/tmp" -#NO_TESTDB=0 - -# SUDO -#SUDONOVERIF=0 # Avoid multiple sudo checks when timestamp_timeout=0 -#SUDOREDIRECT=1 # Define to 0 in case you use a fingerprint device - -# ABS -#USE_GIT=0 -# If the package "abs" is installed, those var are parsed from abs.conf -#REPOS=() # REPOS available at $SYNCSERVER -#SYNCSERVER="" - -# AUR -#AURURL="https://aur.archlinux.org" -#AURCOMMENT=5 -#AURDEVELONLY=0 -#AURSEARCH=1 -#AURUPGRADE=0 -#AURVOTE=1 -#AURUSEGIT=0 - -# Build -#EXPORT=0 # Export to 1: EXPORTDIR or PKGDEST - # 2: pacman cache (as root) -#EXPORTSRC=0 # Need EXPORT>0 to be used -#EXPORTDIR="" # If empty, use makepkg's connfiguration (see makepkg.conf) - -# Prompt -#NOCONFIRM=0 -#UP_NOCONFIRM=0 # No prompt while build upgrades (including -Sbu) -#PU_NOCONFIRM=0 # Add --noconfirm to $PACMAN -U -#NOENTER=1 -BUILD_NOCONFIRM=1 -EDITFILES=0 - -# Output -#USECOLOR=1 -#USEPAGER=0 -#DETAILUPGRADE=1 -#SHOWORPHANS=1 -#TERMINALTITLE=1 - -# Command -#PACMAN="pacman" -#MAKEPKG="makepkg" -#DIFFEDITCMD="vimdiff" - -# pacdiffviewer -#P_LOCATE=0 # Use locate instead of find -#P_SEARCHDIR=(/etc/ /boot/) -#P_SAVEDIR='/var/lib/yaourt/backupfiles' diff --git a/aliases b/aliases index 07ca9fe..0607373 100644 --- a/aliases +++ b/aliases @@ -52,7 +52,7 @@ alias tree='tree -C' # System aliases alias s=systemctl -alias y=yaourt +alias p=pacaur alias ps='ps aux' # File default aliases @@ -117,7 +117,6 @@ alias ssha='eval `ssh-agent` ; ssh-add' alias aliases="$EDITOR $DOTFILES/aliases ; source ~/.zshrc" alias vimrc="$EDITOR ~/.vimrc" alias zshrc="$EDITOR ~/.zshrc ; source ~/.zshrc" -alias yaourtrc="$EDITOR ~/.yaourtrc" alias xinitrc="$EDITOR ~/.xinitrc" alias xresources="$EDITOR ~/.Xresources ; xrdb merge ~/.Xresources" alias xsession="$EDITOR ~/.xsession" diff --git a/packages b/packages index b7eba8b..2aa0d4a 100644 --- a/packages +++ b/packages @@ -16,6 +16,7 @@ compton cups deluge dos2unix +cower dosfstools dropbox dunst @@ -23,6 +24,7 @@ efibootmgr eog evince exfat-utils +expac feh firefox gdmap @@ -73,6 +75,7 @@ nvidia oh-my-zsh-git openssh p7zip +pacaur pavucontrol pkgfile powertop @@ -125,6 +128,5 @@ xorg-xinit xorg-xrdb xournal-git xtitle -yaourt zsh zsh-syntax-highlighting diff --git a/scripts/install-pacaur b/scripts/install-pacaur new file mode 100755 index 0000000..438922e --- /dev/null +++ b/scripts/install-pacaur @@ -0,0 +1,25 @@ +if [[ $EUID -eq 0 ]]; then + echo "You cannot run makepkg as root." + echo "Please run this script again as a non-elevated user" + exit 1 +fi + +# Install dependencies +sudo pacman -S --asdeps git curl yajl gnupg + +mkdir cower && cd cower + +# Get PGP keys so it builds +gpg --recv-keys --keyserver hkp://pgp.mit.edu 1EB2638FF56C0C53 + +# Fetch, build and install cower +curl https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=cower > PKGBUILD +makepkg -sri + +# Fetch, build and install pacaur +cd .. && mkdir pacaur && cd pacaur +curl https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=pacaur > PKGBUILD +makepkg -sri + +cd .. +rm -rf cower pacaur diff --git a/scripts/install-yaourt b/scripts/install-yaourt deleted file mode 100755 index 6c89d64..0000000 --- a/scripts/install-yaourt +++ /dev/null @@ -1,23 +0,0 @@ -#if [[ $EUID -eq 0 ]]; then -# echo "You cannot run makepkg as root." -# echo "Please run this script again as a non-elevated user" -# exit 1 -#fi - -# Install git, yajl dependencies -sudo pacman -S --asdeps yajl git - -cd /tmp -git clone https://aur.archlinux.org/package-query.git -cd package-query -sudo -u nobody makepkg -sr -sudo pacman -U `ls | grep package-query.*\.tar\.xz' - -cd .. -git clone https://aur.archlinux.org/yaourt.git -cd yaourt -sudo -u nobody makepkg -sr -sudo pacman -U `ls | grep yaourt.*\.tar\.xz' - -cd .. -rm -rf package-query yaourt