diff --git a/bash_profile b/bash_profile index 77d3739..a0f70e2 100644 --- a/bash_profile +++ b/bash_profile @@ -6,8 +6,12 @@ if [ -f ~/.bash_prompt ]; then . ~/.bash_prompt fi -if [ -f ~/.git-completion.bash ]; then - . ~/.git-completion.bash +if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then + . /usr/local/bin/virtualenvwrapper.sh +fi + +if [ -f ~/.bashrc ]; then + . ~/.bashrc fi export CLICOLOR=1 @@ -18,8 +22,6 @@ function title { echo -ne "\033]0;"$*"\007" } -source /usr/local/bin/virtualenvwrapper.sh - export HISTFILESIZE=200000 export HISTSIZE=10000 shopt -s histappend @@ -71,16 +73,6 @@ function weather() { curl wttr.in/$LOCATION } -# The next line updates PATH for the Google Cloud SDK. -if [ -f /Users/adam/Downloads/google-cloud-sdk/path.bash.inc ]; then - source '/Users/adam/Downloads/google-cloud-sdk/path.bash.inc' -fi - -# The next line enables shell command completion for gcloud. -if [ -f /Users/adam/Downloads/google-cloud-sdk/completion.bash.inc ]; then - source '/Users/adam/Downloads/google-cloud-sdk/completion.bash.inc' -fi - #Enable ~/.ssh/config host tab completion _complete_ssh_hosts () { diff --git a/zprezto b/zprezto deleted file mode 160000 index 4f19700..0000000 --- a/zprezto +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f19700919c8ebbaf75755fc0d03716d13183f49