X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=e17deede06e225861738d4706f65b0f9b7ae7589;hb=627b2da3d018476eec991653bc721174fe46f2d9;hp=0618ee40a77548d6c99521a58cbe28cec2a752b5;hpb=4a38bc3a4780c7450a64e236344a3205506c7d46;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 0618ee4..e17deed 100644 --- a/zsh/rc +++ b/zsh/rc @@ -32,6 +32,13 @@ setopt ignoreeof # FUNCTION SETTINGS +# 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) @@ -39,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 @@ -97,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 @@ -123,7 +140,14 @@ 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 @@ -135,7 +159,11 @@ fi # 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. -if [[ $TERM == screen || $TERM == xterm* ]]; then +# +# 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. +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 @@ -144,14 +172,21 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then if [[ $? -eq 0 ]]; then window_stumpwm=yes fi + # Set to a non empty value when the shell is running as root. + if [[ $(id -u) -eq 0 ]]; then + window_root=yes + fi window_preexec() { # Get the program name with its arguments. local program_name=$1 + # When sudo is used use real program name instead, but with an # exclamation mark at the beginning. + local program_sudo= if [[ $program_name == sudo* ]]; then - program_name=!${program_name#sudo } + program_name=${program_name#sudo } + program_sudo=yes fi # Remove all arguments from the program name. program_name=${program_name%% *} @@ -177,6 +212,18 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then ;; esac + # Add an exclamation mark at the beginning if running with sudo or if + # running zsh as root. + 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. + if [[ -n $SSH_CONNECTION ]]; then + program_name="@$program_name" + fi + # Set the window name to the currently running program. window_title "$program_name" @@ -189,7 +236,13 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then [[ -z $window_reset ]] && return # Reset the window name to 'zsh'. - window_title "zsh" + if [[ -n $SSH_CONNECTION ]]; then + window_title "@zsh" + elif [[ -n $window_root ]]; then + window_title "!zsh" + else + window_title "zsh" + fi # Just reset the name, so no screen reset necessary for the moment. window_reset= @@ -197,7 +250,7 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then # Sets the window title. Works with screen and xterm. window_title() { - if [[ $TERM == screen ]]; then + if [[ $TERM == screen* ]]; then print -n "\ek$1\e\\" # Update window name in stumpwm if running screen in X11 and when @@ -269,29 +322,37 @@ 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. +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 e='elinks' @@ -300,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). @@ -340,29 +387,28 @@ 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 +# 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 - # Return the default exit code so zsh aborts the current command. - return $1 -} +# I sometimes confuse editor and shell, print a warning to prevent I exit the +# shell. +alias :q='echo "This is not Vim!" >&2' -# Display TODOs stored in ~/.todo if this file exists. -todo() { - if [[ -f ~/.todo ]]; then - cat ~/.todo | $PAGER - fi -} +# 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"' # RUN COMMANDS @@ -372,12 +418,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