X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=4cd696785c37fc1f05edce10e59303bef7a61be2;hb=f9ef70cac91d3a9991efe987fa551a22dfbba426;hp=c6691783224feb182fc95edfc7f521d98fbad12b;hpb=059958b05df78c658fb4fd6b350cfaeb1756b799;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index c669178..4cd6967 100644 --- a/zsh/rc +++ b/zsh/rc @@ -1,6 +1,6 @@ # 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 @@ -85,8 +85,7 @@ 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). @@ -221,8 +220,8 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) || # 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 @@ -234,10 +233,10 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) || 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 @@ -288,6 +287,26 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) || 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() { zshrc_force_run_vcs_info=1 @@ -399,6 +418,8 @@ zshrc_prompt_precmd() { local background="%(1j.${yellow}%j${default}.)" # 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}" @@ -433,7 +454,7 @@ zshrc_prompt_precmd() { 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+=(zshrc_prompt_precmd) @@ -834,6 +855,15 @@ 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. @@ -884,6 +914,17 @@ exec 2>>(while read -r -k -u 0 line; do print -n $'\0' done &) +# 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() { @@ -894,6 +935,63 @@ periodic() { } +# 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