Merge branch 'master' of gitlab.com:tyrelsouza/dotfiles

This commit is contained in:
Tyrel Souza 2016-11-22 11:45:42 -05:00
commit 82bccebb71
No known key found for this signature in database
GPG Key ID: 2EECB5087209E6A5

10
zshrc
View File

@ -1,5 +1,5 @@
export ZSH=$HOME/.oh-my-zsh export ZSH=$HOME/.oh-my-zsh
plugins=(git brew sudo github django python pip cp vagrant virtualenv nmap rvm) plugins=(git sudo github django python pip cp vagrant virtualenv nmap rvm)
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
ZSH_THEME="soliah" ZSH_THEME="soliah"
else else
@ -23,7 +23,9 @@ export PHP_AUTOCONF="/usr/local/bin/autoconf"
# Virtualenv + Wrapper # Virtualenv + Wrapper
export PROJECT_HOME=$HOME/AddGeneProjects export PROJECT_HOME=$HOME/AddGeneProjects
export WORKON_HOME=$HOME/.virtualenvs export WORKON_HOME=$HOME/.virtualenvs
source /usr/local/bin/virtualenvwrapper.sh if [ -e $HOME/.local/bin/virtualenvwrapper.sh ];then
source $HOME/.local/bin/virtualenvwrapper.sh
fi
export PATH="$NPM_PACKAGES/bin:$GOPATH/bin:$HOME/bin:$PATH" export PATH="$NPM_PACKAGES/bin:$GOPATH/bin:$HOME/bin:$PATH"
@ -67,4 +69,6 @@ fi
# Sourcing aliases # Sourcing aliases
source ~/.bash_aliases source ~/.bash_aliases
source $HOME/.profile source $HOME/.profile
source $HOME/.credentials if [ -e $HOME/.credentials ];then
source $HOME/.credentials
fi