# Zsh configuration file.
-# Copyright (C) 2011-2012 Simon Ruderich
+# Copyright (C) 2011-2013 Simon Ruderich
#
# This file is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# along with this file. If not, see <http://www.gnu.org/licenses/>.
-source_debug ". ~/.zsh/rc"
+source_debug '. ~/.zsh/rc'
+
+
+# Warn when creating global variables from inside a function. Needs to be set
+# before declaring a function.
+setopt warn_create_global
# HELPER FUNCTIONS
# Return the name of the program which is called in the foreground with `fg`.
# $1 is the name of the program (optional). If it's not 'fg' or 'fg *' it's
# returned unchanged.
-resolve_fg_to_resumed_job_name() {
+zshrc_resolve_fg_to_resumed_job_name() {
# $REPLY is used by convention for scalars ($reply for arrays) to return
# values from functions. unset it here to prevent problems when REPLY is
# bound to an integer or similar. Thanks to Mikachu in #zsh on Freenode
# MISCELLANEOUS SETTINGS
-# Be paranoid, new files are readable/writable by me only, but not as root.
-if [[ $UID -ne 0 ]]; then
- umask 077
-fi
+# Prevent warnings.
+typeset -g TMOUT
+# Load general shell setup commands. NOTE: Expand this when publishing the
+# config.
+source_config ~/.shell/rc
# Disable beeps.
setopt nobeep
# Enable zsh's extended glob abilities.
setopt extendedglob
-# Don't exit if <C-d> is pressed.
+# Don't exit if <C-D> is pressed. Prevents exiting the shell by accident (e.g.
+# pressing <C-D> twice).
setopt ignoreeof
# Use Vi(m) style key bindings.
bindkey -v
-# Use jj and jk to exit insert mode.
-bindkey 'jj' vi-cmd-mode
+# Use jk to exit insert mode (jj is too slow).
bindkey 'jk' vi-cmd-mode
# I don't need the arrow keys, I use ^N and ^P for this (see below).
# 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.
+# of a Zsh Git checkout. Use it to get the newest completions if available.
if [[ -d ~/.zsh/functions/completion ]]; then
fpath=(~/.zsh/functions/completion/*/*(/) $fpath)
fi
# returned. Very useful to get old commands quickly - in addition to the
# history commands (!..). Thanks to Mikachu in #zsh on Freenode (2010-01-17
# 12:47 CET) for the information how to a use function with bindkey.
-zle -N my-vi-history-beginning-search-backward
-my-vi-history-beginning-search-backward() {
+zle -N zshrc-vi-history-beginning-search-backward
+zshrc-vi-history-beginning-search-backward() {
local not_at_beginning_of_line
if [[ $CURSOR -ne 0 ]]; then
not_at_beginning_of_line=yes
zle vi-forward-char
fi
}
-bindkey '^P' my-vi-history-beginning-search-backward
+bindkey '^P' zshrc-vi-history-beginning-search-backward
bindkey -a '^P' history-beginning-search-backward # binding for Vi-mode
# Here only Vi-mode is necessary as ^P enters Vi-mode and ^N only makes sense
# after calling ^P.
# Load vcs_info to display information about version control repositories.
autoload -Uz vcs_info
- # Only look for git and mercurial repositories; the only I use.
- zstyle ':vcs_info:*' enable git hg
+ # Only look for certain VCS.
+ zstyle ':vcs_info:*' enable git
# Check the repository for changes so they can be used in %u/%c (see
# below). This comes with a speed penalty for bigger repositories.
zstyle ':vcs_info:*' check-for-changes yes
if [[ $ZSH_VERSION == (4.3.<11->*|4.<4->*|<5->*) ||
-d ~/.zsh/functions/vcs_info ]]; then
zstyle ':vcs_info:*' formats \
- "($green%b%u%c$default:$blue%s$default)"
+ "(${green}%b%u%c${default}:${blue}%s${default}%m)" \
+ "${green}%u%c${default}"
zstyle ':vcs_info:*' actionformats \
- "($green%b%u%c$default/$red%a$default:$blue%s$default)"
+ "(${green}%b%u%c${default}/${red}%a${default}:${blue}%s${default}%m)" \
+ "${green}%u%c${default}"
else
# In older versions %u and %c are not defined yet and are not
# correctly expanded.
zstyle ':vcs_info:*' formats \
- "($green%b$default:$blue%s$default)"
+ "(${green}%b${default}:${blue}%s${default})"
zstyle ':vcs_info:*' actionformats \
- "($green%b$default/$red%a$default:$blue%s$default)"
+ "(${green}%b${default}/${red}%a${default}:${blue}%s${default})"
fi
# Set style for formats/actionformats when unstaged (%u) and staged (%c)
# changes are detected in the repository; check-for-changes must be set to
# Default to run vcs_info. If possible we prevent running it later for
# speed reasons. If set to a non empty value vcs_info is run.
- FORCE_RUN_VCS_INFO=1
+ zshrc_force_run_vcs_info=1
# Cache system inspired by Bart Trojanowski
# (http://jukie.net/~bart/blog/pimping-out-zsh-prompt).
# If the shell just started up or we changed directories (or for other
# custom reasons) we must run vcs_info.
- if [[ -n $FORCE_RUN_VCS_INFO ]]; then
- FORCE_RUN_VCS_INFO=
+ if [[ -n $zshrc_force_run_vcs_info ]]; then
+ zshrc_force_run_vcs_info=
return
fi
esac
}
+ # Display number of WIP stashes (this excludes manually named commits
+ # which might be used for something else), thanks to
+ # http://eseth.org/2010/git-in-zsh.html (viewed on 2013-04-27) for the
+ # idea to display the stash count.
+ function +vi-git-stashes() {
+ if [[ -s ${hook_com[base]/.git/refs/stash} ]]; then
+ local -a stashes
+ # Thanks to Valodim in #zsh on Freenode (2013-07-01 14:14 CEST)
+ # for the solution to "grep" the output with (M) and :#(...).
+ stashes=( ${(M)${(f)"$(git stash list 2>/dev/null)"}:#(*WIP*)} )
+
+ if [[ ${#stashes} -gt 0 ]]; then
+ hook_com[misc]+=" ${yellow}${#stashes}s${default}"
+ fi
+ fi
+ }
+
+ # Apply hooks to Git.
+ zstyle ':vcs_info:git*+set-message:*' hooks git-stashes
+
# Must run vcs_info when changing directories.
prompt_chpwd() {
- FORCE_RUN_VCS_INFO=1
+ zshrc_force_run_vcs_info=1
}
chpwd_functions+=(prompt_chpwd)
# Used by prompt code below to determine if vcs_info should be run.
- RUN_VCS_INFO=1
+ zshrc_use_vcs_info=1
else
- RUN_VCS_INFO=
+ zshrc_use_vcs_info=
fi
-typeset -a longrun_data
-longrun_data=()
+typeset -a zshrc_longrun_data
+zshrc_longrun_data=()
# Display runtime in seconds for long running programs (> 60 seconds) and send
# a bell to notify me.
-longrun_preexec() {
+zshrc_longrun_preexec() {
local program="$3"
# Handle fg.
local REPLY
- resolve_fg_to_resumed_job_name "$program"
+ zshrc_resolve_fg_to_resumed_job_name "$program"
program="$REPLY"
# Don't track the time for certain (possible) long running processes which
for ignore in elinks man mutt vim; do
case $program in
$ignore | $ignore\ *)
- longrun_data=()
+ zshrc_longrun_data=()
return
;;
esac
done
- longrun_data=("$program" $EPOCHSECONDS)
+ zshrc_longrun_data=("$program" $EPOCHSECONDS)
}
-longrun_precmd() {
+zshrc_longrun_precmd() {
# No previous timestamp available or disabled for this command, ignore.
- if [[ -z $longrun_data ]]; then
+ if [[ -z $zshrc_longrun_data ]]; then
return
fi
- local difference=$(( EPOCHSECONDS - longrun_data[2] ))
+ local difference=$(( EPOCHSECONDS - zshrc_longrun_data[2] ))
if [[ $difference -gt 60 ]]; then
echo
echo -n "${fg[yellow]}"
- echo -n "~> ${(V)longrun_data[1]} took $difference seconds."
+ echo -n "~> ${(V)zshrc_longrun_data[1]} took $difference seconds."
echo -n "${fg[default]}"
echo "\a" # send bell
fi
# Clear status. Prevents displaying old status information when pressing
# enter with an empty command line.
- longrun_data=()
+ zshrc_longrun_data=()
}
-preexec_functions+=(longrun_preexec)
-precmd_functions+=(longrun_precmd)
+preexec_functions+=(zshrc_longrun_preexec)
+precmd_functions+=(zshrc_longrun_precmd)
# Set the prompt. A two line prompt is used. On the top left the current
# working directory is displayed, on the right vcs_info (if available) and the
# if not 0.
#
# The prompt is in green and blue to make easily detectable, the error exit
-# code in red and bold and the job count in yellow.
+# code in red and bold and the job count in yellow. Designed for dark
+# terminals.
#
# Thanks to Adam's prompt for the basic idea of this prompt.
-prompt_precmd() {
+zshrc_prompt_precmd() {
# Regex to remove elements which take no space. Used to calculate the
# width of the top prompt. Thanks to Bart's and Adam's prompt code in
# Functions/Prompts/prompt_*_setup.
local zero='%([BSUbfksu]|([FB]|){*})'
# Call vcs_info before every prompt.
- if [[ -n $RUN_VCS_INFO ]]; then
+ if [[ -n $zshrc_use_vcs_info ]]; then
vcs_info
else
vcs_info_msg_0_=
+ vcs_info_msg_1_=
fi
# Setup. Create variables holding the formatted content.
# Current directory in yellow, truncated if necessary (WIDTH is replaced
# below).
local directory="${yellow}%WIDTH<..<%~%<<${default}"
+ # Minimal information about the VCS, only displayed if there are
+ # unstaged/staged changes.
+ local vcs_staged="${vcs_info_msg_1_}"
# Information about the VCS in this directory.
local vcs="${vcs_info_msg_0_}"
host="%U${host}%u"
fi
- # Number of background processes in yellow.
+ # Number of background processes in yellow if not zero.
local background="%(1j.${yellow}%j${default}.)"
- # Exit code in bright red if not zero.
+ # Exit code in bright red in parentheses if not zero.
local exitcode="%(?..(${red}%B%?%b${default}%) )"
+ # Prompt symbol, % for normal users, # in red for root.
+ local symbol="%(!.${red}#${default}.%%)"
# Prefix characters in first and second line.
local top_prefix="${blue}%B.-%b${default}"
# Combine them to create the prompt.
+ local top_left="${vcs_staged}"
local top_right="${vcs}(${seconds})"
local width_top_prefix=${#${(S%%)top_prefix//$~zero/}}
+ local width_top_left=${#${(S%%)top_left//$~zero/}}
local width_top_right=${#${(S%%)top_right//$~zero/}}
# Calculate the maximum width of ${top_left}. -2 are the braces of
# ${top_left}, -1 is one separator from ${top_separator} (we want at least
# one between left and right parts).
local top_left_width_max=$((
- COLUMNS - $width_top_prefix - 2 - 1 - $width_top_right
+ COLUMNS - $width_top_prefix
+ - $width_top_left - 2
+ - 1
+ - $width_top_right
))
# Truncate directory if necessary.
- local top_left="(${directory/WIDTH/${top_left_width_max}})"
- local width_top_left=${#${(S%%)top_left//$~zero/}}
+ top_left="(${directory/WIDTH/${top_left_width_max}})${top_left}"
+ width_top_left=${#${(S%%)top_left//$~zero/}}
# Calculate the width of the top prompt to fill the middle with "-".
local width=$((
local top_separator="%B${blue}${(l:${width}::-:)}%b${default}"
PROMPT="${top_prefix}${top_left}${top_separator}${top_right}
-${bottom_prefix}${user}@${host} ${background}%# ${exitcode}"
+${bottom_prefix}${user}@${host} ${background}${symbol} ${exitcode}"
}
-precmd_functions+=(prompt_precmd)
+precmd_functions+=(zshrc_prompt_precmd)
-# When screen, tmux, xterm or rxvt is used set the name of the window to the
-# currently running program.
+# When GNU screen, tmux, xterm or rxvt 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 window's name to 'zsh'. 'fg' is supported and sets
# the window's name to the resumed job.
#
-# It works with screen, tmux, xterm and rxvt.
+# It works with GNU screen, tmux, xterm and rxvt.
#
# 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
if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
# Is set to a non empty value to reset the window name in the next
# precmd() call.
- window_reset=yes
- # Is set to a non empty value when the shell is running as root.
- if [[ $UID -eq 0 ]]; then
- window_root=yes
- fi
+ zshrc_window_reset=yes
- window_preexec() {
+ zshrc_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
+ # When sudo is used, use real program name instead, but with an
# exclamation mark at the beginning (handled below).
local program_sudo=
if [[ $program_name == sudo* ]]; then
# Handle fg.
local REPLY
- resolve_fg_to_resumed_job_name "$program_name"
+ zshrc_resolve_fg_to_resumed_job_name "$program_name"
program_name="$REPLY"
# Remove all arguments from the program name.
# 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
+ if [[ -n $program_sudo || $UID -eq 0 ]]; then
program_name=!$program_name
fi
fi
# Set the window name to the currently running program.
- window_title "$program_name"
+ zshrc_window_title "$program_name"
# Tell precmd() to reset the window name when the program stops.
- window_reset=yes
+ zshrc_window_reset=yes
}
- window_precmd() {
+ zshrc_window_precmd() {
# Abort if no window name reset is necessary.
- [[ -z $window_reset ]] && return
+ [[ -z $zshrc_window_reset ]] && return
# Reset the window name to 'zsh'.
local name=zsh
name=.zsh
fi
- # Prepend prefixes like in window_preexec().
- if [[ -n $window_root ]]; then
+ # Prepend prefixes like in zshrc_window_preexec().
+ if [[ $UID -eq 0 ]]; then
name="!$name"
fi
if [[ -n $SSH_CONNECTION ]]; then
name="@$name"
fi
- window_title $name
+ zshrc_window_title $name
# Just reset the name, so no screen reset necessary for the moment.
- window_reset=
+ zshrc_window_reset=
}
- # Sets the window title. Works with screen, tmux (which uses screen as
- # TERM), xterm and rxvt. (V) escapes all non-printable characters. Thanks
+ # Sets the window title. Works with GNU screen, tmux (which uses screen as
+ # TERM), xterm and rxvt. (V) escapes all non-printable characters, thanks
# to Mikachu in #zsh on Freenode (2010-08-07 17:09 CEST).
if [[ $TERM == screen* ]]; then
- window_title() {
+ zshrc_window_title() {
print -n "\ek${(V)1}\e\\"
}
elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
- window_title() {
+ zshrc_window_title() {
print -n "\e]2;${(V)1}\e\\"
}
else
# Fallback if another TERM is used.
- window_title() { }
+ zshrc_window_title() { }
fi
# Add the preexec() and precmd() hooks.
- preexec_functions+=(window_preexec)
- precmd_functions+=(window_precmd)
+ preexec_functions+=(zshrc_window_preexec)
+ precmd_functions+=(zshrc_window_precmd)
else
# Fallback if another TERM is used, necessary to run screen (see below in
# "RUN COMMANDS").
- window_preexec() { }
+ zshrc_window_preexec() { }
fi
alias -g L='2>&1 | less'
alias -g LS='2>&1 | less -S' # -S prevents wrapping of long lines
alias -g D='2>&1 | colordiff | less'
-# Global aliases for often used commands in the command line.
+# Global aliases for often used commands.
alias -g A='| awk'
alias -g G='| grep'
alias -g H='| head'
# 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_reset=yes; window_precmd reset'
+if [[ -n $zshrc_window_reset ]]; then
+ alias clear='clear; zshrc_window_reset=yes; zshrc_window_precmd reset'
fi
if [[ $OSTYPE == linux* ]]; then
# Settings when creating Debian packages.
- DEBEMAIL=simon@ruderich.org
- export DEBEMAIL
- DEBFULLNAME='Simon Ruderich'
- export DEBFULLNAME
+ export DEBEMAIL=simon@ruderich.org
+ export DEBFULLNAME='Simon Ruderich'
fi
# LOAD ADDITIONAL CONFIGURATION FILES
-# Configuration option for rc.local to use GNU screen/tmux. By default GNU
-# screen is used. Possible values: screen, tmux.
-use_multiplexer=screen
+# Configuration options for rc.local.
+
+# Multiplexer to use. By default GNU screen is used. Possible values: screen,
+# tmux and empty (no multiplexer).
+zshrc_use_multiplexer=screen
+# Additional arguments for fortune.
+zshrc_fortune_arguments=()
source_config ~/.zsh/rc.local
# RUN COMMANDS
+# Make sure the multiplexer is available. Otherwise the exec terminates our
+# session.
+if [[ -n $zshrc_use_multiplexer ]]; then
+ if ! (( $+commands[$zshrc_use_multiplexer] )); then
+ echo "Multiplexer '$zshrc_use_multiplexer' not found." >&2
+ zshrc_use_multiplexer=
+ fi
+fi
+
# If not already in screen or tmux, reattach to a running session or create a
# new one. This also starts screen/tmux on a remote server when connecting
# through ssh.
if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
# Get running detached sessions.
- if [[ $use_multiplexer = screen ]]; then
+ if [[ $zshrc_use_multiplexer = screen ]]; then
session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
- elif [[ $use_multiplexer = tmux ]]; then
+ elif [[ $zshrc_use_multiplexer = tmux ]]; then
session=$(tmux list-sessions 2>/dev/null \
| sed '/(attached)$/ d; s/^\([0-9]\{1,\}\).*$/\1/; q')
fi
# As we exec later we have to set the title here.
- if [[ $use_multiplexer = screen ]]; then
- window_preexec "screen"
- elif [[ $use_multiplexer = tmux ]]; then
- window_preexec "tmux"
+ if [[ $zshrc_use_multiplexer = screen ]]; then
+ zshrc_window_preexec screen
+ elif [[ $zshrc_use_multiplexer = tmux ]]; then
+ zshrc_window_preexec tmux
fi
# Create a new session if none is running.
if [[ -z $session ]]; then
- if [[ $use_multiplexer = screen ]]; then
+ if [[ $zshrc_use_multiplexer = screen ]]; then
exec screen
- elif [[ $use_multiplexer = tmux ]]; then
+ elif [[ $zshrc_use_multiplexer = tmux ]]; then
exec tmux
fi
# Reattach to a running session.
else
- if [[ $use_multiplexer = screen ]]; then
+ if [[ $zshrc_use_multiplexer = screen ]]; then
exec screen -r $session
- elif [[ $use_multiplexer = tmux ]]; then
+ elif [[ $zshrc_use_multiplexer = tmux ]]; then
exec tmux attach-session -t $session
fi
fi
fi
-# Colorize stderr in red. Very useful when looking for errors. Thanks to
+# Colorize stderr in bold red. Very useful when looking for errors. Thanks to
# http://gentoo-wiki.com/wiki/Zsh for the basic script and Mikachu in #zsh on
# Freenode (2010-03-07 04:03 CET) for some improvements (-r, printf). It's not
# yet perfect and doesn't work with su and git for example, but it can handle
# cases it doesn't work, the E alias can be used as workaround.
#
# Moved in the "run commands" section to prevent one unnecessary zsh process
-# when starting screen/tmux (see above).
+# when starting GNU screen/tmux (see above).
exec 2>>(while read -r -k -u 0 line; do
- printf '\e[91m%s\e[0m' "$line";
- print -n $'\0';
+ printf '\e[91m%s\e[0m' "$line"
+ print -n $'\0'
done &)
-# Run the following programs every 4 hours.
+# Display possible log messages from ~/.xinitrc (if `xmessage` wasn't
+# installed). No race condition as xinitrc has finished before a shell is
+# executed and only one shell is started on login.
+if [[ -f ~/.xinitrc.errors ]]; then
+ echo "${fg_bold[red]}xinitrc failed!${fg_bold[default]}"
+ echo
+ cat ~/.xinitrc.errors
+ rm ~/.xinitrc.errors
+ echo
+fi
+
+# Run the following programs every 4 hours (and when zsh starts).
PERIOD=14400
periodic() {
# Display fortunes.
- (( $+commands[fortune] )) && fortune -ac
+ (( $+commands[fortune] )) && fortune -ac "${zshrc_fortune_arguments[@]}"
# Display reminders.
(( $+commands[rem] )) && [[ -f ~/.reminders ]] && rem -h
}
-source_debug ". ~/.zsh/rc (done)"
+# RESTART SETTINGS
+
+zmodload -F zsh/stat b:zstat
+
+# Remember startup time. Used to perform automatic restarts when ~/.zshrc is
+# modified.
+zshrc_startup_time=$EPOCHSECONDS
+
+# Automatically restart Zsh if ~/.zshrc was modified.
+zshrc_restart_precmd() {
+ local stat
+ if ! zstat -A stat +mtime ~/.zshrc; then
+ return
+ fi
+
+ # ~/.zshrc wasn't modified, nothing to do.
+ if [[ $stat -le $zshrc_startup_time ]]; then
+ return
+ fi
+
+ local startup
+ strftime -s startup '%Y-%m-%d %H:%M:%S' "$zshrc_startup_time"
+
+ echo -n "${fg[magenta]}"
+ echo -n "~/.zshrc modified since startup ($startup) ... "
+ echo -n "${fg[default]}"
+
+ if [[ -n $zshrc_disable_restart ]]; then
+ echo 'automatic restart disabled.'
+ return
+ fi
+
+ # Don't exec if we have background processes because execing will let us
+ # lose control over them.
+ if [[ ${#${(k)jobstates}} -ne 0 ]]; then
+ echo 'active background jobs!'
+ return
+ fi
+
+ # Try to start a new interactive shell. If it fails, something is wrong.
+ # Don't kill our current session by execing it.
+ zsh -i -c 'exit 42'
+ if [[ $? -ne 42 ]]; then
+ echo -n "${fg_bold[red]}"
+ echo 'failed to start new zsh!'
+ echo -n "${fg_bold[default]}"
+ return
+ fi
+
+ echo 'restarting zsh.'
+ echo
+
+ exec zsh
+}
+precmd_functions+=(zshrc_restart_precmd)
+
+
+source_debug '. ~/.zsh/rc (done)'
# vim: ft=zsh
ruderich.org/simon / config / dotfiles.git / blobdiff