|
|
|
@ -7,8 +7,6 @@ else
|
|
|
|
|
symlink_dir=$(cd "$( dirname "`readlink ${(%):-%N}`" )" && pwd) |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
# -------------------------------- SETUP -------------------------------- # |
|
|
|
|
|
|
|
|
|
# Store private information (exports, keys, etc) in .bash_private. |
|
|
|
|
if [[ -f $HOME/.bash_private ]]; then |
|
|
|
|
source $HOME/.bash_private |
|
|
|
@ -62,6 +60,9 @@ fi
|
|
|
|
|
|
|
|
|
|
# Install zsh-syntax-highlighting if it doesn't exist |
|
|
|
|
if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then |
|
|
|
|
if ! is-at-least 4.3.11; then |
|
|
|
|
echo "ZSH syntax highlighting requires ZSH >= 4.3.11 (current: $ZSH_VERSION)." |
|
|
|
|
else |
|
|
|
|
echo "Installing zsh syntax highlighting" |
|
|
|
|
pushd |
|
|
|
|
|
|
|
|
@ -71,6 +72,8 @@ if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then
|
|
|
|
|
popd |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
zstyle ':completion:*:*:git:*' script $HOME/.zsh/git-completion.bash |
|
|
|
|
fpath=(~/.zsh $fpath) |
|
|
|
|
|
|
|
|
@ -86,6 +89,3 @@ source $symlink_dir/ps1.zsh
|
|
|
|
|
|
|
|
|
|
# ZSH syntax highlighting must be sourced last |
|
|
|
|
source $HOME/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh |
|
|
|
|
|
|
|
|
|
# ------------------------------ END SETUP ------------------------------ # |
|
|
|
|
|
|
|
|
|