-# Base16 Shell
-#BASE16_SCHEME="thewildhunt"
-#BASE16_SHELL="$HOME/.theme/base16-$BASE16_SCHEME.dark.sh"
-#[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
-
-PATH="$HOME/.local/bin:$PATH"
-#PATH="`ruby -e 'print Gem.user_dir'`/bin:$PATH"
-PATH="/opt/android-sdk/platform-tools:$PATH"
-#source ~/.profile
-
-# take
-function take() {
- mkdir -p $1
- cd $1
-}
+# Bash-like navigation
+#export WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
+#export WORDCHARS='*?-[]~=&;!#$%^(){}<>'
+export WORDCHARS='*?[]~=&;!#$%^(){}<>'
+
+disable -r time # disable shell reserved word
+alias time='time -p' # -p for POSIX output
+
+# rehash if last command was pacaur or pacman
+# (so that zsh picks up changes in $PATH immediately)
+TRAPUSR1() { rehash}; precmd() { [[ $history[$[ HISTCMD -1 ]] == *(pacaur|pacman)* ]] && killall -USR1 zsh }
+
+#
+# User configuration sourced by interactive shells
+#
+
+# Change default zim location
+export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim
+
+# Start zim
+[[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh
+
+ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red')
+#ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red,bold'
+
+setopt globdots