From bfd2d3b5a74bbc896fe769af23bbef4444ce3ac7 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylorb@fair.com>
Date: Fri, 25 Sep 2020 09:29:47 -0700
Subject: [PATCH] Changes for ruby, lsp

---
 dotfiles/bash/bash_profile | 1 -
 dotfiles/bash/bashrc       | 8 +++++++-
 dotfiles/emacs.d/init.el   | 8 +++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile
index 47e69a4..393190e 100644
--- a/dotfiles/bash/bash_profile
+++ b/dotfiles/bash/bash_profile
@@ -8,4 +8,3 @@ export PATH="/usr/local/opt/openjdk/bin:$PATH"
 export PATH="/usr/local/opt/llvm/bin:$PATH"
 export PATH="/usr/local/opt/qt/bin:$PATH"
 export PATH="/usr/local/opt/tcl-tk/bin:$PATH"
-if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc
index cb60cab..5796373 100644
--- a/dotfiles/bash/bashrc
+++ b/dotfiles/bash/bashrc
@@ -119,11 +119,14 @@ if which go > /dev/null; then export GOPATH=$HOME/projects/go; fi
 
 # ----------------------------------------- INITIALIZATIONS -------------------------------------- #
 
-if which pyenv-virtualenv-init > /dev/null; then 
+if which pyenv-virtualenv-init > /dev/null; then
 	eval "$(pyenv init -)"
 	eval "$(pyenv virtualenv-init -)"
 fi
 
+# RVM configuration
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
+
 # 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"
 
@@ -152,3 +155,6 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
 else
   export PS1='\[$bold\]\[$white\]\u@\h\[$reset\]: \[$bold\]\[$blue\]\w\[$reset\] \[$green\]$(parse_git_branch)\[$reset\]\[$bold\]\[$white\]⇨\[$reset\] '
 fi
+
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"
diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 0d72dfa..07e69f1 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -207,9 +207,10 @@ There are two things you can do about this warning:
 
 ;; LSP
 (use-package lsp-mode
-  :ensure t
-  :hook (python-mode . lsp-deferred)
-  :commands (lsp lsp-deferred))
+    :ensure t
+    :hook ((python-mode . lsp-deferred)
+	   (ruby-mode . lsp-deferred))
+    :commands (lsp lsp-deferred))
 
 
 (use-package lsp-ui
@@ -296,6 +297,7 @@ There are two things you can do about this warning:
 ;;
 
 (require 'rvm)
+(rvm-use-default)
 
 (add-hook 'ruby-mode-hook 'robe-mode)