zsh:alias: Refactor

Reorder categories.
Remove unused aliases and PATH modification.
Refactor to keep lines under the maximum of 80 columns.
Use brace expansion where an alias has different names.
Simplify method for finding the wise and sose hash.
This commit is contained in:
2020-09-28 02:06:08 +02:00
parent 6158900925
commit 285863cb4f

View File

@@ -1,73 +1,36 @@
## Author: druckdev ## Author: druckdev
## Created: 2019-01-16 ## Created: 2019-01-16
## Add fslint-directory to PATH # Default flags
PATH="${PATH:+${PATH}:}/usr/share/fslint/fslint" alias ls='ls --color=auto --group-directories-first -p -v'
## Add flags or shorten commands that I cannot remember
alias getclip="xclip -selection c -o"
alias setclip="perl -pe 'chomp if eof' | xclip -selection c"
alias pdfviewer='evince'
alias pdf='launch evince'
alias darkpdf='launch zathura'
alias geeqie='launch qeeqie'
alias grep='grep --color' alias grep='grep --color'
alias igrep='grep -i'
alias emacs-game='emacs -batch -l dunnet'
alias trash-restore='restore-trash'
alias cp='cp -i' alias cp='cp -i'
alias mv='mv -i' # --backup=t ?? alias mv='mv -i'
alias rm='rm -I' alias rm='rm -I'
alias less='less -N' alias less='less -N'
alias lsblk='lsblk -f' alias lsblk='lsblk -f'
alias rd='rmdir' alias feh='feh -.'
alias md='mkdir -p'
alias o='xdg-open' # XDG Base Directory Specification
alias p='pwd' alias wget='
alias :q='exit' wget --config="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc" \
alias :Q=:q --hsts-file="${XDG_DATA_HOME:-$HOME/.local/share}/wget/wget-hsts"
alias update='sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y; [ ! -e /var/run/reboot-required ] || printf "\n\nSystem restart required.\n"' '
alias pdf2text='pdftotext' alias tmux='tmux -f "$HOME/.config/tmux/tmux.conf"'
alias pdf2txt='pdftotext' alias tmsu='tmsu -D "${XDG_DATA_HOME:-$HOME/.local/share}/tmsu/db"'
alias rm='printf "\033[1;031mUse trash!\n\033[0m"; false'
alias battery='upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep -E "to full|percentage" | tr -d " " | sed "s/:/: /"' # Global
alias qrdecode='zbarimg'
alias pdfmerge='pdfunite'
alias loadhist='fc -RI'
alias wget='wget --config=${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc --hsts-file="${XDG_DATA_HOME:-$HOME/.local/share}/wget/wget-hsts"'
alias -g G='| grep' alias -g G='| grep'
alias -g no2='2>/dev/null' alias -g no2='2>/dev/null'
alias hex=xxd
alias bin='xxd -b -c4 | cut -d" " -f2-5'
if command -v nvim >/dev/null 2>&1; then
alias vim=nvim
alias vi=nvim
fi
alias tmux='tmux -f "$HOME/.config/tmux/tmux.conf"'
alias resetCursor='echo -ne "\e[5 q"'
alias makeThisScratchpad='echo -ne "\033]0;scratchpad-terminal\007"'
alias tmsu='tmsu -D "${XDG_DATA_HOME:-$HOME/.local/share}/tmsu/db"'
alias grepdate='grep -E "(={8})|([0-9]{4}([: -_][0-9]{2}){5})|([0-9]{8}[ -_][0-9]{6})"'
alias feh='feh -.'
# 'Temporary' shell in alternate mode that does not mess with the scrollback history
alias tmpshell='tput smcup && zsh && tput rmcup'
## git # Git
alias gs='git status --short' # overrides ghostscript alias gs='git status --short'
alias gits='gs'
alias gstat='gs'
alias gitstat='gs'
alias ga='git add' alias ga='git add'
alias gaa='git add -A'
alias gc="git commit" alias gc="git commit"
alias gpsh='git push'
alias gpush='git push' alias gpush='git push'
alias gpll='git pull'
alias gpull='git pull' alias gpull='git pull'
alias gdiff='git diff'
alias gd='git diff' alias gd='git diff'
# git-commit, but put the last written commit message into the editor buffer # Commit, but put the last written commit message into the editor buffer.
# for editing.
# Useful for example when the commit-msg hook fails but only slight # Useful for example when the commit-msg hook fails but only slight
# modifications are needed. # modifications are needed.
alias git-commit-last-msg='() { alias git-commit-last-msg='() {
@@ -75,37 +38,59 @@ alias git-commit-last-msg='() {
git commit -eF <(grep -v "^#" "$gitdir/COMMIT_EDITMSG") git commit -eF <(grep -v "^#" "$gitdir/COMMIT_EDITMSG")
}' }'
## Navigation # Save keystrokes and my memory
alias ls='ls --color=auto --group-directories-first -p -v' alias la="${aliases[ls]:-ls} -A"
alias sl='ls' alias l="${aliases[ls]:-ls} -lh --time-style=long-iso"
alias la='ls -A' alias ll="${aliases[l]} -A"
alias l='ls -lh --time-style=long-iso'
alias ll='l -A'
alias cd..='cd ..' alias cd..='cd ..'
alias cd~='cd ~' alias getclip="xclip -selection c -o"
alias setclip="perl -pe 'chomp if eof' | xclip -selection c"
alias pdf='launch evince'
alias darkpdf='launch zathura'
alias geeqie='launch qeeqie'
alias trash-restore='restore-trash'
alias rd='rmdir'
alias md='mkdir -p'
alias o='xdg-open'
alias :{q,Q}='exit'
alias update='
sudo apt update \
&& sudo apt upgrade -y \
&& sudo apt autoremove -y
## Hashes for often visited folders [ ! -e /var/run/reboot-required ] \
hash -d Desktop=$HOME/Desktop/ || printf "\n\nSystem restart required.\n"
hash -d Documents=$HOME/Documents/ '
hash -d Pictures=$HOME/Pictures/ alias pdf2t{e,}xt='pdftotext'
hash -d Downloads=$HOME/Downloads/ alias rm='printf "\033[1;031mUse trash!\n\033[0m"; false'
hash -d Projects=$HOME/Projects/ alias battery='
hash -d dot=~Projects/github/dotfiles-github/ upower -i /org/freedesktop/UPower/devices/battery_BAT0
hash -d dots=~dot | grep -E "to full|percentage"
| tr -d " "
| sed "s/:/: /"
'
alias qrdecode='zbarimg'
alias loadhist='fc -RI'
alias hex=xxd
alias bin='xxd -b -c4 | cut -d" " -f2-5'
! command -v nvim &>/dev/null || alias vim=nvim
alias vi="${aliases[vim]:-vim}"
alias resetCursor='echo -ne "\e[5 q"'
alias makeThisScratchpad='echo -ne "\033]0;scratchpad-terminal\007"'
# grep filenames and date entries in exiftool
alias grepdate='grep -E "(={8})|([:0-9]{10} [:0-9]{8})"'
# 'Temporary' shell in alternate mode for hiding commands in scrollback.
alias tmpshell='tput smcup && zsh && tput rmcup'
local UNI="$HOME/Documents/uni" # Named directories
hash -d cheat=$HOME/Documents/Cheat\ Sheet/ hash -d docs="$HOME"/Documents/
hash -d uni=$UNI/ hash -d cheat="${nameddirs[docs]}"/cheat_sheets
# hash for current/last wise hash -d proj="$HOME"/Projects/
local YEAR=$(date +"%y") hash -d dot{,s}="${nameddirs[proj]}"/github/dotfiles-github/
if [ -d "$UNI/$YEAR-WiSe" ]; then hash -d pics="$HOME"/Pictures/
hash -d wise="$UNI/$YEAR-WiSe/" hash -d down="$HOME"/Downloads/
elif [ -d "$UNI/$(($YEAR - 1))-WiSe" ]; then
hash -d wise="$UNI/$(($YEAR - 1))-WiSe/" hash -d uni="${nameddirs[docs]}"/uni
fi local UNI="${nameddirs[uni]}"
# hash for current/last sose hash -d wise="$(printf "%s\n" "$UNI"/[0-9][0-9]-WiSe | tail -1)"
if [ -d "$UNI/$YEAR-SoSe" ]; then hash -d sose="$(printf "%s\n" "$UNI"/[0-9][0-9]-SoSe | tail -1)"
hash -d sose="$UNI/$YEAR-SoSe"/
elif [ -d "$UNI/$(($YEAR - 1))-SoSe" ]; then
hash -d sose="$UNI/$(($YEAR - 1))-SoSe/"
fi