Uses agnoster as base

bullet-train.zsh-theme

@@ -1,105 +1,163 @@
-# Basic colors: RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, BLACK, WHITE
+# README
+#
+# In order for this theme to render correctly, you will need a
+# [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts).
+#
+# In addition, I recommend the
+# [Solarized theme](https://github.com/altercation/solarized/) and, if you're
+# using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app -
+# it has significantly better color fidelity.
 
-BULLETTRAIN_DATE=%D{%H:%M:%S}
+### Segment drawing
+# A few utility functions to make it easy and re-usable to draw segmented prompts
 
-if [ "$BULLETTRAIN_HIDE_USER_NAME" = "" ] && [ "$BULLETTRAIN_HIDE_HOST_NAME" = "" ]; then
+CURRENT_BG='NONE'
-  BULLETTRAIN_USER_NAME="%n@%M"
+SEGMENT_SEPARATOR=''
-elif [ "$BULLETTRAIN_HIDE_USER_NAME" != "" ] && [ "$BULLETTRAIN_HIDE_HOST_NAME" = "" ]; then
+
-  BULLETTRAIN_USER_NAME="@%M"
+# Begin a segment
-elif [ "$BULLETTRAIN_HIDE_USER_NAME" = "" ] && [ "$BULLETTRAIN_HIDE_HOST_NAME" != "" ]; then
+# Takes two arguments, background and foreground. Both can be omitted,
-  BULLETTRAIN_USER_NAME="%n"
+# rendering default background/foreground.
+prompt_segment() {
+  local bg fg
+  [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
+  [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
+  if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
+    echo -n " %{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%} "
   else
-  BULLETTRAIN_USER_NAME=""
+    echo -n "%{$bg%}%{$fg%} "
   fi
+  CURRENT_BG=$1
+  [[ -n $3 ]] && echo -n $3
+}
 
-BULLETTRAIN_CURRENT_PATH="%d"
+# End the prompt, closing any open segments
-
+prompt_end() {
-if [ "$BULLETTRAIN_FULL_CURRENT_PATH" = "" ]; then
+  if [[ -n $CURRENT_BG ]]; then
-  BULLETTRAIN_CURRENT_PATH="%1~"
+    echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
+  else
+    echo -n "%{%k%}"
   fi
+  echo -n "%{%f%}"
+  CURRENT_BG=''
+}
 
-if [ "$BULLETTRAIN_GIT_CLEAN" = "" ]; then
+### Prompt components
-  BULLETTRAIN_GIT_CLEAN="✔"
+# Each component will draw itself, and hide itself if no information needs to be shown
-fi
 
-if [ "$BULLETTRAIN_GIT_DIRTY" = "" ]; then
+# Context: user@hostname (who am I and where am I)
-  BULLETTRAIN_GIT_DIRTY="✘"
+prompt_context() {
-fi
+  local user=`whoami`
 
-if [ "$BULLETTRAIN_GIT_ADDED" = "" ]; then
+  if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-  BULLETTRAIN_GIT_ADDED="%F{green}✚%F{black}"
+    prompt_segment black default "%(!.%{%F{yellow}%}.)$user@%m"
   fi
+}
 
-if [ "$BULLETTRAIN_GIT_MODIFIED" = "" ]; then
+# Git: branch/detached head, dirty status
-  BULLETTRAIN_GIT_MODIFIED="%F{blue}✹%F{black}"
+prompt_git() {
-fi
+  local ref dirty mode repo_path
+  repo_path=$(git rev-parse --git-dir 2>/dev/null)
 
-if [ "$BULLETTRAIN_GIT_DELETED" = "" ]; then
+  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
-  BULLETTRAIN_GIT_DELETED="%F{red}✖%F{black}"
-fi
-
-if [ "$BULLETTRAIN_GIT_UNTRACKED" = "" ]; then
-  BULLETTRAIN_GIT_UNTRACKED="%F{yellow}✭%F{black}"
-fi
-
-if [ "$BULLETTRAIN_GIT_RENAMED" = "" ]; then
-  BULLETTRAIN_GIT_RENAMED="➜"
-fi
-
-if [ "$BULLETTRAIN_GIT_UNMERGED" = "" ]; then
-  BULLETTRAIN_GIT_UNMERGED="═"
-fi
 
     ZSH_THEME_GIT_PROMPT_PREFIX=" \ue0a0 "
     ZSH_THEME_GIT_PROMPT_SUFFIX=""
-ZSH_THEME_GIT_PROMPT_DIRTY=" $BULLETTRAIN_GIT_DIRTY"
+    ZSH_THEME_GIT_PROMPT_DIRTY=" ✘"
-ZSH_THEME_GIT_PROMPT_CLEAN=" $BULLETTRAIN_GIT_CLEAN"
+    ZSH_THEME_GIT_PROMPT_CLEAN=" ✔"
-
+    ZSH_THEME_GIT_PROMPT_ADDED=" %F{green}✚%F{black}"
-ZSH_THEME_GIT_PROMPT_ADDED=" $BULLETTRAIN_GIT_ADDED"
+    ZSH_THEME_GIT_PROMPT_MODIFIED=" %F{blue}✹%F{black}"
-ZSH_THEME_GIT_PROMPT_MODIFIED=" $BULLETTRAIN_GIT_MODIFIED"
+    ZSH_THEME_GIT_PROMPT_DELETED=" %F{red}✖%F{black}"
-ZSH_THEME_GIT_PROMPT_DELETED=" $BULLETTRAIN_GIT_DELETED"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED=" %F{yellow}✭%F{black}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED=" $BULLETTRAIN_GIT_UNTRACKED"
+    ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
-ZSH_THEME_GIT_PROMPT_RENAMED=" $BULLETTRAIN_GIT_RENAMED"
+    ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
-ZSH_THEME_GIT_PROMPT_UNMERGED=" $BULLETTRAIN_GIT_UNMERGED"
     ZSH_THEME_GIT_PROMPT_AHEAD=" ⬆"
     ZSH_THEME_GIT_PROMPT_BEHIND=" ⬇"
     ZSH_THEME_GIT_PROMPT_DIVERGED=" ⬍"
 
-if [ "$BULLETTRAIN_SHOW_GIT_ON_RIGHT" = "" ]; then
+    prompt_segment white black
-  if [ "$BULLETTRAIN_HIDE_GIT_PROMPT_STATUS" = "" ]; then
+    echo -n $(git_prompt_info)
-    BULLETTRAIN_GIT_INFO_LEFT=" %F{blue}%K{white}"$'\ue0b0'"%F{white}%F{black}%K{white}"$'$(git_prompt_info)$(git_prompt_status)%F{white}'
-  else
-    BULLETTRAIN_GIT_INFO_LEFT=" %F{blue}%K{white}"$'\ue0b0'"%F{white}%F{black}%K{white}"$'$(git_prompt_info)%F{white}'
-  fi
-  BULLETTRAIN_GIT_INFO_RIGHT=""
-else
-  BULLETTRAIN_GIT_INFO_LEFT=""
-  BULLETTRAIN_GIT_INFO_RIGHT="%F{white}"$'\ue0b2'"%F{black}%K{white}"$'$(git_prompt_info)'" %K{white}"
   fi
+}
 
-if [ $(id -u) -eq 0 ]; then
+prompt_hg() {
-  BULLETTRAIN_SEC1_BG=%K{red}
+  local rev status
-  BULLETTRAIN_SEC1_FG=%F{red}
+  if $(hg id >/dev/null 2>&1); then
+    if $(hg prompt >/dev/null 2>&1); then
+      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
+        # if files are not added
+        prompt_segment red white
+        st='±'
+      elif [[ -n $(hg prompt "{status|modified}") ]]; then
+        # if any modification
+        prompt_segment yellow black
+        st='±'
       else
-  BULLETTRAIN_SEC1_BG=%K{green}
+        # if working copy is clean
-  BULLETTRAIN_SEC1_FG=%F{green}
+        prompt_segment green black
       fi
-BULLETTRAIN_SEC1_TXT=%F{black}
+      echo -n $(hg prompt "☿ {rev}@{branch}") $st
-if [ "$BULLETTRAIN_DETECT_SSH" != "" ]; then
+    else
-  if [ -n "$SSH_CLIENT" ]; then
+      st=""
-    BULLETTRAIN_SEC1_BG=%K{red}
+      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
-    BULLETTRAIN_SEC1_FG=%F{red}
+      branch=$(hg id -b 2>/dev/null)
-    BULLETTRAIN_SEC1_TXT=%F{white}
+      if `hg st | grep -Eq "^\?"`; then
+        prompt_segment red black
+        st='±'
+      elif `hg st | grep -Eq "^(M|A)"`; then
+        prompt_segment yellow black
+        st='±'
+      else
+        prompt_segment green black
+      fi
+      echo -n "☿ $rev@$branch" $st
     fi
   fi
+}
 
-PROMPT="$BULLETTRAIN_SEC1_BG$BULLETTRAIN_SEC1_TXT %k%f$BULLETTRAIN_SEC1_FG%K{blue}"$'\ue0b0'"%k%f%F{white}%K{blue} "$BULLETTRAIN_CURRENT_PATH"%F{blue}"$BULLETTRAIN_GIT_INFO_LEFT" %k"$'\ue0b0'"%f "
+# Dir: current working directory
-PROMPT="%K{red} %F{red}%K{yellow}"$'\ue0b0'"%F{white}%K{yellow} "$BULLETTRAIN_DATE" %F{yellow}%K{green}"$'\ue0b0'$PROMPT
+prompt_dir() {
-PROMPT=$PROMPT"
+  prompt_segment blue white '%1~'
-%{${fg_bold[default]}%}\$ %{$reset_color%}"
+}
 
-# Adds blankline before?
+# Virtualenv: current working virtualenv
-if [ "$BULLETTRAIN_NO_BLANK_LINE" = "" ]; then
+prompt_virtualenv() {
-  PROMPT="
+  local virtualenv_path="$VIRTUAL_ENV"
-"$PROMPT
+  if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
+    prompt_segment blue black "(`basename $virtualenv_path`)"
   fi
+}
+
+prompt_time() {
+  prompt_segment green white %D{%H:%M:%S}
+}
+
+# Status:
+# - was there an error
+# - am I root
+# - are there background jobs?
+prompt_status() {
+  local symbols
+  symbols=()
+  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
+  [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
+  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
+
+  [[ -n "$symbols" ]] && prompt_segment black default "$symbols"
+}
+
+## Main prompt
+build_prompt() {
+  RETVAL=$?
+  prompt_status
+  prompt_time
+  prompt_virtualenv
+  # prompt_context
+  prompt_dir
+  prompt_git
+  prompt_hg
+  prompt_end
+}
+
+PROMPT='
+%{%f%b%k%}$(build_prompt)
+%{${fg_bold[default]}%}\$ %{$reset_color%}'