6 files changed, 58 insertions, 4 deletions
diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
new file mode 100644
index 000000000..d42584f1a
--- /dev/null
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -0,0 +1,6 @@
+if [ $commands[fasd] ]; then # check if fasd is installed
+  eval "$(fasd --init auto)"
+  alias v='f -e vim'
+  alias o='a -e open'
+fi
+
diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index e455527e7..697f98d66 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -29,7 +29,7 @@ alias iminurbase='finger'
 alias btw='nice'
 alias obtw='nohup'
 
-alias nomz='ps -aux'
+alias nomz='ps aux'
 alias nomnom='killall'
 
 alias byes='exit'
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index a62dd5602..d855c2445 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -17,7 +17,7 @@ for rbenvdir in "${rbenvdirs[@]}" ; do
     FOUND_RBENV=1
     export RBENV_ROOT=$rbenvdir
     export PATH=${rbenvdir}/bin:$PATH
-    eval "$(rbenv init -)"
+    eval "$(rbenv init - zsh)"
 
     alias rubies="rbenv versions"
     alias gemsets="rbenv gemset list"
diff --git a/plugins/rbfu/rbfu.plugin.zsh b/plugins/rbfu/rbfu.plugin.zsh
new file mode 100644
index 000000000..008485205
--- /dev/null
+++ b/plugins/rbfu/rbfu.plugin.zsh
@@ -0,0 +1,42 @@
+# Enables rbfu with --auto option, if available.
+#
+# Also provides a command to list all installed/available
+# rubies. To ensure compatibility with themes, creates the
+# rvm_prompt_info function to return the $RBFU_RUBY_VERSION
+# version.
+
+command -v rbfu &>/dev/null
+
+if [[ $? -eq 0 ]]; then
+  eval "$(rbfu --init --auto)"
+
+  # Internal: Print ruby version details, if it's currently
+  # active etc.
+  function _rbfu_rubies_print() {
+    local rb rb_out
+    rb=$(basename $1)
+    rb_out="$rb"
+    [[ -h $1 ]] && rb_out="$rb_out${fg[green]}@${reset_color}"
+    [[ "x$rb" == "x$2" ]] && rb_out="${fg[red]}$rb_out ${fg[red]}*${reset_color}"
+    echo $rb_out
+  }
+
+  # Public: Provide a list with all available rubies, this basically depends
+  # on `ls -1` and .rfbu/rubies. Highlights the currently active ruby version
+  # and aliases.
+  function rbfu-rubies() {
+    local rbfu_dir active_rb
+    rbfu_dir=$RBFU_RUBIES
+    active_rb=$RBFU_RUBY_VERSION
+    [[ -z "$rbfu_dir" ]] && rbfu_dir="${HOME}/.rbfu/rubies"
+    [[ -z "$active_rb" ]] && active_rb="system"
+    _rbfu_rubies_print "${rbfu_dir}/system" $active_rb
+    for rb in $(ls -1 $rbfu_dir); do
+      _rbfu_rubies_print "${rbfu_dir}/${rb}" $active_rb
+    done
+  }
+
+  # Public: Create rvm_prompt_info command for themes compatibility, unless
+  # it has already been defined.
+  [ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }
+fi
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index c42c68df1..91b0279c5 100644..100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,3 +1,9 @@
 # Sublime Text 2 Aliases
-alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+#unamestr = 'uname'
+
+if [[ $('uname') == 'Linux' ]]; then
+	alias st='/usr/bin/sublime_text&'
+elif  [[ $('uname') == 'Darwin' ]]; then
+	alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+fi
 alias stt='st .'
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index a93c8e863..5d0860400 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,5 +1,5 @@
 WRAPPER_FOUND=0
-for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
+for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
   if [[ -e $wrapsource ]] ; then
     WRAPPER_FOUND=1
     source $wrapsource