Browse Source

patch up zshrc to work on other computers

master
Taylor Bockman 2 years ago
parent
commit
951764555b
  1. 9
      dotfiles/zsh/exports.zsh
  2. 11
      dotfiles/zsh/zshrc

9
dotfiles/zsh/exports.zsh

@ -29,5 +29,10 @@ export HISTCONTROL=ignoredups
# If go is installed, set the $GOPATH to the projects directory created above. # If go is installed, set the $GOPATH to the projects directory created above.
if which go > /dev/null; then export GOPATH=$HOME/.go; fi if which go > /dev/null; then export GOPATH=$HOME/.go; fi
export PATH="$PATH:$HOME/.rvm/bin" if [ -d "$HOME/.rvm" ]; then
. "$HOME/.cargo/env" export PATH="$PATH:$HOME/.rvm/bin"
fi
if [ -f "$HOME/.cargo/env" ]; then
. "$HOME/.cargo/env"
fi

11
dotfiles/zsh/zshrc

@ -59,11 +59,11 @@ if [[ ! -d $HOME/.zsh ]]; then
popd popd
fi fi
autoload -U is-at-least
# Install zsh-syntax-highlighting if it doesn't exist # 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
if ! is-at-least 4.3.11; then if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then
echo "ZSH syntax highlighting requires ZSH >= 4.3.11 (current: $ZSH_VERSION)."
else
echo "Installing zsh syntax highlighting" echo "Installing zsh syntax highlighting"
pushd pushd
@ -72,7 +72,8 @@ if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then
popd popd
fi fi
else
echo "ZSH syntax highlighting requires ZSH >= 4.3.11 (current: $ZSH_VERSION)."
fi fi
zstyle ':completion:*:*:git:*' script $HOME/.zsh/git-completion.bash zstyle ':completion:*:*:git:*' script $HOME/.zsh/git-completion.bash

Loading…
Cancel
Save