From 4d9d426ca0a05e09f753ca23b60229567fb35342 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Sun, 24 May 2020 19:48:34 -0700 Subject: [PATCH] Fix pyenv and emacs --- dotfiles/bash/bash_profile | 6 +++--- dotfiles/bash/bashrc | 7 ++++--- dotfiles/emacs.d/package.el | 4 ++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile index a5ed823..2d5d229 100644 --- a/dotfiles/bash/bash_profile +++ b/dotfiles/bash/bash_profile @@ -2,8 +2,8 @@ if [[ -f ~/.bashrc ]]; then source ~/.bashrc fi -eval "$(pyenv init -)" -eval "$(pyenv virtualenv-init -)" - # Enable homebrew openssl support export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/ +export PATH="/usr/local/opt/openjdk/bin:$PATH" +export PATH="/usr/local/opt/llvm/bin:$PATH" +export PATH="/usr/local/opt/qt/bin:$PATH" diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc index 659c702..e3659b7 100644 --- a/dotfiles/bash/bashrc +++ b/dotfiles/bash/bashrc @@ -115,9 +115,10 @@ if which go > /dev/null; then export GOPATH=$HOME/projects/go; fi # ----------------------------------------- INITIALIZATIONS -------------------------------------- # -if which pyenv-virtualenv-init > /dev/null; then eval "$(pyenv virtualenv-init -)"; fi - -eval "$(pyenv virtualenv-init -)" +if which pyenv-virtualenv-init > /dev/null; then + eval "$(pyenv init -)" + eval "$(pyenv virtualenv-init -)" +fi # Test for the `bash-completion` package. Installing this adds better tab completion to bash. [[ -r "/usr/local/etc/profile.d/bash_completion.sh" ]] && . "/usr/local/etc/profile.d/bash_completion.sh" diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el index 8975108..feca7c4 100644 --- a/dotfiles/emacs.d/package.el +++ b/dotfiles/emacs.d/package.el @@ -18,6 +18,10 @@ irony counsel swiper + ;;;;;;;;;;;;;;;;;;;;;;;; + + cmake-ide + cmake-mode ;;;;;;;;;;;;;;;;;;;;;;;;