Update prezto

[rbdr/dotfiles] / prompt_ben_setup

diff --git a/prompt_ben_setup b/prompt_ben_setup
index 3c16c78c3a33fe7fdde167ee5d01604722213dd5..d164fd953542846616f2bf9e1dd3bc5eacecd5e3 100644 (file)
--- a/prompt_ben_setup
+++ b/prompt_ben_setup
@@ -2,17 +2,31 @@ function prompt_ben_precmd {
   git-info
 }
 
   git-info
 }
 

-function rvm_info {
-  echo '('`rvm-prompt v p g`')'
-}
-

 function virtualenv_info {
   if [[ -z "$VIRTUAL_ENV" ]]; then
     venv="default"
   else
     venv="${VIRTUAL_ENV##*/}"
   fi
 function virtualenv_info {
   if [[ -z "$VIRTUAL_ENV" ]]; then
     venv="default"
   else
     venv="${VIRTUAL_ENV##*/}"
   fi

-  echo "(${venv})"
+  echo "🐍${venv}"
+}
+
+function rvm_info {
+  if [[ -z "$RUBY_VERSION" ]]; then
+    rvminfo="default"
+  else
+    rvminfo=`rvm-prompt`
+  fi
+  echo "💎${rvminfo}"
+}
+
+function nvm_info {
+  if [[ -z "$NVM_BIN" ]]; then
+    nvminfo="default"
+  else
+    nvminfo=`nvm current`
+  fi
+  echo "💛${nvminfo}"

 }
 
 function box_name {
 }
 
 function box_name {


@@ -41,17 +55,18 @@ function prompt_ben_setup {
 
   # Set git-info parameters.
   zstyle ':prezto:module:git:info' verbose 'yes'
 
   # Set git-info parameters.
   zstyle ':prezto:module:git:info' verbose 'yes'

-  zstyle ':prezto:module:git:info:branch' format '@%F{blue}%b%f'
+  zstyle ':prezto:module:git:info:branch' format '@%F{cyan}%b%f'

   zstyle ':prezto:module:git:info:clean' format ''
   zstyle ':prezto:module:git:info:added' format '%{%F{green}%}!'
   zstyle ':prezto:module:git:info:modified' format '%{%F{green}%}?'
   zstyle ':prezto:module:git:info:clean' format ''
   zstyle ':prezto:module:git:info:added' format '%{%F{green}%}!'
   zstyle ':prezto:module:git:info:modified' format '%{%F{green}%}?'

-  zstyle ':prezto:module:git:info:untracked' format '%{%F{red}%}?'
+  zstyle ':prezto:module:git:info:untracked' format '%{%F{magenta}%}?'

   zstyle ':prezto:module:git:info:keys' format \
     'prompt' '%b%a%m%u'
 
   # Define prompts.
   PROMPT='
   zstyle ':prezto:module:git:info:keys' format \
     'prompt' '%b%a%m%u'
 
   # Define prompts.
   PROMPT='

-%{%F{red}%}%n%{%f%}@%{%F{yellow}%}$(box_name)%{%f%} %{%B%F{green}%}${PWD/#$HOME/~}%{%f%b%}${git_info[prompt]} %{%F{black}%}$(rvm_info)$(virtualenv_info)%{%f%}
+%{%F{black}%}$(nvm_info) $(rvm_info) $(virtualenv_info)
+%{%F{magenta}%}%n%{%f%}@%{%F{yellow}%}$(box_name)%{%f%} %{%B%F{green}%}${PWD/#$HOME/~}%{%f%b%}${git_info[prompt]} %{%f%}

 %(?,,%{${%B%F{white}%}[%?]%{%f%b%} )$ '
 }
 
 %(?,,%{${%B%F{white}%}[%?]%{%f%b%} )$ '
 }
 


@@ -59,7 +74,7 @@ prompt_ben_setup "$@"
 
 #setopt PROMPT_SUBST
 
 
 #setopt PROMPT_SUBST
 

-ZSH_THEME_GIT_PROMPT_PREFIX="@%{%F{blue}%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="@%{%F{cyan}%}"

 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{%F{green}%}!"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{%F{green}%}?"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{%F{green}%}!"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{%F{green}%}?"