zsh/rc: Actually enable the vcs_info cache.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index d7106f4e0145d90795a1603df4795b311b4ac622..7c833b5194b45263d16bc5b9b360f8cb8294a7ec 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -37,8 +37,9 @@ setopt ignoreeof
 # Use Vi(m) style key bindings.
 bindkey -v
 
-# Also use jj to exit insert mode.
+# Use jj and jk to exit insert mode.
 bindkey 'jj' vi-cmd-mode
+bindkey 'jk' vi-cmd-mode
 
 # I don't need the arrow keys, I use ^N and ^P for this (see below).
 bindkey -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D'
@@ -61,7 +62,7 @@ fpath=(~/.zsh/functions $fpath)
 # Autoload my functions (except completion functions and hidden files). Thanks
 # to caphuso from the Zsh example files for this idea.
 if [[ -d ~/.zsh/functions ]]; then
-    autoload ${fpath[1]}/^_*(^/:t)
+    autoload -Uz ${fpath[1]}/^_*(^/:t)
 fi
 
 # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At
@@ -96,7 +97,7 @@ fi
 autoload -Uz add-zsh-hook
 
 # Load zmv (zsh move) which is powerful to rename files.
-autoload zmv
+autoload -Uz zmv
 
 
 # HISTORY SETTINGS
@@ -143,7 +144,7 @@ bindkey -a '^N' history-beginning-search-forward
 # PROMPT SETTINGS
 
 # Use colorized output, necessary for prompts and completions.
-autoload -U colors && colors
+autoload -Uz colors && colors
 
 # Necessary for $EPOCHSECONDS, the UNIX time.
 zmodload zsh/datetime
@@ -208,7 +209,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
 
     # Cache system inspired by Bart Trojanowski
     # (http://jukie.net/~bart/blog/pimping-out-zsh-prompt).
-    #zstyle ':vcs_info:*+pre-get-data:*' hooks pre-get-data
+    zstyle ':vcs_info:*+pre-get-data:*' hooks pre-get-data
     +vi-pre-get-data() {
         # Only Git and Mercurial support and need caching. Abort if any other
         # VCS is used.
@@ -451,7 +452,7 @@ zmodload zsh/complist
 # cluttering of ~/. $fpath must be set before calling this. Thanks to Adlai in
 # #zsh on Freenode (2009-08-07 21:05 CEST) for reminding me of the $fpath
 # problem.
-autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump
+autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump
 
 # Use cache to speed up completions.
 zstyle ':completion:*' use-cache on
@@ -649,7 +650,7 @@ done &)
 # Run reminder and redisplay it every four hours (if it's available).
 PERIOD=14400
 periodic() {
-    which rem > /dev/null && rem -h
+    which rem > /dev/null && [ -f ~/.reminders ] && rem -h
 }