Merge c0780da68e into 0ebe35968c

plugins/nvm/_nvm

@@ -1,7 +1,7 @@
 #compdef nvm
 #autoload
 
-[[ -s ~/.nvm/nvm.sh ]] || return 0
+[[ -s $NVM_DIR/nvm.sh ]] || return 0
 
 local -a _1st_arguments
 _1st_arguments=(
@@ -23,4 +23,4 @@ _arguments -C '*:: :->subcmds' && return 0
 if (( CURRENT == 1 )); then
   _describe -t commands "nvm subcommand" _1st_arguments
   return
-fi
+fi

plugins/nvm/nvm.plugin.zsh

@@ -1,3 +1,25 @@
-# The addition 'nvm install' attempts in ~/.profile
+_homebrew-installed() {
+  type brew &> /dev/null
+}
 
-[[ -s ~/.nvm/nvm.sh ]] && . ~/.nvm/nvm.sh
+_nvm-from-homebrew-installed() {
+  brew --prefix nvm &> /dev/null
+}
+
+FOUND_NVM=0
+nvmdirs=("$HOME/.nvm" "/usr/local/nvm" "/opt/nvm" "/usr/local/opt/nvm")
+if _homebrew-installed && _nvm-from-homebrew-installed ; then
+    nvmdirs=($(brew --prefix nvm) "${rbenvdirs[@]}")
+fi
+
+for nvmdir in "${nvmdirs[@]}" ; do
+  if [ -s $nvmdir/nvm.sh -a $FOUND_NVM -eq 0 ]; then
+    FOUND_NVM=1
+    if [[ $NVM_DIR = '' ]]; then
+      NVM_DIR=$nvmdir
+    fi
+    export NVM_DIR
+    source $nvmdir/nvm.sh
+  fi
+done
+unset nvmdir

plugins/rbenv/rbenv.plugin.zsh

@@ -23,7 +23,7 @@ for rbenvdir in "${rbenvdirs[@]}" ; do
     alias gemsets="rbenv gemset list"
 
     function current_ruby() {
-      echo "$(rbenv version-name)"
+      echo "${ZSH_THEME_RBENV_PROMPT_PREFIX=(}$(rbenv version-name)${ZSH_THEME_RBENV_PROMPT_SUFFIX=)}"
     }
 
     function current_gemset() {

themes/aurora.zsh-theme

@@ -0,0 +1,104 @@
+# oh-my-zsh Bureau Theme
+
+### NVM
+
+ZSH_THEME_NVM_PROMPT_PREFIX="%B⬡%b "
+ZSH_THEME_NVM_PROMPT_SUFFIX=""
+
+## RUBY
+
+ZSH_THEME_RBENV_PROMPT_PREFIX="%B⬠%b "
+ZSH_THEME_RBENV_PROMPT_SUFFIX=""
+
+### Git
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[green]%}\ue0a0 %{$reset_color%}%{$fg_bold[white]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+bureau_git_branch () {
+  ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+  echo "${ref#refs/heads/}"
+}
+
+bureau_git_status () {
+  _INDEX=$(command git status --porcelain -b 2> /dev/null)
+  _STATUS=""
+  if $(echo "$_INDEX" | grep '^[AMRD]. ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
+  fi
+  if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
+  fi
+  if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+  fi
+  if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
+  fi
+  if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*ahead' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*behind' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*diverged' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
+  fi
+
+  echo $_STATUS
+}
+
+bureau_git_prompt () {
+  local _branch=$(bureau_git_branch)
+  local _status=$(bureau_git_status)
+  local _result=""
+  if [[ "${_branch}x" != "x" ]]; then
+    _result="$ZSH_THEME_GIT_PROMPT_PREFIX$_branch"
+    if [[ "${_status}x" != "x" ]]; then
+      _result="$_result $_status"
+    fi
+    _result="$_result$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+  echo $_result
+}
+
+_PATH="%{$fg_bold[white]%}%2~%{$reset_color%}"
+
+if [[ $EUID -eq 0 ]]; then
+  _USERNAME="%{$fg_bold[red]%}%n"
+  _LIBERTY="%{$fg[red]%}#"
+else
+  _USERNAME="%{$fg_bold[white]%}%n"
+  _LIBERTY="%{$fg[cyan]%}$"
+fi
+_USERNAME="$_USERNAME%{$reset_color%}@%m"
+_LIBERTY="$_LIBERTY%{$reset_color%}"
+
+get_space () {
+  local STR=$1$2
+  local zero='%([BSUbfksu]|([FB]|){*})'
+  local LENGTH=${#${(S%%)STR//$~zero/}}
+  local SPACES=""
+  (( LENGTH = ${COLUMNS} - $LENGTH - 1))
+
+  for i in {0..$LENGTH}
+    do
+      SPACES="$SPACES "
+    done
+
+  echo $SPACES
+}
+
+return_code () {
+  echo "%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+}
+
+setopt prompt_subst
+PROMPT='$_USERNAME $_PATH $_LIBERTY '
+RPROMPT='$(return_code) $(nvm_prompt_info) $(rbenv_prompt_info) $(bureau_git_prompt)'
+
+autoload -U add-zsh-hook