bin/battery.pl: Add checks and correct exit code.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index dc797dcf2a0d39a421682286f0179e9fc37bf425..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,10 @@ 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
 
 # Some shortcuts for colors. The %{...%} tells zsh that the data in between
 # doesn't need any space, necessary for correct prompt draw.
@@ -205,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.
@@ -253,6 +257,8 @@ fi
 # code in red and bold and the job count in yellow.
 #
 # Thanks to Adam's prompt for the basic idea of this prompt.
+#
+# The current time is display in hex in the right prompt.
 prompt_precmd() {
     # Regex to remove elements which take no space. Used to calculate the
     # width of the top prompt. Thanks to Bart's and Adam's prompt code in
@@ -269,10 +275,11 @@ prompt_precmd() {
     local width width_left width_right
     local top_left top_right
 
-    # Display vcs_info (if used) on the right in the top prompt.
-    top_right="${vcs_info_msg_0_}"
+    # Display the current time in HEX in bright blue and vcs_info (if used) on
+    # the right in the top prompt.
+    top_right="$vcs_info_msg_0_($blue%B0x$(([##16] EPOCHSECONDS))%b$default)"
     width_right=${#${(S%%)top_right//$~zero/}}
-    # Remove vcs_info if it would get too long.
+    # Remove it if it would get too long.
     if [[ $(( COLUMNS - 4 - 1 - width_right )) -lt 0 ]]; then
         top_right=
         width_right=0
@@ -292,7 +299,6 @@ prompt_precmd() {
 $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
 
@@ -446,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
@@ -477,6 +483,10 @@ zstyle ':completion:*' format '    %B%d%b:'
 # Display different types of matches separately.
 zstyle ':completion:*' group-name ''
 
+# Don't draw trailing / in bold (new in zsh 4.3.11). Thanks to Mikachu in #zsh
+# on Freenode for the fix (2010-12-17 13:46 CET).
+zle_highlight=(suffix:none)
+
 # Ignore completion functions.
 zstyle ':completion:*:functions' ignored-patterns '_*'
 # Ignore parent directory.
@@ -640,7 +650,7 @@ done &)
 # Run reminder and redisplay it every four hours (if it's available).
 PERIOD=14400
 periodic() {
-    which rem > /dev/null && rem
+    which rem > /dev/null && [ -f ~/.reminders ] && rem -h
 }