von/vdotfiles
1
0
Fork 0
Code Activity

bashrc, zshrc: replace aliases with functions

Browse source
This commit is contained in:
Von Random 2020-01-28 16:39:04 +03:00
parent 3198be402b
commit 6006e52950
2 changed files with 65 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

43
bashrc
View file

@ -28,31 +28,40 @@ unset ps_clr
PROMPT_COMMAND=prompt_command PROMPT_COMMAND=prompt_command
# }}} # }}}
# {{{ aliases # {{{ aliases
alias less='command less -R' beep() { printf "\007"; }
alias rgrep='command grep --exclude-dir=\.git -R' fixterm() { printf "c"; }
alias tailf='command less -R +F'
alias vi='command vim' diff() { command diff --color "$@"; }
alias whence='command -v' less() { command less -R "$@"; }
tailf() { command less -R +F "$@"; }
rgrep() { command grep --exclude-dir=\.git -R "$@"; }
whence() { command -v "$@"; }
vi() { command vim "$@"; }
# ls # ls
alias ls='command ls --color=auto --group-directories-first ' ls() { command ls --color=auto --group-directories-first "$@"; }
alias ll='ls -lha' ll() { command ls -lha --color=auto --group-directories-first "$@"; }
# git # git
alias gci='command git commit' gci() { command git commit "$@"; }
alias gsl='command git stash list' gsl() { command git stash list "$@"; }
alias gss='command git status -sbu' gss() { command git status -sbu "$@"; }
alias gup='command git pull' gup() { command git pull "$@"; }
alias groot='cd $(command git rev-parse --show-cdup)' groot() { cd "$(command git rev-parse --show-cdup)" || return 1; }
alias gsi='command tig status' ggrep() { command git grep "$@"; }
gsi() { command tig status; }
# tmux # tmux
alias tmux='command tmux -2' tmux() { command tmux -2 "$@"; }
alias atmux='command tmux -2 attach' atmux() { tmux attach; }
# screen # screen
alias rscreen='command screen -Dr' rscreen() { command screen -Dr; }
alias scr='command screen sudo -Es' scr() { command screen sudo -Es; }
# termcompat
s() { "$(command -v termcompat||return 0)" ssh "$@"; }
# }}} # }}}
# {{{ plugins and traps # {{{ plugins and traps
# bash-completion # bash-completion

84
zshrc
View file

@ -9,13 +9,13 @@ unsetopt BEEP NO_MATCH NOTIFY MENU_COMPLETE AUTO_MENU
SAVEHIST=1000 SAVEHIST=1000
HISTSIZE=1000 HISTSIZE=1000
HISTFILE="$HOME/.histfile.$UID" HISTFILE=$HOME/.histfile.$UID
export EDITOR='vim' export EDITOR=vim
export PAGER='less -R' export PAGER='less -R'
export TIME_STYLE='long-iso' export TIME_STYLE=long-iso
export MYSQL_PS1='mysql [\d]> ' export MYSQL_PS1='mysql [\d]> '
export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock" export SSH_AUTH_SOCK=$HOME/.ssh/ssh_auth_sock
export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;47:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:' export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;47:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:'
autoload -Uz compinit edit-command-line autoload -Uz compinit edit-command-line
@ -71,10 +71,10 @@ bindkey -s '^j' '^atime ^m' # ctrl + j
bindkey '^x^e' edit-command-line bindkey '^x^e' edit-command-line
# }}} # }}}
# {{{ prompt # {{{ prompt
prompt_state_file="/tmp/zsh_gitstatus_$$.tmp" prompt_state_file=/tmp/zsh_gitstatus_$$.tmp
prompt_ln1='%K{white}%F{black}[ %F{%(!.red.blue)}%n%F{black} %m:%F{green}%d%F{black} ' prompt_ln1='%K{white}%F{black}[ %F{%(!.red.blue)}%n%F{black} %m:%F{green}%d%F{black} '
prompt_ln2=$']%f%k\n> ' prompt_ln2=$']%f%k\n> '
PROMPT="$prompt_ln1$prompt_ln2" PROMPT=$prompt_ln1$prompt_ln2
PROMPT2='%K{white}%F{black}[ %_ ]%f%k ' PROMPT2='%K{white}%F{black}[ %_ ]%f%k '
PROMPT3='%K{white}%F{black}[ ?# ]%f%k ' PROMPT3='%K{white}%F{black}[ ?# ]%f%k '
PROMPT4='%K{white}%F{black}[ +%N:%i ]%f%k ' PROMPT4='%K{white}%F{black}[ +%N:%i ]%f%k '
@ -98,7 +98,7 @@ precmd.is_git_repo() {
} }
precmd.git() { precmd.git() {
typeset raw_status typeset raw_status
raw_status="$(flock -w 0 $prompt_state_file git --no-optional-locks status --porcelain -bu 2>/dev/null)" raw_status=$(flock -w 0 $prompt_state_file git --no-optional-locks status --porcelain -bu 2>/dev/null)
(($?)) && return 0 (($?)) && return 0
typeset branch_status git_status IFS= typeset branch_status git_status IFS=
@ -107,8 +107,8 @@ precmd.git() {
while read line; do while read line; do
if [[ $line[1,2] == '##' ]]; then if [[ $line[1,2] == '##' ]]; then
branch_status=${line[4,-1]%%...*} branch_status=${line[4,-1]%%...*}
[[ $line =~ behind ]] && branch_status+='?' [[ $line =~ behind ]] && branch_status+=?
[[ $line =~ ahead ]] && branch_status+='!' [[ $line =~ ahead ]] && branch_status+=!
fi fi
[[ $line[1,2] == '??' ]] && (( untracked_count++ )) [[ $line[1,2] == '??' ]] && (( untracked_count++ ))
[[ $line[1,2] =~ .[MD] ]] && (( unstaged_count++ )) [[ $line[1,2] =~ .[MD] ]] && (( unstaged_count++ ))
@ -116,16 +116,16 @@ precmd.git() {
[[ $line[1,2] =~ [ADU]{2} ]] && (( unmerged_count++ )) [[ $line[1,2] =~ [ADU]{2} ]] && (( unmerged_count++ ))
done <<< $raw_status done <<< $raw_status
(( unstaged_count )) && git_status+="%F{yellow}~$unstaged_count" (( unstaged_count )) && git_status+=%F{yellow}~$unstaged_count
(( staged_count )) && git_status+="%F{blue}+$staged_count" (( staged_count )) && git_status+=%F{blue}+$staged_count
(( untracked_count )) && git_status+="%F{red}-$untracked_count" (( untracked_count )) && git_status+=%F{red}-$untracked_count
(( unmerged_count )) && git_status+="%F{cyan}*$unmerged_count" (( unmerged_count )) && git_status+=%F{cyan}*$unmerged_count
[[ -z $git_status ]] && git_status="%F{green}ok" [[ -z $git_status ]] && git_status=%F{green}ok
printf '\ue0a0 %s %s%%F{black} ' $branch_status $git_status > $prompt_state_file printf '\ue0a0 %s %s%%F{black} ' $branch_status $git_status > $prompt_state_file
} }
precmd.prompt() { precmd.prompt() {
PROMPT="$prompt_ln1$1$prompt_ln2" PROMPT=$prompt_ln1$1$prompt_ln2
} }
precmd.git_update() { precmd.git_update() {
precmd.git precmd.git
@ -149,43 +149,37 @@ TRAPEXIT() {
} }
# }}} # }}}
# {{{ aliases # {{{ aliases
alias beep='printf "\007"' beep() { printf $'\007' }
alias cower='command cower -c' fixterm() { printf $'c' }
alias fixterm='printf "c"'
alias less='command less -R' diff() { command diff --color $@ }
alias mysql='command mysql --sigint-ignore' less() { command less -R $@ }
alias pacman='command pacman --color=auto' tailf() { command less -R +F $@ }
alias rgrep='command grep --exclude-dir=\.git -R' rgrep() { command grep --exclude-dir=\.git -R $@ }
alias ggrep='command git grep'
alias tailf='command less -R +F'
alias diff='command diff --color'
# ls # ls
alias ls='command ls --color=auto --group-directories-first ' ls() { command ls --color=auto --group-directories-first $@ }
alias ll='ls -lha' ll() { command ls -lha --color=auto --group-directories-first $@ }
# git # git
alias gci='command git commit' gci() { command git commit $@ }
alias gsl='command git stash list' gsl() { command git stash list $@ }
alias gss='command git status -sbu' gss() { command git status -sbu $@ }
alias gup='command git pull' gup() { command git pull $@ }
alias groot='cd $(command git rev-parse --show-cdup)' groot() { cd $(command git rev-parse --show-cdup) || return 1 }
alias gsi='command tig status' ggrep() { command git grep $@ }
gsi() { command tig status }
# tmux # tmux
alias tmux='command tmux -2' tmux() { command tmux -2 $@ }
alias atmux='command tmux -2 attach' atmux() { tmux attach }
# screen # screen
alias rscreen='command screen -Dr' rscreen() { command screen -Dr }
alias scr='command screen sudo -Es' scr() { command screen sudo -Es }
# termcompat # termcompat
if [[ -x $(whence termcompat) ]]; then s() { $(whence termcompat||return 0) ssh $@ }
alias s='command termcompat ssh'
else
alias s='command ssh'
fi
# }}} # }}}
# {{{ plugins # {{{ plugins
@ -201,13 +195,13 @@ if [[ -x $(whence grc) ]]; then
unset cmds cmd unset cmds cmd
fi fi
# some cool git stuff # some cool git stuff
gdiff() { /usr/bin/git diff --color "$@"; } gdiff() { /usr/bin/git diff --color $@; }
gdf() { gdf() {
typeset difftool typeset difftool
if difftool=$(whence diff-so-fancy); then if difftool=$(whence diff-so-fancy); then
gdiff "$@" | $difftool | less --tabs=4 -RSFX gdiff $@ | $difftool | less --tabs=4 -RSFX
else else
gdiff "$@" gdiff $@
fi fi
} }
greset() { greset() {