diff --git a/bash_paths b/bash_paths
index e721e39..e40f4b5 100644
--- a/bash_paths
+++ b/bash_paths
@@ -2,10 +2,9 @@
 
 # Directories to be prepended to PATH
 declare -a dirs_to_prepend=(
-    "$HOME/.bin"
-    "$HOME/.rvm/bin"
     "/usr/local/sbin"
     "/usr/local/bin" # Ensure that this bin always takes precedence over `/usr/bin`
+    "$HOME/.bin"
 )
 
 # Directories to be appended to PATH
@@ -13,6 +12,7 @@ declare -a dirs_to_append=(
     "/usr/bin"
     "$(brew --prefix coreutils)/libexec/gnubin" # Add brew-installed GNU core utilities bin
     "$(brew --prefix)/share/npm/bin" # Add npm-installed package bin
+    "$HOME/.rvm/bin"
 )
 
 # Prepend directories to PATH
diff --git a/bash_profile b/bash_profile
index 77b03e8..a5c48c2 100644
--- a/bash_profile
+++ b/bash_profile
@@ -57,6 +57,9 @@ complete -o "nospace" -W "Contacts Calendar Dock Finder Mail Safari iTunes Syste
 complete -C aws_completer aws
 
 
+export NVM_DIR="$HOME/.nvm"
+. "$(brew --prefix nvm)/nvm.sh"
+
 # ----------------------------------------------------------------------
 #  rvm
 # ----------------------------------------------------------------------
@@ -69,11 +72,11 @@ complete -C aws_completer aws
 #  gpg-agent
 # ----------------------------------------------------------------------
 
-if [ -f ~/.gnupg/.gpg-agent-info ] && [ -n "$(pgrep gpg-agent)" ]; then
-    source ~/.gnupg/.gpg-agent-info
+if [ -f "$HOME/.gnupg/.gpg-agent-info" ] && [ -n "$(pgrep gpg-agent)" ]; then
+    source "$HOME/.gnupg/.gpg-agent-info"
     export GPG_AGENT_INFO
 else
-    eval $(gpg-agent --daemon --write-env-file ~/.gnupg/.gpg-agent-info)
+    eval $(gpg-agent --daemon --write-env-file $HOME/.gnupg/.gpg-agent-info)
 fi
 
 
@@ -81,7 +84,7 @@ fi
 #  Google Cloud SDK
 # ----------------------------------------------------------------------
 
-if [ -s ~/Code/google-cloud-sdk/ ]; then
-    source ~/Code/google-cloud-sdk/path.bash.inc
-    source ~/Code/google-cloud-sdk/completion.bash.inc
+if [ -s "$HOME/Code/google-cloud-sdk/" ]; then
+    source "$HOME/Code/google-cloud-sdk/path.bash.inc"
+    source "$HOME/Code/google-cloud-sdk/completion.bash.inc"
 fi