Clean up rc files and install hook up pyenv-virtualenv

This commit is contained in:
Jeremy Dormitzer 2020-04-27 17:34:31 -04:00
parent 5d011b0586
commit 87001e76d6
3 changed files with 13 additions and 18 deletions

View File

@ -4,15 +4,19 @@
export PATH="/usr/local/opt/texinfo/bin:$PATH" export PATH="/usr/local/opt/texinfo/bin:$PATH"
[[ -f "$HOME/.bashrc" ]] && source $HOME/.bashrc [[ -f "$HOME/.bashrc" ]] && source "$HOME/.bashrc"
[[ -f "$HOME/.bash_local" ]] && source "$HOME/.bash_local" [[ -f "$HOME/.bash_local" ]] && source "$HOME/.bash_local"
[[ -f "$HOME/.bash_profile.local"]] && source "$HOME/.bash_profile.local"
[[ -f "$HOME/.profile" ]] && source "$HOME/.profile" [[ -f "$HOME/.profile" ]] && source "$HOME/.profile"
# Setup pyenv (https://github.com/pyenv/pyenv) # Setup pyenv (https://github.com/pyenv/pyenv)
if command -v pyenv 1>/dev/null 2>&1; if command -v pyenv 1>/dev/null 2>&1; then
then
export PYENV_ROOT="$HOME/.pyenv" export PYENV_ROOT="$HOME/.pyenv"
eval "$(pyenv init -)" eval "$(pyenv init -)"
fi fi
if command -v pyenv virtualenv 1>/dev/null 2>&1; then
eval "$(pyenv virtualenv-init -)"
fi

View File

@ -14,20 +14,6 @@ fi
alias edit="$(which emacsclient) " alias edit="$(which emacsclient) "
if [ -f /usr/share/nvm/init-nvm.sh ]; then
source /usr/share/nvm/init-nvm.sh
fi
if [ -d "$HOME/.nvm" ]; then
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
fi
if [ -e "$(which virtualenvwrapper.sh)" ]; then
source "$(which virtualenvwrapper.sh)"
fi
if [ -d "$HOME/.cache/wal" ]; then if [ -d "$HOME/.cache/wal" ]; then
(cat "$HOME/.cache/wal/sequences" &) (cat "$HOME/.cache/wal/sequences" &)
fi fi
@ -38,3 +24,7 @@ fi
alias k=kubectl alias k=kubectl
alias kctx=kubectx alias kctx=kubectx
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion

View File

@ -142,7 +142,8 @@ I don't want anything to write to my init.el, so save customizations in a separa
:if (memq window-system '(mac ns x)) :if (memq window-system '(mac ns x))
:config :config
(setq exec-path-from-shell-variables '("PATH" "MANPATH" "LEDGER_FILE" "LOLA_HOME" (setq exec-path-from-shell-variables '("PATH" "MANPATH" "LEDGER_FILE" "LOLA_HOME"
"MODELS_HOME" "LOLA_TRAVEL_SERVICE_HOME" "WORKON_HOME")) "MODELS_HOME" "LOLA_TRAVEL_SERVICE_HOME" "WORKON_HOME")
exec-path-from-shell-check-startup-files nil)
(exec-path-from-shell-initialize)) (exec-path-from-shell-initialize))
#+END_SRC #+END_SRC