X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=c95c3760cd1796a094cdc7bd9ef220de5968e865;hb=356f6b726dcbb38970fc32185280dc69a5930883;hp=e6a27ef5f85aebf98494ee68361d5daf51531f7a;hpb=b5a0a1c1fd6785ae87d27d043063c75dfedcd367;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index e6a27ef..c95c376 100644 --- a/zsh/rc +++ b/zsh/rc @@ -34,6 +34,11 @@ setopt ignoreeof # Make sure every entry in $fpath is unique. typeset -U fpath +# ~/.zsh/functions/completion is a symbolic link to the Completion directory +# of a Zsh CVS checkout. Use it to get the newest completions if available. +if [[ -d ~/.zsh/functions/completion ]]; then + fpath=(~/.zsh/functions/completion/*/*(/) $fpath) +fi # Set correct fpath to allow loading my functions (including completion # functions). fpath=(~/.zsh/functions $fpath) @@ -41,7 +46,7 @@ fpath=(~/.zsh/functions $fpath) # to caphuso from the Zsh example files for this idea. autoload ${fpath[1]}/^_*(^/:t) -# Simulate hooks using _functions arrays for Zsh versions older then 4.3.4. At +# Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At # the moment only precmd() and preexec() are simulated. # # At least 4.3.4 (not sure about later versions) has an error in add-zsh-hook @@ -99,8 +104,18 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\ %(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \ %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )" -# VCS_Info was added in 4.3.9. -if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then +# VCS_Info was added in 4.3.9 but it works in earlier versions too. So load it +# if the necessary files are available in ~/.zsh/functions/vcs_info (often a +# symbolic link to current checkout of Zsh's sources). +if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || + -d ~/.zsh/functions/vcs_info ]]; then + # Update fpath to allow loading the VCS_Info functions. + if [[ -d ~/.zsh/functions/vcs_info ]]; then + fpath=(~/.zsh/functions/vcs_info/ + ~/.zsh/functions/vcs_info/Backends + $fpath) + fi + # Allow substitutions and expansions in the prompt, necessary for # vcs_info. setopt promptsubst @@ -125,32 +140,40 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then add-zsh-hook precmd prompt_precmd # Display the vcs information in the right prompt. - RPROMPT='${vcs_info_msg_0_}' + if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then + RPROMPT='${vcs_info_msg_0_}' + # There is a bug in Zsh below 4.3.9 which displays a wrong symbol when + # ${vcs_info_msg_0_} is empty. Provide a workaround for those versions, + # thanks to Frank Terbeck for it. + else + RPROMPT='${vcs_info_msg_0_:- }' + fi fi # When screen or xterm is used set the name of the window to the currently # running program. # # When a program is started preexec() sets the window's name to it; when it -# stops precmd() resets the windows' name to 'zsh'. +# stops precmd() resets the window's 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 -# running on a different computer with ssh a @ is added at the beginning. +# running on a different computer with ssh a @ is added at the beginning. This +# only works if the .zshrc on the server also uses this command. if [[ $TERM == screen* || $TERM == xterm* ]]; then - # Set to a non empty value to reset the window name in the next precmd() - # call. + # Is 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 + # Is 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 - # Set to a non empty value when the shell is running as root. + # Is set to a non empty value when the shell is running as root. if [[ $(id -u) -eq 0 ]]; then window_root=yes fi @@ -172,7 +195,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then # Ignore often used commands which are only running for a very short # time. This prevents a "blinking" name when it's changed to "cd" for # example and then some milliseconds later back to "zsh". - [[ $program_name == (cd*|ls|la|ll|clear) ]] && return + [[ $program_name == (cd*|ls|la|ll|clear|c) ]] && return # Change my shortcuts so the real name of the program is displayed. case $program_name in @@ -192,12 +215,12 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then # Add an exclamation mark at the beginning if running with sudo or if # running zsh as root. - if [[ $program_sudo == yes || $window_root == yes ]]; then + if [[ -n $program_sudo || -n $window_root ]]; then program_name=!$program_name fi - # Add an at mark at the beginning if running ssh on a different - # computer. + # Add an at mark at the beginning if running through ssh on a + # different computer. if [[ -n $SSH_CONNECTION ]]; then program_name="@$program_name" fi @@ -216,7 +239,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then # Reset the window name to 'zsh'. if [[ -n $SSH_CONNECTION ]]; then window_title "@zsh" - elif [[ $window_root == yes ]]; then + elif [[ -n $window_root ]]; then window_title "!zsh" else window_title "zsh" @@ -247,6 +270,15 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then add-zsh-hook precmd window_precmd fi +# If the window naming feature is used (see above) then use ".zsh" (leading +# dot) as title name after running clear so it's clear to me that the window +# is empty. I open so much windows that I don't know in which I have something +# important. This helps me to remember which windows are empty (I run clear +# after I finished my work in a window). +if [[ -n $window_reset ]]; then + alias clear='clear; window_title .zsh' +fi + # COMPLETION SETTINGS @@ -300,51 +332,49 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes # CUSTOM ALIASES AND FUNCTIONS -# Make sure aliases are expanded when using sudo. -alias sudo='sudo ' +# 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. +# +# Thanks to Vadim Zeitlin for a fix (--) so lines +# starting with - don't cause errors. +TRAPINT() { + # Store the current buffer in the history. + zle && print -s -- $BUFFER -# Simplify calls to less, automatically redirects all output. -alias -g L='2>&1 | less' -# Simplify calls to colordiff, output is also piped through less. -alias -g D='2>&1 | colordiff L' -# Simplify calls to grep. -alias -g G='| grep' + # 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' +# Make sure aliases are expanded when using sudo. +alias sudo='sudo ' -# Use human readable sizes. -alias df='df -h' +# Global aliases for often used commands used in the command line. +alias -g E='2>&1' +alias -g L='E | less' +alias -g D='E | colordiff L' +alias -g G='| grep' +alias -g S='| sort' -# 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 c='clear' alias e='elinks' alias g='git' 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). @@ -371,29 +401,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' -# Display TODOs stored in ~/.todo if this file exists. -todo() { - if [[ -f ~/.todo ]]; then - cat ~/.todo | $PAGER - fi -} +# Display all files and use human readable sizes. +alias du='du -sh' -# 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 &) +# 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 @@ -403,12 +445,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