X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=e5d41202b833274aa29ef8a755e998bda8f8d256;hb=9155b43f447c52252d6930d856296aaf85b37afc;hp=9b371bcdea336b6b97785518cf6e053db15e0c0d;hpb=41fce3061a8fb5b6465c939253cbda62c8da4b3c;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 9b371bc..e5d4120 100644 --- a/zsh/rc +++ b/zsh/rc @@ -32,6 +32,8 @@ setopt ignoreeof # FUNCTION SETTINGS +# Make sure every entry in $fpath is unique. +typeset -U fpath # Set correct fpath to allow loading my functions (including completion # functions). fpath=(~/.zsh/functions $fpath) @@ -41,9 +43,12 @@ autoload ${fpath[1]}/^_*(^/:t) # Simulate hooks using _functions arrays for Zsh versions older then 4.3.4. At # the moment only precmd() and preexec() are simulated. -if [[ $ZSH_VERSION != (4.3.<4->|4.<4->*|<5->*) ]]; then +# +# At least 4.3.4 (not sure about later versions) has an error in add-zsh-hook +# so the compatibility version is used there too. +if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then # Provide add-zsh-hook which was added in 4.3.4. - fpath=($fpath ~/.zsh/functions/compatibility) + fpath=(~/.zsh/functions/compatibility $fpath) # Run all functions defined in the ${precmd,preexec}_functions arrays. function precmd() { @@ -128,18 +133,38 @@ fi # # When a program is started preexec() sets the window's name to it; when it # stops precmd() resets the windows' name to 'zsh'. -if [[ $TERM == screen || $TERM == xterm* ]]; then +# +# 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 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 + # Set to a non empty value when the stump window manager is available. + which stumpwm &> /dev/null + 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%% *} @@ -165,6 +190,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" @@ -177,7 +214,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= @@ -185,8 +228,15 @@ 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 + # stumpwm is used. + if [[ -n $DISPLAY && -n $window_stumpwm ]]; then + echo "$1" | stumpish -e "title" > /dev/null + fi + elif [[ $TERM == xterm* ]]; then print -n "\e]2;$1\e\\" fi @@ -206,27 +256,40 @@ zmodload zsh/complist # Use new completion system, store dumpfile in ~/.zsh/cache to prevent # cluttering of ~/. autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump + +# Use cache to speed up completions. +zstyle ':completion:*' use-cache on +zstyle ':completion:*' cache-path ~/.zsh/cache + +# Complete arguments and fix spelling mistakes when possible. +zstyle ':completion:*' completer _complete _match _correct _approximate + # Make sure the list of possible completions is displayed after pressing # the first time. setopt nolistambiguous # Allow completions in the middle of a text, i.e. "/usr/bin/whatever" # completes like "/usr/bin/". Useful when adding new options to commands. bindkey "^I" expand-or-complete-prefix -# Use cache to speed up completions. -zstyle ':completion:*' use-cache on -zstyle ':completion:*' cache-path ~/.zsh/cache # Try uppercase if the currently typed string doesn't match. This allows # typing in lowercase most of the time and completion fixes the case. zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' -# Ignore completion functions. -zstyle ':completion:*:functions' ignored-patterns '_*' -# Ignore parent directory. -zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd + # Use ls like colors for completions. zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} + # Make completion lists scrollable so "do you wish to see all n possibilities" # is no longer displayed. zstyle ':completion:*' list-prompt '%p' +# Display group name (like 'external command', 'alias', etc.) when there are +# multiple matches in bold. +zstyle ':completion:*' format ' %B%d%b:' +# Display different types of matches separately. +zstyle ':completion:*' group-name '' + +# Ignore completion functions. +zstyle ':completion:*:functions' ignored-patterns '_*' +# Ignore parent directory. +zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd # When unsetting variables make sure every variable name is only suggested # once. zstyle ':completion:*:unset:*' ignore-line yes @@ -240,12 +303,17 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes # Make sure aliases are expanded when using sudo. alias sudo='sudo ' +# Redirect stderr to stdout. +alias -g E='2>&1' + # Simplify calls to less, automatically redirects all output. -alias -g L='2>&1 | less' +alias -g L='E | less' # Simplify calls to colordiff, output is also piped through less. -alias -g D='2>&1 | colordiff L' +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' @@ -327,6 +395,28 @@ todo() { fi } +# 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 &) + + +# RUN COMMANDS + +# If not already in screen reattach to a running session or create a new one. +# +# 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 + # Create a new session if none is running. + if [[ $(screen -list | grep "Detached" | wc -l) == 0 ]]; then + screen + # Reattach to a running session. + else + screen -r + fi +fi + # Load rc file for current OS. source_config ~/.zsh os rc $(uname) nolocal