X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=902d184bc4c0970c17d7ec06b6493a163c0b2873;hb=2dad868f3aa83676dde4b9891c49389e77b90a7e;hp=5276361bf8f371dd0f814c1b2b07ae61427933d9;hpb=bba57cf2b29e813e061cefd755abbe2021bb7c07;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 5276361..902d184 100644 --- a/zsh/rc +++ b/zsh/rc @@ -52,7 +52,7 @@ if [[ -d ~/.zsh/functions ]]; then fi # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At -# the moment only precmd() and preexec() are simulated. +# the moment only precmd(), preexec() and chpwd() are simulated. # # 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. @@ -60,7 +60,8 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then # Provide add-zsh-hook which was added in 4.3.4. fpath=(~/.zsh/functions/compatibility $fpath) - # Run all functions defined in the ${precmd,preexec}_functions arrays. + # Run all functions defined in the ${precmd,preexec,chpwd}_functions + # arrays. function precmd() { for function in $precmd_functions; do $function $@ @@ -71,6 +72,11 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then $function $@ done } + function chpwd() { + for function in $chpwd_functions; do + $function $@ + done + } fi # Autoload add-zsh-hook to add/remove zsh hook functions easily. @@ -79,6 +85,7 @@ autoload -Uz add-zsh-hook # Load zmv (zsh move) which is powerful to rename files. autoload zmv + # HISTORY SETTINGS # Use history and store it in ~/.zsh/history. @@ -93,7 +100,7 @@ setopt incappendhistory setopt histignoredups # Vim like completions of previous executed commands (also enter Vi-mode). If # called at the beginning it just recalls old commands (like cursor up), if -# called after typing something only lines starting with the typed are +# called after typing something, only lines starting with the typed are # returned. Very useful to get old commands quickly. Thanks to Mikachu in #zsh # on Freenode (2010-01-17 12:47) for the information how to a use function # with bindkey. @@ -113,11 +120,11 @@ my-vi-history-beginning-search-backward() { zle vi-forward-char fi } -bindkey "^P" my-vi-history-beginning-search-backward -bindkey -a "^P" history-beginning-search-backward # binding for Vi-mode +bindkey '^P' my-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. -bindkey -a "^N" history-beginning-search-forward +bindkey -a '^N' history-beginning-search-forward # PROMPT SETTINGS @@ -134,19 +141,20 @@ local default="%{${fg[default]}%}" # Set the default prompt. The current host and working directory is displayed, # the exit code of the last command if it wasn't 0, the number of running jobs -# if not 0 and a + if this shell is running inside another shell. +# 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. PROMPT="$green%B%m%b$default:$blue%B%~%b$default \ %(1j.$yellow%j$default.)%# \ %(?..($red%B%?%b$default%) )" -# VCS_Info was added in 4.3.9 but it works in earlier versions too. So load it +# 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. + # 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 @@ -154,20 +162,43 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || fi # Allow substitutions and expansions in the prompt, necessary for - # VCS_info. + # vcs_info. setopt promptsubst - # Load VCS_info to display information about version control repositories. + # 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 - # Set style of VCS_info display. The current branch (green) and VCS (blue) + # 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 true + + # Set style of vcs_info display. The current branch (green) and VCS (blue) # is displayed. If there is an special action going on (merge, rebase) - # it's also displayed (red). - zstyle ':vcs_info:*' formats \ - "($green%b$default:$blue%s$default)" - zstyle ':vcs_info:*' actionformats \ - "($green%b$default/$red%a$default:$blue%s$default)" - # Call VCS_info as precmd before every prompt. + # it's also displayed (red). Also display if there are unstaged or staged + # (%u/%c) changes. + 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)" + zstyle ':vcs_info:*' actionformats \ + "($green%b%u%c$default/$red%a$default:$blue%s$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)" + zstyle ':vcs_info:*' actionformats \ + "($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 + # true for this to work. Thanks to Bart Trojanowski + # (http://jukie.net/~bart/blog/pimping-out-zsh-prompt) for the idea + # (2010-03-11 00:20). + zstyle ':vcs_info:*' unstagedstr '¹' + zstyle ':vcs_info:*' stagedstr '²' + + # Call vcs_info as precmd before every prompt. prompt_precmd() { vcs_info } @@ -196,8 +227,10 @@ unset red blue green yellow default # # 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. This -# only works if the .zshrc on the server also uses this command. +# running on a different computer with ssh a @ is added at the beginning. If +# screen is running on the remote machine instead of @screen @:hostname +# (hostname replaced by the machine's hostname) is displayed. This only works +# if the .zshrc on the server also uses this command. 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. @@ -252,6 +285,12 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then # different computer. if [[ -n $SSH_CONNECTION ]]; then program_name="@$program_name" + + # If screen is running in SSH then display "@:hostname" as title + # in the term/outer screen. + if [[ $program_name == @screen ]]; then + program_name="@:${$(hostname)//.*/}" + fi fi # Set the window name to the currently running program. @@ -266,11 +305,11 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then [[ -z $window_reset ]] && return # Reset the window name to 'zsh'. - local name="zsh" + local name=zsh # If the function was called with an argument then reset the window # name to '.zsh' (used by clear alias). if [[ -n $1 ]]; then - name=".zsh" + name=.zsh fi # Prepend prefixes like in window_preexec(). @@ -287,14 +326,15 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then } # Sets the window title. Works with screen, xterm and rxvt. - window_title() { - if [[ $TERM == screen* ]]; then + if [[ $TERM == screen* ]]; then + window_title() { print -n "\ek$1\e\\" - - elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then + } + elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then + window_title() { print -n "\e]2;$1\e\\" - fi - } + } + fi # Add the preexec() and precmd() hooks. add-zsh-hook preexec window_preexec @@ -324,7 +364,7 @@ zstyle ':completion:*' completer _complete _match _correct _approximate 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 +bindkey '^I' expand-or-complete-prefix # 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}' @@ -366,17 +406,18 @@ TRAPINT() { # Store the current buffer in the history. zle && print -s -- $BUFFER - # Return the default exit code so zsh aborts the current command. + # Return the default exit code so Zsh aborts the current command. return $1 } # Colorize stderr. 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) for some improvements (-r, printf). It's not yet -# perfect and doesn't work with some interactive stderr output, but in those +# perfect and doesn't work with su and git for example, but it can handle most +# interactive output quite well (even with no trailing new line) and in those # cases the E alias can be used as workaround. -exec 2>>(while read -r line; do - printf '\e[91m%s\e[0m\n' "$line" +exec 2>>(while read -r -k -u 0 line; do + printf '\e[91m%s\e[0m' "$line"; print -n $'\0'; done &) @@ -395,6 +436,8 @@ alias -g D='E | colordiff L' alias -g G='| grep' alias -g S='| sort' alias -g U='| uniq' +alias -g H='| head' +alias -g T='| tail' # Make going up directories simple. alias -g ...='../..' @@ -429,32 +472,13 @@ tig() { } -# 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 - # Get running detached sessions. - session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') - # Create a new session if none is running. - if [[ -z $session ]]; then - screen - # Reattach to a running session. - else - screen -r $session - fi -fi - - # OS SPECIFIC SETTINGS if [[ $(uname) == Linux ]]; then # Settings when creating Debian packages. DEBEMAIL=simon@ruderich.org export DEBEMAIL - DEBFULLNAME="Simon Ruderich" + DEBFULLNAME='Simon Ruderich' export DEBFULLNAME elif [[ $(uname) == Darwin ]]; then # Mac OS X @@ -476,9 +500,31 @@ elif [[ $(uname) == Darwin ]]; then # Mac OS X fi +# LOAD ADDITIONAL CONFIGURATION FILES + # Load rc file for current hostname (first part before a dot) or rc.local. source_config ~/.zsh host rc ${$(hostname)//.*/} + +# 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 + # Get running detached sessions. + session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') + # Create a new session if none is running. + if [[ -z $session ]]; then + screen + # Reattach to a running session. + else + screen -r $session + fi +fi + + source_debug "finished sourcing ~/.zsh/rc" # vim: ft=zsh