X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=a8486a746e303a824dbb77f5223de3c14305561b;hb=ab72382a378e166e50857425a98159db363f4c4b;hp=461c294244c9f48cdf23f0822b6b6de05cb1aa3c;hpb=a66794c98aecaf0c612fcec5488b84b422e05e92;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 461c294..a8486a7 100644 --- a/zsh/rc +++ b/zsh/rc @@ -157,8 +157,8 @@ fi # stops precmd() resets the windows' name to 'zsh'. # # It works with screen and xterm. If screen is running in X11 (DISPLAY is set) -# and stumpwm is used (it's tested if stumpish is available) then the window -# title is also set in stumpwm using stumpish. +# and stumpwm is running then the window title is also set in stumpwm using +# stumpish. # # If a command is run with sudo or if the shell is running as root then a ! is # added at the beginning of the command to make this clear. If a command is @@ -167,8 +167,8 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then # Set to a non empty value to reset the window name in the next precmd() # call. window_reset=yes - # Set to a non empty value when the stump window manager is available. - which stumpwm &> /dev/null + # Set to a non empty value when the stump window manager is running. + ps aux | grep -q stumpwm | grep -v grep if [[ $? -eq 0 ]]; then window_stumpwm=yes fi @@ -322,34 +322,37 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes # CUSTOM ALIASES AND FUNCTIONS +# If ^C is pressed while typing a command, add it to the history so it can be +# easily retrieved later and then abort like ^C normally does. This is useful +# when I want to abort an command to do something in between and then finish +# typing the command. +TRAPINT() { + # Store the current buffer in the history. + zle && print -s $BUFFER + + # Return the default exit code so zsh aborts the current command. + return $1 +} + +# Colorize stderr. Very useful when looking for errors. Thanks to +# http://gentoo-wiki.com/wiki/Zsh +exec 2>>(while read line; do + print '\e[91m'${(q)line}'\e[0m' > /dev/tty; print -n $'\0'; done &) + # Make sure aliases are expanded when using sudo. alias sudo='sudo ' -# Redirect stderr to stdout. +# Global aliases for often used commands used in the command line. alias -g E='2>&1' - -# Simplify calls to less, automatically redirects all output. alias -g L='E | less' -# Simplify calls to colordiff, output is also piped through less. alias -g D='E | colordiff L' -# Simplify calls to grep. alias -g G='| grep' -# Simplify calls to sort. alias -g S='| sort' -# Automatically use unified diffs. -alias diff='diff -u' - -# Display all files and use human readable sizes. -alias du='du -sh' - -# Use human readable sizes. -alias df='df -h' - -# Multiple files given to Vim are opened in tabs, supported since Vim 7. -if [[ ${${${(f)"$(vim --version)"}[1]#VIM - Vi IMproved }%% *} == 7* ]]; then - alias vim='vim -p' -fi +# Make going up directories simple. +alias -g ...='../..' +alias -g ....='../../..' +alias -g .....='../../../..' # Shortcuts for often used programs. alias e='elinks' @@ -358,20 +361,6 @@ alias m='mutt' alias v='vim' alias vi='vim' -# I sometimes confuse editor and shell, print a warning to prevent I exit the -# shell. -alias :q='echo "This is not Vim!" >&2' - -# Edit the mercurial patch queue series file for the current mercurial -# repository in Vim. Also change Vim's pwd to the patches directory so other -# patches can easily be opened. -alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"' - -# Make going up directories simple. -alias -g ...='../..' -alias -g ....='../../..' -alias -g .....='../../../..' - # Improved ls which displays the files in columns (-C), visualizes # directories, links and other special files (-F) and pages everything through # less (L). @@ -398,22 +387,41 @@ function ll() { la -l $* } -# If ^C is pressed while typing a command, add it to the history so it can be -# easily retrieved later and then abort like ^C normally does. This is useful -# when I want to abort an command to do something in between and then finish -# typing the command. -TRAPINT() { - # Store the current buffer in the history. - zle && print -s $BUFFER +# I sometimes confuse editor and shell, print a warning to prevent I exit the +# shell. +alias :q='echo "This is not Vim!" >&2' - # Return the default exit code so zsh aborts the current command. - return $1 -} +# Automatically use unified diffs. +alias diff='diff -u' -# Colorize stderr. Very useful when looking for errors. Thanks to -# http://gentoo-wiki.com/wiki/Zsh -exec 2>>(while read line; do - print '\e[91m'${(q)line}'\e[0m' > /dev/tty; print -n $'\0'; done &) +# Display all files and use human readable sizes. +alias du='du -sh' + +# Use human readable sizes. +alias df='df -h' + +# Edit the mercurial patch queue series file for the current mercurial +# repository in Vim. Also change Vim's pwd to the patches directory so other +# patches can easily be opened. +alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"' + +# Display all branches (except stash) in gitk but only 200 commits as this is +# much faster. Also put in the background and disown. Thanks to sitaram in +# #git on Freenode (2009-04-20 15:51). +gitk() { + command gitk \ + --max-count=200 \ + $(git rev-parse --symbolic-full-name --remotes --branches) \ + $@ & + disown %command +} +# Same for tig (except the disown part as it's no GUI program). +tig() { + command tig \ + --max-count=200 \ + $(git rev-parse --symbolic-full-name --remotes --branches) \ + $@ +} # RUN COMMANDS @@ -423,12 +431,14 @@ exec 2>>(while read line; do # screen* is necessary as `screen` uses screen.linux for example for a linux # console which would otherwise cause an infinite loop. if [[ $TERM != screen* && $TERM != 'dumb' ]]; then + # Get running detached sessions. + session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') # Create a new session if none is running. - if [[ $(screen -list | grep "Detached" | wc -l) == 0 ]]; then + if [[ -z $session ]]; then screen # Reattach to a running session. else - screen -r + screen -r $session fi fi