Merge branch 'master' of git.xchg.sh:angrygoats/essentials

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"

dotfiles/bash/bashrc

@@ -49,6 +49,10 @@ if [[ -x go ]]; then
 fi
 
 
+# Enable git completion
+test -f $symlink_dir/scripts/git-completion.bash && . $_
+
+
 # ------------------------------ END SETUP ------------------------------ #
 
 
@@ -115,9 +119,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"

dotfiles/emacs.d/package.el

@@ -18,6 +18,10 @@
                       irony
                       counsel
                       swiper
+		      ;;;;;;;;;;;;;;;;;;;;;;;;
+
+		      cmake-ide
+		      cmake-mode
 
                       ;;;;;;;;;;;;;;;;;;;;;;;;