X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=be8e8f5c39e0c9043c24368877d42d258fa2216b;hb=03acd3d7c7b6b4493e51aeba92690c5d6119d079;hp=733921fe0c6e6affa59b7e7b384c9e1115ce2605;hpb=667550d3424b726d074c65289c23160268576bc8;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 733921f..be8e8f5 100644 --- a/zsh/rc +++ b/zsh/rc @@ -82,13 +82,7 @@ fi # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At # 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. -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) - +if [[ $ZSH_VERSION != (4.3.<4->*|4.<4->*|<5->*) ]]; then # Run all functions defined in the ${precmd,preexec,chpwd}_functions # arrays. function precmd() { @@ -108,9 +102,6 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then } fi -# Autoload add-zsh-hook to add/remove zsh hook functions easily. -autoload -Uz add-zsh-hook - # Load zmv (zsh move) which is a powerful file renamer. autoload -Uz zmv @@ -186,7 +177,7 @@ local default="%{${fg[default]}%}" # 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->*) || +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 @@ -207,7 +198,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || # is displayed. If there is an special action going on (merge, rebase) # 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->*) || + 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)" @@ -266,7 +257,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || prompt_chpwd() { FORCE_RUN_VCS_INFO=1 } - add-zsh-hook chpwd prompt_chpwd + chpwd_functions+=(prompt_chpwd) # Used by prompt code below to determine if vcs_info should be run. RUN_VCS_INFO=1 @@ -325,7 +316,7 @@ $blue%B'%b$default\ $green%B%n%b$default@$green%B%m%b$default %(1j.$yellow%j$default.)%# \ %(?..($red%B%?%b$default%) )" } -add-zsh-hook precmd prompt_precmd +precmd_functions+=(prompt_precmd) # When screen, tmux, xterm or rxvt is used set the name of the window to the @@ -468,8 +459,8 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then fi # Add the preexec() and precmd() hooks. - add-zsh-hook preexec window_preexec - add-zsh-hook precmd window_precmd + preexec_functions+=(window_preexec) + precmd_functions+=(window_precmd) else # Fallback if another TERM is used, necessary to run screen (see below in # "RUN COMMANDS"). @@ -509,10 +500,20 @@ setopt completeinword zstyle ':completion:::::' completer \ _expand _complete _prefix _ignored _approximate -# Try uppercase if the currently typed string doesn't match. This allows -# typing in lowercase most of the time and completion fixes the case. Don't -# perform these fixes in _approximate to prevent it from changing the input -# too much. Thanks to the book "From Bash to Z Shell" page 249. +# Match specification to be tried when completing items. Each group ('...') is +# tried after another if no matches were found, once matches are found no +# other groups are tried. Thanks to Mikachu in #zsh on Freenode (2012-08-28 +# 18:48 CEST) for explanations. +# +# When matching also include the uppercase variant of typed characters +# ('m:{a-z}={A-Z}'); using '' before this group would try the unmodified match +# first, but I prefer to get all matches immediately (e.g. if Makefile and +# makefile exist in the current directory echo m matches both, with '' it +# would only match makefile because it found one match). This allows typing in +# lowercase most of the time and completion fixes the case, which is faster. +# +# Don't perform these fixes in _approximate to prevent it from changing the +# input too much. Thanks to the book "From Bash to Z Shell" page 249. zstyle ':completion:*:(^approximate):*' matcher-list 'm:{a-z}={A-Z}' # Allow one mistake per three characters. Thanks to the book "From Bash to Z @@ -600,6 +601,12 @@ bindkey '^F' complete-files # for a fix (-r) to handle whitespace/quotes # correctly, both on the Zsh mailing list. TRAPINT() { + # Don't store this line in history if histignorespace is enabled and the + # line starts with a space. + if [[ -o histignorespace && ${BUFFER[1]} = " " ]]; then + return $1 + fi + # Store the current buffer in the history. zle && print -s -r -- $BUFFER @@ -615,15 +622,19 @@ fi # Make sure aliases are expanded when using sudo. alias sudo='sudo ' -# Global aliases for often used commands in the command line. +# Global aliases for often used redirections. alias -g E='2>&1' -alias -g L='E | less' -alias -g D='E | colordiff L' +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. +alias -g A='| awk' alias -g G='| grep' -alias -g S='| sort' -alias -g U='| uniq' alias -g H='| head' +alias -g P='| perl' +alias -g S='| sort' alias -g T='| tail' +alias -g U='| uniq' # Make going up directories simple. alias -g ...='../..' @@ -645,17 +656,17 @@ fi # Display all branches (except stash) in gitk but only 200 commits as this is # much faster. Also put in the background and disown. Thanks to drizzd in #git # on Freenode (2010-04-03 17:55 CEST). -gitk() { +(( $+commands[gitk] )) && gitk() { command gitk --max-count=200 --branches --remotes --tags "$@" & disown %command } # Same for tig (except the disown part as it's no GUI program). -tig() { +(( $+commands[tig] )) && tig() { command tig --max-count=200 --branches --remotes --tags "$@" } # Pipe output through less. -tree() { +(( $+commands[tree] )) && tree() { command tree -C "$@" | less } @@ -699,26 +710,47 @@ fi # LOAD ADDITIONAL CONFIGURATION FILES +# Configuration option for rc.local to use tmux. By default screen is used. +use_tmux= + source_config ~/.zsh/rc.local # RUN COMMANDS -# If not already in screen reattach to a running session or create a new one. -# This also starts screen on a remote server when connecting through ssh. -if [[ $TERM != dumb && $TERM != linux && -z $STY ]]; then +# 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. - session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') + if [[ -z $use_tmux ]]; then + session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') + else + 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. - window_preexec "screen" + if [[ -z $use_tmux ]]; then + window_preexec "screen" + else + window_preexec "tmux" + fi # Create a new session if none is running. if [[ -z $session ]]; then - exec screen + if [[ -z $use_tmux ]]; then + exec screen + else + exec tmux + fi # Reattach to a running session. else - exec screen -r $session + if [[ -z $use_tmux ]]; then + exec screen -r $session + else + exec tmux attach-session -t $session + fi fi fi @@ -730,7 +762,7 @@ fi # 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 (see above). +# when starting screen/tmux (see above). exec 2>>(while read -r -k -u 0 line; do printf '\e[91m%s\e[0m' "$line"; print -n $'\0';