diff --git a/bash/.bash_profile b/bash/.bash_profile index f172a37..d2f1034 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -10,9 +10,6 @@ unset file # TODO: switch to zsh completely, using chsh -s /bin/zsh export BASH_SILENCE_DEPRECATION_WARNING=1 -# Travis CI gem. -[ -f ~/.travis/travis.sh ] && . ~/.travis/travis.sh - # Load the default .profile [[ -s "$HOME/.profile" ]] && . "$HOME/.profile" @@ -26,11 +23,6 @@ if [ -f ~/dotfiles/bin/wp-completion.bash ]; then . ~/dotfiles/bin/wp-completion.bash; fi; -# Heroku completion -if [ -f ~/Library/Caches/heroku/autocomplete/bash_setup ]; then - . ~/Library/Caches/heroku/autocomplete/bash_setup; -fi; - # Wakatime if [ -f ~/Workspace/GitHub/bash-wakatime/bash-wakatime.sh ]; then . ~/Workspace/GitHub/bash-wakatime/bash-wakatime.sh; @@ -50,9 +42,5 @@ if [ -f /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion . /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.bash.inc fi; -# nvm -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - # Autocorrect typos in path names when using `cd` shopt -s cdspell; diff --git a/git/.gitconfig b/git/.gitconfig index b74204c..40dbf99 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -135,10 +135,6 @@ name = Pascal Birchler email = hello@pascalbirchler.ch -[include] - # use separate file for username / github token / etc. - # at the end so it can override any of the above configs - path = ~/.gitconfig.local [pull] rebase = true @@ -148,3 +144,7 @@ [url "https://github.com/"] pullInsteadOf = "git@github.com": +[include] + # use separate file for username / github token / etc. + # at the end so it can override any of the above configs + path = ~/.gitconfig.local \ No newline at end of file