diff --git a/cfg/zsh/cfg.d/export.zsh b/cfg/zsh/cfg.d/export.zsh index 86ce0b0..9541d0c 100644 --- a/cfg/zsh/cfg.d/export.zsh +++ b/cfg/zsh/cfg.d/export.zsh @@ -30,7 +30,7 @@ manpath+=(${brewpr}/share/man) infopath+=(${brewpr}/share/info) # XDG Data Dirs -XDG_DATA_DIRS+=(/home/linuxbrew/.linuxbrew/share) +XDG_DATA_DIRS+=(${brewpr}/share) # Editor Setting EDITOR='nano' diff --git a/cfg/zsh/cfg.d/source.d/alias-ad.zsh b/cfg/zsh/cfg.d/source.d/alias-ad.zsh deleted file mode 100644 index c7f6ca7..0000000 --- a/cfg/zsh/cfg.d/source.d/alias-ad.zsh +++ /dev/null @@ -1,11 +0,0 @@ -function ad() { - -if [[ "$@" == */ ]]; then - mkdir -p $@ -else - for f in "$@"; do - mkdir -p "$(dirname "$f")" - done - touch "$@" -fi -} diff --git a/cfg/zsh/cfg.d/source.d/alias-os.zsh b/cfg/zsh/cfg.d/source.d/alias-os.zsh index 7aa2dea..2c2e09a 100644 --- a/cfg/zsh/cfg.d/source.d/alias-os.zsh +++ b/cfg/zsh/cfg.d/source.d/alias-os.zsh @@ -1,75 +1,158 @@ -# Aliases for OS -if type pacman &>/dev/null; then - if (( $+commands[yaourt] )); then - alias yaconf='yaourt -C' - alias yaupg='yaourt -Syua' - alias yasu='yaourt -Syua --noconfirm' - alias yain='yaourt -S' - alias yains='yaourt -U' - alias yare='yaourt -R' - alias yarem='yaourt -Rns' - alias yarep='yaourt -Si' - alias yareps='yaourt -Ss' - alias yaloc='yaourt -Qi' - alias yalocs='yaourt -Qs' - alias yalst='yaourt -Qe' - alias yaorph='yaourt -Qtd' - alias yainsd='yaourt -S --asdeps' - alias yamir='yaourt -Syy' - alias yaupd='yaourt -Sy' - fi +if (( $+commands[trizen] )); then + alias trconf='trizen -C' + alias trupg='trizen -Syua' + alias trsu='trizen -Syua --noconfirm' + alias trin='trizen -S' + alias trins='trizen -U' + alias trre='trizen -R' + alias trrem='trizen -Rns' + alias trrep='trizen -Si' + alias trreps='trizen -Ss' + alias trloc='trizen -Qi' + alias trlocs='trizen -Qs' + alias trlst='trizen -Qe' + alias trorph='trizen -Qtd' + alias trinsd='trizen -S --asdeps' + alias trmir='trizen -Syy' - alias pacupg='sudo pacman -Syu' - alias pacin='sudo pacman -S' - alias pacins='sudo pacman -U' - alias pacre='sudo pacman -R' - alias pacrem='sudo pacman -Rns' - alias pacrep='pacman -Si' - alias pacreps='pacman -Ss' - alias pacloc='pacman -Qi' - alias paclocs='pacman -Qs' - alias pacinsd='sudo pacman -S --asdeps' - alias pacmir='sudo pacman -Syy' - alias paclsorphans='sudo pacman -Qdt' - alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)' - alias pacfileupg='sudo pacman -Fy' - alias pacfiles='pacman tFs' - alias pacupd='sudo pacman -Sy' - paclist() { - LC_ALL=C pacman -Qei $(pacman -Qu | cut -d " " -f 1) | \ - awk 'BEGIN {FS=":"} /^Name/{printf("\033[1;36m%s\033[1;37m", $2)} /^Description/{print $2}' - } - - pacdisowned() { - emulate -L zsh - - tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$ - db=$tmp/db - fs=$tmp/fs - - mkdir "$tmp" - trap 'rm -rf "$tmp"' EXIT - - pacman -Qlq | sort -u > "$db" - - find /bin /etc /lib /sbin /usr ! -name lost+found \( -type d -printf '%p/\n' -o -print \) | sort > "$fs" - - comm -23 "$fs" "$db" - } - - pacmanallkeys() { - emulate -L zsh - curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \ - awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | xargs sudo pacman-key --recv-keys - } - - pacmansignkeys() { - emulate -L zsh - for key in $*; do - sudo pacman-key --recv-keys $key - sudo pacman-key --lsign-key $key - printf 'trust\n3\n' | sudo gpg --homedir /etc/pacman.d/gnupg --no-permission-warning --command-fd 0 --edit-key $key - done - } + if (( $+commands[abs] && $+commands[aur] )); then + alias trupd='trizen -Sy && sudo abs && sudo aur' + elif (( $+commands[abs] )); then + alias trupd='trizen -Sy && sudo abs' + elif (( $+commands[aur] )); then + alias trupd='trizen -Sy && sudo aur' + else + alias trupd='trizen -Sy' + fi +fi + +if (( $+commands[yaourt] )); then + alias yaconf='yaourt -C' + alias yaupg='yaourt -Syua' + alias yasu='yaourt -Syua --noconfirm' + alias yain='yaourt -S' + alias yains='yaourt -U' + alias yare='yaourt -R' + alias yarem='yaourt -Rns' + alias yarep='yaourt -Si' + alias yareps='yaourt -Ss' + alias yaloc='yaourt -Qi' + alias yalocs='yaourt -Qs' + alias yalst='yaourt -Qe' + alias yaorph='yaourt -Qtd' + alias yainsd='yaourt -S --asdeps' + alias yamir='yaourt -Syy' + + + if (( $+commands[abs] && $+commands[aur] )); then + alias yaupd='yaourt -Sy && sudo abs && sudo aur' + elif (( $+commands[abs] )); then + alias yaupd='yaourt -Sy && sudo abs' + elif (( $+commands[aur] )); then + alias yaupd='yaourt -Sy && sudo aur' + else + alias yaupd='yaourt -Sy' + fi +fi + +if (( $+commands[trizen] )); then + function upgrade() { + trizen -Syu + } +elif (( $+commands[pacaur] )); then + function upgrade() { + pacaur -Syu + } +elif (( $+commands[yaourt] )); then + function upgrade() { + yaourt -Syu + } +else + function upgrade() { + sudo pacman -Syu + } +fi + +alias pacupg='sudo pacman -Syu' +alias pacin='sudo pacman -S' +alias pacins='sudo pacman -U' +alias pacre='sudo pacman -R' +alias pacrem='sudo pacman -Rns' +alias pacrep='pacman -Si' +alias pacreps='pacman -Ss' +alias pacloc='pacman -Qi' +alias paclocs='pacman -Qs' +alias pacinsd='sudo pacman -S --asdeps' +alias pacmir='sudo pacman -Syy' +alias paclsorphans='sudo pacman -Qdt' +alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)' +alias pacfileupg='sudo pacman -Fy' +alias pacfiles='pacman -Fs' +alias pacls='pacman -Ql' +alias pacown='pacman -Qo' + + +if (( $+commands[abs] && $+commands[aur] )); then + alias pacupd='sudo pacman -Sy && sudo abs && sudo aur' +elif (( $+commands[abs] )); then + alias pacupd='sudo pacman -Sy && sudo abs' +elif (( $+commands[aur] )); then + alias pacupd='sudo pacman -Sy && sudo aur' +else + alias pacupd='sudo pacman -Sy' +fi + +function paclist() { + # Source: https://bbs.archlinux.org/viewtopic.php?id=93683 + LC_ALL=C pacman -Qei $(pacman -Qu | cut -d " " -f 1) | \ + awk 'BEGIN {FS=":"} /^Name/{printf("\033[1;36m%s\033[1;37m", $2)} /^Description/{print $2}' +} + +function pacdisowned() { + emulate -L zsh + + tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$ + db=$tmp/db + fs=$tmp/fs + + mkdir "$tmp" + trap 'rm -rf "$tmp"' EXIT + + pacman -Qlq | sort -u > "$db" + + find /bin /etc /lib /sbin /usr ! -name lost+found \ + \( -type d -printf '%p/\n' -o -print \) | sort > "$fs" + + comm -23 "$fs" "$db" +} + +function pacmanallkeys() { + emulate -L zsh + curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \ + awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \ + xargs sudo pacman-key --recv-keys +} + +function pacmansignkeys() { + emulate -L zsh + for key in $*; do + sudo pacman-key --recv-keys $key + sudo pacman-key --lsign-key $key + printf 'trust\n3\n' | sudo gpg --homedir /etc/pacman.d/gnupg \ + --no-permission-warning --command-fd 0 --edit-key $key + done +} + +if (( $+commands[xdg-open] )); then + function pacweb() { + pkg="$1" + infos="$(pacman -Si "$pkg")" + if [[ -z "$infos" ]]; then + return + fi + repo="$(grep '^Repo' <<< "$infos" | grep -oP '[^ ]+$')" + arch="$(grep '^Arch' <<< "$infos" | grep -oP '[^ ]+$')" + xdg-open "https://www.archlinux.org/packages/$repo/$arch/$pkg/" &>/dev/null + } fi diff --git a/cfg/zsh/cfg.d/source.zsh b/cfg/zsh/cfg.d/source.zsh index 52cb1e1..08486a3 100644 --- a/cfg/zsh/cfg.d/source.zsh +++ b/cfg/zsh/cfg.d/source.zsh @@ -2,8 +2,6 @@ alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' alias la='ls -lAh' -alias psg='ps aux | grep -v grep | grep' -clearall () { clear; printf '\033[3J' } for file in ${dotcfg}/zsh/cfg.d/source.d/*.zsh; do source $file diff --git a/lib/completions b/lib/completions index 70a7a5c..1a71e0a 160000 --- a/lib/completions +++ b/lib/completions @@ -1 +1 @@ -Subproject commit 70a7a5cdee168b6cb9400cccbe48427906b6ca28 +Subproject commit 1a71e0a1a36117722c02736487e6940e72455e0b diff --git a/lib/dotbot b/lib/dotbot index fe9ca6f..2f4cc0d 160000 --- a/lib/dotbot +++ b/lib/dotbot @@ -1 +1 @@ -Subproject commit fe9ca6f5ede35d16f28e0c5db781fb39437fd171 +Subproject commit 2f4cc0d9cb70235e7c5820dc4e7dd89b1d375fb5 diff --git a/lib/gitignore b/lib/gitignore index 5ec6269..4b37ac2 160000 --- a/lib/gitignore +++ b/lib/gitignore @@ -1 +1 @@ -Subproject commit 5ec6269c94d3b0c9ff5a7f87c890d067138bc58f +Subproject commit 4b37ac26ffaee3e6566723ea187202d1e44ebb52 diff --git a/lib/has b/lib/has index a3223b2..5443d4c 160000 --- a/lib/has +++ b/lib/has @@ -1 +1 @@ -Subproject commit a3223b2a8ef25679ecaaa5a963493260b64442cb +Subproject commit 5443d4cb9e03d8d97fa0be19a4718958bf23fca4 diff --git a/lib/ohmyzsh b/lib/ohmyzsh index 0cec462..9cd3701 160000 --- a/lib/ohmyzsh +++ b/lib/ohmyzsh @@ -1 +1 @@ -Subproject commit 0cec4626219bfd5a163986ebe3745fc31b593446 +Subproject commit 9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8