X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=cfd3f432c4a76247e64d4e301a619d7d00906c7c;hb=eeab5490994eefc79d00c92d04ddcc31f64c6426;hp=f63535523ce90fd170c315ef3ade1ded34ff67c9;hpb=7aa8877e79dfbf5cc22e856c6a1bb8c26083b7ca;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index f635355..cfd3f43 100644 --- a/zsh/rc +++ b/zsh/rc @@ -37,24 +37,13 @@ setopt ignoreeof # Use Vi(m) style key bindings. bindkey -v +# Also use jj to exit insert mode. +bindkey 'jj' vi-cmd-mode + # I don't need the arrow keys, I use ^N and ^P for this (see below). -bindkey -M viins -r '^[OA' -bindkey -M viins -r '^[OB' -bindkey -M viins -r '^[OC' -bindkey -M viins -r '^[OD' -bindkey -M viins -r '^[[A' -bindkey -M viins -r '^[[B' -bindkey -M viins -r '^[[C' -bindkey -M viins -r '^[[D' +bindkey -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D' # Also not in Vi mode. -bindkey -M vicmd -r '^[OA' -bindkey -M vicmd -r '^[OB' -bindkey -M vicmd -r '^[OC' -bindkey -M vicmd -r '^[OD' -bindkey -M vicmd -r '^[[A' -bindkey -M vicmd -r '^[[B' -bindkey -M vicmd -r '^[[C' -bindkey -M vicmd -r '^[[D' +bindkey -a -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D' # FUNCTION SETTINGS @@ -156,7 +145,8 @@ bindkey -a '^N' history-beginning-search-forward # Use colorized output, necessary for prompts and completions. autoload -U colors && colors -# Some shortcuts for colors. +# Some shortcuts for colors. The %{...%} tells zsh that the data in between +# doesn't need any space, necessary for correct prompt draw. local red="%{${fg[red]}%}" local blue="%{${fg[blue]}%}" local green="%{${fg[green]}%}" @@ -255,6 +245,9 @@ unset red blue green yellow default # 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. +# +# screen* is necessary as `screen` uses screen.linux for example for a linux +# console. 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. @@ -294,7 +287,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then m) program_name=mutt ;; - v|vi) + v) program_name=vim ;; esac @@ -337,13 +330,13 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then fi # Prepend prefixes like in window_preexec(). + if [[ -n $window_root ]]; then + name="!$name" + fi if [[ -n $SSH_CONNECTION ]]; then - window_title "@$name" - elif [[ -n $window_root ]]; then - window_title "!$name" - else - window_title $name + name="@$name" fi + window_title $name # Just reset the name, so no screen reset necessary for the moment. window_reset= @@ -358,6 +351,9 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then window_title() { print -n "\e]2;$1\e\\" } + else + # Fallback if another TERM is used. + window_title() { } fi # Add the preexec() and precmd() hooks. @@ -409,12 +405,14 @@ zstyle ':completion:*' group-name '' 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 -# When working with Mercurial and Git don't complete the same file multiple -# times. Very useful when completing file names. -zstyle ':completion:*:(hg|git)*:*' ignore-line yes +# Always complete one value (file name) only once in the current line. This +# makes it easy to complete multiple values because I can just press tab to +# get all possible values. Otherwise I would have to skip the first value +# again and again. +zstyle ':completion:*' ignore-line yes +# Except for mv and cp, because I often want to use to similar names, so I +# complete to the same and change it. +zstyle ':completion:*:(mv|cp):*' ignore-line no # CUSTOM ALIASES AND FUNCTIONS @@ -425,10 +423,12 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes # typing the command. # # Thanks to Vadim Zeitlin for a fix (--) so lines -# starting with - don't cause errors. +# starting with - don't cause errors; and to Nadav Har'El +# for a fix (-r) to handle whitespace/quotes +# correctly, both on the Zsh mailing list. TRAPINT() { # Store the current buffer in the history. - zle && print -s -- $BUFFER + zle && print -s -r -- $BUFFER # Return the default exit code so Zsh aborts the current command. return $1 @@ -498,14 +498,16 @@ tig() { # OS SPECIFIC SETTINGS -if [[ $(uname) == Linux ]]; then +local uname=$(uname) + +if [[ $uname == Linux ]]; then # Settings when creating Debian packages. DEBEMAIL=simon@ruderich.org export DEBEMAIL DEBFULLNAME='Simon Ruderich' export DEBFULLNAME -elif [[ $(uname) == Darwin ]]; then # Mac OS X +elif [[ $uname == Darwin ]]; then # Mac OS X # Store the current clipboard in CLIPBOARD before every command so it can # be used in commands. os_darwin_preexec() { @@ -533,18 +535,20 @@ 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 +# This also starts screen one a remote server when connecting through ssh. +if [[ $TERM != dumb && -z $STY ]]; then # Get running detached sessions. session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') + + # As we exec later we have to set the title here. + window_preexec "screen" + # Create a new session if none is running. if [[ -z $session ]]; then - screen + exec screen # Reattach to a running session. else - screen -r $session + exec screen -r $session fi fi