up-to-date bashrc, fix zshrc
This commit is contained in:
Von Random
parent
0a87a30e45
commit
3d80bb469d
3 changed files with 83 additions and 128 deletions
102
bashplugins
102
bashplugins
|
|
@ -1,102 +0,0 @@
|
|||
export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
|
||||
|
||||
completion_path='/usr/share/bash-completion/bash_completion'
|
||||
[[ -r "${completion_path}" ]] && . "${completion_path}"
|
||||
|
||||
# grc
|
||||
colorize() {
|
||||
local cmds cmd
|
||||
cmds=(\
|
||||
cc configure cvs df diff dig gcc gmake id ip last lsof make mount \
|
||||
mtr netstat ping ping6 ps tcpdump traceroute traceroute6 \
|
||||
)
|
||||
for cmd in ${cmds[@]}; do
|
||||
alias ${cmd}="command grc -es --colour=auto ${cmd}"
|
||||
done
|
||||
}
|
||||
if [[ -x $(type -P grc) ]]; then
|
||||
colorize
|
||||
unset -f colorize
|
||||
fi
|
||||
|
||||
# because fuck you thats' why
|
||||
fuck() { echo 'no, fuck you'; }
|
||||
|
||||
# some cool git stuff
|
||||
gdiff() { /usr/bin/git diff --color "$@"; }
|
||||
|
||||
gdf()
|
||||
{
|
||||
local fancydiff='/usr/bin/diff-so-fancy'
|
||||
local githighlight='/usr/share/git/diff-highlight/diff-highlight'
|
||||
if [[ -x ${fancydiff} ]]; then
|
||||
gdiff "$@" | ${fancydiff} | less --tabs=4 -RSFX
|
||||
elif [[ -x ${githighlight} ]]; then
|
||||
gdiff "$@" | ${githighlight} | less --tabs=4 -RSFX
|
||||
else
|
||||
gdiff "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
is_git_repo()
|
||||
{
|
||||
local curr_dir="$PWD"
|
||||
while [[ -n "${curr_dir}" ]]; do
|
||||
if [[ -r "${curr_dir}/.git/HEAD" ]]; then
|
||||
return 0
|
||||
else
|
||||
curr_dir="${curr_dir%/*}"
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
git_prompt()
|
||||
{
|
||||
prompt_command
|
||||
|
||||
is_git_repo || return 0
|
||||
|
||||
local raw_status="$(git status --porcelain -bu 2>/dev/null)"
|
||||
local branch_info full_status IFS=
|
||||
local git_status=''
|
||||
local staged_count=0
|
||||
local unstaged_count=0
|
||||
local untracked_count=0
|
||||
local unmerged_count=0
|
||||
|
||||
while read line; do
|
||||
[[ "${line:0:2}" == '##' ]] && branch_info="${line:3}"
|
||||
[[ "${line:0:2}" == '??' ]] && (( untracked_count++ ))
|
||||
[[ "${line:0:2}" =~ .[MD] ]] && (( unstaged_count++ ))
|
||||
[[ "${line:0:2}" =~ [MDARC]. ]] && (( staged_count++ ))
|
||||
[[ "${line:0:2}" =~ (U[ADU]|A[AU]|D[DU]) ]] && (( unmerged_count++ ))
|
||||
done <<< "${raw_status}"
|
||||
|
||||
(( unstaged_count )) && git_status+="${ppurple}~${unstaged_count}"
|
||||
(( staged_count )) && git_status+="${pblue}+${staged_count}"
|
||||
(( untracked_count )) && git_status+="${pred}-${untracked_count}"
|
||||
(( unmerged_count )) && git_status+="${porange}*${unmerged_count}"
|
||||
[[ -z "${git_status}" ]] && git_status="${pgreen}ok"
|
||||
|
||||
full_status="{ ${pgray3}${branch_info}${preset} | ${git_status}${preset} }"
|
||||
|
||||
if [[ -n "${OLD_PROMPT}" ]]; then
|
||||
PS1="${ps_line1} ${full_status}\n${ps_line2}"
|
||||
else
|
||||
echo ${full_status}
|
||||
fi
|
||||
}
|
||||
|
||||
gitmode()
|
||||
{
|
||||
if [[ -n "${OLD_PROMPT}" ]]; then
|
||||
PROMPT_COMMAND=${OLD_PROMPT}
|
||||
unset OLD_PROMPT
|
||||
else
|
||||
OLD_PROMPT=${PROMPT_COMMAND}
|
||||
PROMPT_COMMAND=git_prompt
|
||||
fi
|
||||
}
|
||||
|
||||
gitmode
|
||||
107
bashrc
107
bashrc
|
|
@ -3,15 +3,16 @@
|
|||
|
||||
# {{{ settings
|
||||
HISTSIZE=1000
|
||||
HISTFILE="${HOME}/.bash_history.${UID}"
|
||||
HISTFILE="$HOME/.bash_history.$UID"
|
||||
HISTCONTROL=ignoredups
|
||||
shopt -s histappend checkwinsize
|
||||
((BASH_VERSINFO > 3)) && shopt -s autocd
|
||||
|
||||
export PAGER='less -R'
|
||||
export EDITOR='vim'
|
||||
export MYSQL_PS1="mysql [\d]> "
|
||||
export MYSQL_PS1='mysql [\d]> '
|
||||
export TIME_STYLE='long-iso'
|
||||
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;44: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:'
|
||||
# }}}
|
||||
# {{{ prompt
|
||||
|
|
@ -21,8 +22,8 @@ for color in \
|
|||
gray6 red green yellow blue magenta cyan gray1 \
|
||||
black orange gray5 gray4 gray3 purple gray2 white
|
||||
do
|
||||
eval "p${color}='\\[\\e[38;5;${color_number}m\\]'"
|
||||
eval "${color}='\\e[38;5;${color_number}m'"
|
||||
eval "p$color='\\[\\e[38;5;${color_number}m\\]'"
|
||||
eval "$color='\\e[38;5;${color_number}m'"
|
||||
(( color_number++ ))
|
||||
done
|
||||
unset color_number
|
||||
|
|
@ -30,35 +31,91 @@ preset='\[\e[0m\]'
|
|||
reset='\e[0m'
|
||||
prompt_command()
|
||||
{
|
||||
case ${TERM} in
|
||||
screen*)
|
||||
printf '\033k%s\033\' "${HOSTNAME%%.*}"
|
||||
;;
|
||||
*)
|
||||
printf '\033]0;%s\007' "${HOSTNAME%%.*}"
|
||||
;;
|
||||
case "$TERM" in
|
||||
(screen*) printf '\033k%s\033\' "${HOSTNAME%%.*}";;
|
||||
(*) printf '\033]0;%s\007' "${HOSTNAME%%.*}";;
|
||||
esac
|
||||
if ((UID)); then
|
||||
prompt_user="${pblack}\\u${preset} "
|
||||
bang="${pblack}>${preset}"
|
||||
prompt_user="$pblack\\u$preset "
|
||||
bang="$pblack>$preset"
|
||||
else
|
||||
prompt_user="${pred}\\u${preset} "
|
||||
bang="${pred}>${preset}"
|
||||
prompt_user="$pred\\u$preset "
|
||||
bang="$pred>$preset"
|
||||
fi
|
||||
ps_line1="[ bash-$BASH_VERSINFO | ${prompt_user}${HOSTNAME}:${pblack}$(pwd)${preset} ]"
|
||||
ps_line2="${bang} "
|
||||
PS1="${ps_line1}\\n${ps_line2}"
|
||||
ps_line1="[ bash-$BASH_VERSINFO | $prompt_user$HOSTNAME:$pblack$(pwd)$preset ]"
|
||||
ps_line2="$bang "
|
||||
PS1="$ps_line1\\n$ps_line2"
|
||||
}
|
||||
PROMPT_COMMAND=prompt_command
|
||||
# }}}
|
||||
# {{{ aliases
|
||||
alias beep='printf "\007"'
|
||||
alias cower='command cower -c'
|
||||
alias fixterm='printf "c"'
|
||||
alias less='command less -R'
|
||||
alias mysql='command mysql --sigint-ignore'
|
||||
alias pacman='command pacman --color=auto'
|
||||
alias rgrep='command grep --exclude-dir=\.git -R'
|
||||
alias ggrep='command git grep'
|
||||
alias tailf='command less -R +F'
|
||||
alias diff='command diff --color'
|
||||
alias s='tcmp ssh'
|
||||
|
||||
# ls
|
||||
alias ls='command ls --color=auto --group-directories-first '
|
||||
alias ll='ls -lha'
|
||||
|
||||
# git
|
||||
alias gci='command git commit'
|
||||
alias gsl='command git stash list'
|
||||
alias gss='command git status -sbu'
|
||||
alias gup='command git pull'
|
||||
alias groot='cd $(command git rev-parse --show-cdup)'
|
||||
alias gsi='command tig status'
|
||||
|
||||
# tmux
|
||||
alias tmux='command tmux -2'
|
||||
alias atmux='command tmux -2 attach'
|
||||
|
||||
# screen
|
||||
alias rscreen='command screen -Dr'
|
||||
alias scr='command screen sudo -Es'
|
||||
# }}}
|
||||
# {{{ plugins and traps
|
||||
aliases="${HOME}/.aliases"
|
||||
localconf="${HOME}/.bashlocal"
|
||||
plugins="${HOME}/.bashplugins"
|
||||
[[ -r "${aliases}" ]] && . "${aliases}"
|
||||
[[ -r "${localconf}" ]] && . "${localconf}"
|
||||
[[ -r "${plugins}" && $BASH_VERSINFO -gt 3 ]] && . "${plugins}"
|
||||
unset aliases plugins localconf
|
||||
# bash-completion
|
||||
completion_path='/usr/share/bash-completion/bash_completion'
|
||||
[[ -r "$completion_path" ]] && source "$completion_path"
|
||||
# grc
|
||||
if [[ -x $(command -v grc) ]]; then
|
||||
cmds=(\
|
||||
cc configure cvs df diff dig gcc gmake id ip last lsof make mount \
|
||||
mtr netstat ping ping6 ps tcpdump traceroute traceroute6 \
|
||||
)
|
||||
for cmd in "${cmds[@]}"; do
|
||||
alias $cmd="command grc -es --colour=auto $cmd"
|
||||
done
|
||||
unset cmds cmd
|
||||
fi
|
||||
# some cool git stuff
|
||||
gdiff() { /usr/bin/git diff --color "$@"; }
|
||||
gdf()
|
||||
{
|
||||
local difftool
|
||||
if difftool=$(whence sdiff-so-fancy); then
|
||||
gdiff "$@" | $difftool | less --tabs=4 -RSFX
|
||||
else
|
||||
gdiff "$@"
|
||||
fi
|
||||
}
|
||||
# term compatibility for remote stuff
|
||||
tcmp() {
|
||||
local -A terms=(
|
||||
[rxvt-unicode-256color]='rxvt-unicode'
|
||||
[st-256color]='xterm-256color'
|
||||
[tmux-256color]='screen-256color'
|
||||
)
|
||||
TERM="${terms[$TERM]:-$TERM}" "$@"
|
||||
}
|
||||
|
||||
# we want to see exit code on error (it also has to be the last entry here)
|
||||
trap 'printf "${red}>>${reset} ${black}exit${reset} ${red}%s${reset}\n" "$?" >&2' ERR
|
||||
|
|
|
|||
2
zshrc
2
zshrc
|
|
@ -187,7 +187,7 @@ fi
|
|||
gdiff() { /usr/bin/git diff --color "$@"; }
|
||||
gdf() {
|
||||
local difftool
|
||||
if difftool=$(whence sdiff-so-fancy); then
|
||||
if difftool=$(whence diff-so-fancy); then
|
||||
gdiff "$@" | $difftool | less --tabs=4 -RSFX
|
||||
else
|
||||
gdiff "$@"
|
||||
|
|
|
|||
Loading…
Reference in a new issue