From 9d3d50c66edc671a48021e4d2d4fee6e5b618e66 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Wed, 29 Mar 2017 11:14:26 -0400
Subject: [PATCH] more shell cleanup

---
 home/.zsh/custom/walkah.zsh-theme |  7 +------
 home/.zshrc                       | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/home/.zsh/custom/walkah.zsh-theme b/home/.zsh/custom/walkah.zsh-theme
index e357dde..4e51201 100644
--- a/home/.zsh/custom/walkah.zsh-theme
+++ b/home/.zsh/custom/walkah.zsh-theme
@@ -3,15 +3,10 @@
 if [ -z $SSH_CONNECTION ]; then HCOLOR="green"; else HCOLOR="blue"; fi
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-ZSH_THEME_RVM_PROMPT_PREFIX="("
-ZSH_THEME_RVM_PROMPT_SUFFIX="/"
-ZSH_THEME_NVM_PROMPT_PREFIX=""
-ZSH_THEME_NVM_PROMPT_SUFFIX=")"
-
 PROMPT='%{$fg[$HCOLOR]%}%m%{$reset_color%}:%c \
 $(git_prompt_info)%{$fg[red]%}%(!.#.»)%{$reset_color%} '
 PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
-RPS1='%{$fg[cyan]%}$(ruby_prompt_info)node-$(nvm_prompt_info) %{$reset_color%}${return_code}'
+RPS1='%{$fg[cyan]%}(ruby-$(ruby_prompt_info)/node-$(nvm_prompt_info)) %{$reset_color%}${return_code}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
diff --git a/home/.zshrc b/home/.zshrc
index 9687d0f..839407a 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -19,13 +19,19 @@ export ZSH_CUSTOM=$HOME/.zsh/custom
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(extract command-not-found tmux tmuxinator git github git-flow ruby gem rvm rails bundler heroku ssh-agent npm nvm yarn pyenv golang drush composer vagrant knife docker docker-compose mix mix-fast)
+plugins=(extract command-not-found tmux tmuxinator git github git-flow ssh-agent golang vagrant knife docker docker-compose mix mix-fast)
 
-# Python/ virtualenv
-if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
-    export WORKON_HOME=$HOME/.virtualenvs
-    plugins=($plugins virtualenvwrapper pip django fabric)
-fi
+# ruby
+plugins=($plugins ruby gem rbenv rails bundler heroku)
+
+# node
+plugins=($plugins nvm npm yarn)
+
+# python
+plugins=($plugins pyenv pip)
+
+# php / drupal
+plugins=($plugins drush composer)
 
 # Platform specific settings
 case "$OSTYPE" in
@@ -39,6 +45,11 @@ esac
 
 UNBUNDLED_COMMANDS=(knife)
 
+# nvm from homebrew
+if [ -f /usr/local/opt/nvm/nvm.sh ]; then
+  source /usr/local/opt/nvm/nvm.sh
+fi
+
 # OH MY ZSH!
 source $ZSH/oh-my-zsh.sh
 
@@ -59,5 +70,3 @@ if [ $TERM = "screen" ]; then
 fi
 export EDITOR="vim"
 export LSCOLORS="ExGxFxdxCxDxDxhbadExEx"
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting