X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=7a94a3e8d559e54d44488770f435aa7f43ad12fd;hb=f5d7699997ef7aff787306a78fedb874f7ce61c6;hp=aa24736f255ff9601af685db50807ff0cecd9c99;hpb=0aec88759df96ba7db29be7e7dc299f05f797e68;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index aa24736..7a94a3e 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -66,6 +66,73 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\
 %(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \
 %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )"
 
+# Allow substitutions and expansions in the prompt, necessary for vcs_info.
+setopt promptsubst
+# 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) is
+# displayed. If there is an special action going on (merge, rebase) it's also
+# displayed (red).
+zstyle ':vcs_info:*' formats \
+"(%{${fg[green]}%}%b%{${fg[default]}%}:\
+%{${fg[blue]}%}%s%{${fg[default]}%})"
+zstyle ':vcs_info:*' actionformats \
+"(%{${fg[green]}%}%b%{${fg[default]}%}/\
+%{${fg[red]}%}%a%{${fg[default]}%}:\
+%{${fg[blue]}%}%s%{${fg[default]}%})"
+# Call vcs_info as precmd before every prompt.
+prompt_precmd() {
+    vcs_info
+}
+add-zsh-hook precmd prompt_precmd
+
+# Display the vcs information in the right prompt.
+RPROMPT='${vcs_info_msg_0_}'
+
+# When screen 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 windows' name to 'zsh'.
+if [[ $TERM == screen ]]; then
+    # Set to a non empty value to reset the window name in the next precmd()
+    # call.
+    screen_name_reset=yes
+
+    screen_preexec() {
+        # Get the application name excluding any arguments.
+        local program_name=${1%% *}
+
+        # Ignore often used commands which are only running for a very short
+        # time. This prevents a "blinking" name when it's changed to "cd" for
+        # example and then some milliseconds later back to "zsh".
+        [[ $program_name == (cd*|ls|la|ll|clear) ]] && return
+
+        # Set the window name to the currently running program.
+        print -n "\ek$program_name\e\\"
+
+        # Tell precmd() to reset the window name when the program stops.
+        screen_name_reset=yes
+    }
+
+    screen_precmd() {
+        # Abort if no window name reset is necessary.
+        [[ -z $screen_name_reset ]] && return
+
+        # Reset the window name to 'zsh'.
+        print -n "\ekzsh\e\\"
+
+        # Just reset the name, so no screen reset necessary for the moment.
+        screen_name_reset=
+    }
+
+    # Add the preexec() and precmd() hooks.
+    add-zsh-hook preexec screen_preexec
+    add-zsh-hook precmd screen_precmd
+fi
+
 
 # COMPLETION SETTINGS
 
@@ -98,8 +165,9 @@ zstyle ':completion:*' list-prompt '%p'
 # When unsetting variables make sure every variable name is only suggested
 # once.
 zstyle ':completion:*:unset:*' ignore-line yes
-# When working with mercurial don't complete the same file multiple times.
-zstyle ':completion:*:hg*:*' 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
 
 
 # ALIAS AND FUNCTION SETTINGS
@@ -119,11 +187,15 @@ alias du='du -sh'
 
 # Multiple files given to Vim are opened in tabs.
 alias vim='vim -p'
-# Shortcuts for Vim.
+
+# Shortcuts for often used programs.
+alias e='elinks'
+alias g='git'
+alias m='mutt'
 alias v='vim'
 alias vi='vim'
 
-# Exit binding like in Vim.
+# Exit binding like in Vim; I sometimes confuse editor and shell.
 alias :q='exit'
 
 # Edit the mercurial patch queue series file for the current mercurial