From b68eb8a0e8fbe4210e8a34ab6c00c49bcb6519dc Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Wed, 10 Aug 2022 06:30:59 -0400
Subject: [PATCH] path cleanup

---
 config/zsh/.zshrc | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index 08d50b9..4683eda 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -240,11 +240,11 @@ PROMPT='%F{blue}%~$(git_prompt) %F{cyan}%# %F{reset}'
 # rbenv (ruby)
 src_rbenv(){
   if command -v ruby > /dev/null && command -v gem > /dev/null; then
-	path+=("$(ruby -r rubygems -e 'puts Gem.user_dir')/bin")
+    path+=("$(ruby -r rubygems -e 'puts Gem.user_dir')/bin")
     # rbenv shim
     if [ -d "$HOME/.rbenv/bin" ]; then
-	  path+=("$HOME/.rbenv/bin")
-      [[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]] && eval "$(rbenv init -)"
+      path+=("$HOME/.rbenv/bin")
+      [[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]] && eval "$(rbenv init - zsh)"
     fi
   fi
 }
@@ -262,34 +262,42 @@ src_nvm(){
 src_pyenv() {
   if [ -d "$HOME/.pyenv" ]; then
     export PYENV_ROOT="$HOME/.pyenv"
-	path+=("$PYENV_ROOT/bin")
+    path+=("$PYENV_ROOT/bin")
     command -v pyenv > /dev/null && eval "$(pyenv init -)"
   fi
 }
 
-# * * * * * * * * * * * * *
-# Language Specific Paths *
-# * * * * * * * * * * * * *
-#python
-# path+=("/Users/james/Library/Python/3.8/bin")
-
-# ruby
-if command -v rbenv > /dev/null; then eval "$(rbenv init -)"; fi
-
 # go
-if command -v go > /dev/null; then
+src_go() {
+  # move go path from ~/go to ~/.go (hidden)
   [ -d "$HOME/go" ] && mv "$HOME/go" "$HOME/.go"
   export GOPATH="$HOME/.go"
   export GOWD="$GOPATH/src/github.com/lemonase"
   export GOMOD="$GOPATH/pkg/mod/github.com/lemonase/"
   path+=("$(go env GOPATH)/bin")
+}
+
+# rust/cargo
+src_rust() {
+  path+=("$HOME/.cargo/bin")
+}
+
+# ruby
+if command -v rbenv > /dev/null; then
+  src_rbenv
+fi
+
+# go
+if command -v go > /dev/null; then
+  src_go
 fi
 
 # rust
 if command -v cargo > /dev/null; then
-  path+=("$HOME/.cargo/bin")
+  src_rust
 fi
 
+
 # * * * * * * * * * * * *
 # MISC $PATH Additions  *
 # * * * * * * * * * * * *
@@ -297,6 +305,10 @@ fi
 [ -d "/opt/homebrew/bin" ] && path+=("/opt/homebrew/bin" $path)
 [ -d "/opt/homebrew/opt/sqlite/bin" ] && path+=("/opt/homebrew/opt/sqlite/bin" $path)
 
+# misc
+# [ -d "$HOME/.rbenv" ] && path+=("$HOME/.rbenv/bin") && eval "$(rbenv init - zsh)"
+# [ -d "/Users/james/Library/Python/3.8/bin" ] && path+=("/Users/james/Library/Python/3.8/bin")
+
 # local bins
 [ -d "$HOME/.local/bin" ] && path+=("$HOME/.local/bin")
 [ -d "$HOME/.local/scripts" ] && path+=("$HOME/.local/scripts")
@@ -305,7 +317,6 @@ fi
 [ -r "$HOME/.config/zshrc" ] && source "$HOME/.config/zshrc"
 [ -r "$HOME/.local/zshrc" ] && source "$HOME/.local/zshrc"
 
-[ -d "$HOME/.rbenv" ] && path+=("$HOME/.rbenv/bin") && eval "$(rbenv init - zsh)"
 
 # ZSH syntax highlighting plugin
 ZSH_SYNTAX_HIGHLIGHT_PATH="${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"