tybruffy · March 24, 2016 10:40 · Mar 26, 2014 · Mar 26, 2014 · Mar 26, 2014 · Mar 25, 2014
diff --git a/agnoster.zsh-theme b/agnoster.zsh-theme
@@ -63,7 +63,7 @@ prompt_context() {
   local user=`whoami`
 
   if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-    prompt_segment black default "%(!.%{%F{yellow}%}.)$user@%m"
+    prompt_segment magenta black "%(!.%{%F{yellow}%}.)$user@%m"
   fi
 }
 
@@ -80,8 +80,8 @@ prompt_git() {
       prompt_segment green black
     fi
 #    echo -n "${ref/refs\/heads\//⭠ }$dirty"
-#    modified to remove brabnch symbol
-    echo -n "${ref/refs\/heads\//}$dirty"
+#    modified to remove branch symbol
+    echo -n "${ref/refs\/heads\//} $dirty"
   fi
 }
 
@@ -100,13 +100,9 @@ prompt_time() {
 # - 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"
+  [[ $RETVAL -ne 0 ]] && prompt_segment red black '✘'
+  [[ $UID -eq 0 ]] && prompt_segment yellow black '⚡'
+  [[ $(jobs -l | wc -l) -gt 0 ]] && prompt_segment white black '⚙'
 }
 
 ## Main prompt

diff --git a/screenshot.png b/screenshot.png
diff --git a/README.md b/README.md
@@ -1,40 +0,0 @@
-# agnoster.zsh-theme
-
-A ZSH theme optimized for people who use:
-
-- Solarized
-- Git
-- Unicode-compatible fonts and terminals (I use iTerm2 + Menlo)
-
-For Mac users, I highly recommend iTerm 2 + Solarized Dark
-
-# Compatibility
-
-**NOTE:** In all likelihood, you will need to install a [Powerline-patched font](https://gist.github.com/1595572) for this theme to render correctly.
-
-To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀ ± ⭠ ➦ ✔ ✘ ⚡"`. The result should look like this:
-
-![Character Example](http://cl.ly/content/image/2l3w443z363P/aHR0cDovL2YuY2wubHkvaXRlbXMvM2ozTjJpMDMzTzJNM0ozcDFjMjgvU2NyZWVuJTIwU2hvdCUyMDIwMTItMDktMTQlMjBhdCUyMDEyLjA2LjAyJTIwLnBuZw==)
-
-## What does it show?
-
-- If the previous command failed (✘)
-- User @ Hostname (if user is not DEFAULT_USER, which can then be set in your profile)
-- Git status
-  - Branch (⭠) or detached head (➦)
-  - Current branch / SHA1 in detached head state
-  - Dirty working directory (±, color change)
-- Working directory
-- Elevated (root) privileges (⚡)
-
-![Screenshot](https://raw.github.com/gist/3712874/5d28e2d9fe2e4d0a4fda0315ad97bdafa399425c/screenshot.png)
-
-## Future Work
-
-I don't want to clutter it up too much, but I am toying with the idea of adding RVM (ruby version) and n (node.js version) display.
-
-It's currently hideously slow, especially inside a git repo. I guess it's not overly so for comparable themes, but it bugs me, and I'd love to hear ideas about how to improve the performance.
-
-Would be nice for the code to be a bit more sane and re-usable. Something to easily append a section with a given FG/BG, and add the correct opening and closing.
-
-Also the dependency on a powerline-patched font is regrettable, but there's really no way to get that effect without it. Ideally there would be a way to check for compatibility, or maybe even fall back to one of the similar unicode glyphs.

diff --git a/screenshot.png b/screenshot.png
diff --git a/agnoster.zsh-theme b/agnoster.zsh-theme
@@ -79,13 +79,20 @@ prompt_git() {
     else
       prompt_segment green black
     fi
-    echo -n "${ref/refs\/heads\//⭠ }$dirty"
+#    echo -n "${ref/refs\/heads\//⭠ }$dirty"
+#    modified to remove brabnch symbol
+    echo -n "${ref/refs\/heads\//}$dirty"
   fi
 }
 
 # Dir: current working directory
 prompt_dir() {
-  prompt_segment blue black '%~'
+  prompt_segment blue black '%C'
+}
+
+# Time: current time
+prompt_time() {
+  prompt_segment cyan black '%T'
 }
 
 # Status:
@@ -105,11 +112,12 @@ prompt_status() {
 ## Main prompt
 build_prompt() {
   RETVAL=$?
+  prompt_time
   prompt_status
   prompt_context
   prompt_dir
   prompt_git
   prompt_end
 }
 
-PROMPT='%{%f%b%k%}$(build_prompt) '
+PROMPT='%{%f%b%k%}$(build_prompt) '
diff --git a/README.md b/README.md
@@ -37,4 +37,4 @@ It's currently hideously slow, especially inside a git repo. I guess it's not ov
 
 Would be nice for the code to be a bit more sane and re-usable. Something to easily append a section with a given FG/BG, and add the correct opening and closing.
 
-Apparently the unicode characters don't display correctly on all systems. It would be nice to be able to say "this font will make it work, always". But what font?
+Also the dependency on a powerline-patched font is regrettable, but there's really no way to get that effect without it. Ideally there would be a way to check for compatibility, or maybe even fall back to one of the similar unicode glyphs.
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@ A ZSH theme optimized for people who use:
 - Git
 - Unicode-compatible fonts and terminals (I use iTerm2 + Menlo)
 
+For Mac users, I highly recommend iTerm 2 + Solarized Dark
+
 # Compatibility
 
 **NOTE:** In all likelihood, you will need to install a [Powerline-patched font](https://gist.github.com/1595572) for this theme to render correctly.
@@ -16,16 +18,16 @@ To test if your terminal and font support it, check that all the necessary chara
 
 ## What does it show?
 
-- Success (✔) or failure (✘) of previous command
-- Hostname
+- If the previous command failed (✘)
+- User @ Hostname (if user is not DEFAULT_USER, which can then be set in your profile)
 - Git status
   - Branch (⭠) or detached head (➦)
   - Current branch / SHA1 in detached head state
   - Dirty working directory (±, color change)
 - Working directory
 - Elevated (root) privileges (⚡)
 
-![Screenshot](https://gist.github.com/raw/3712874/de4828056ec1f04b03dbf4940f1b61e525ec9799/screenshot.png)
+![Screenshot](https://raw.github.com/gist/3712874/5d28e2d9fe2e4d0a4fda0315ad97bdafa399425c/screenshot.png)
 
 ## Future Work
 

diff --git a/agnoster.zsh-theme b/agnoster.zsh-theme
@@ -1,6 +1,6 @@
 # vim:ft=zsh ts=2 sw=2 sts=2
 #
-# agnoster's Theme
+# agnoster's Theme - https://gist.github.com/3712874
 # A Powerline-inspired theme for ZSH
 #
 # # README

diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@ A ZSH theme optimized for people who use:
 - Git
 - Unicode-compatible fonts and terminals (I use iTerm2 + Menlo)
 
+For Mac users, I highly recommend iTerm 2 + Solarized Dark
+
 # Compatibility
 
 **NOTE:** In all likelihood, you will need to install a [Powerline-patched font](https://gist.github.com/1595572) for this theme to render correctly.
@@ -16,8 +18,8 @@ To test if your terminal and font support it, check that all the necessary chara
 
 ## What does it show?
 
-- Success (✔) or failure (✘) of previous command
-- Hostname
+- If the previous command failed (✘)
+- User @ Hostname (if user is not DEFAULT_USER, which can then be set in your profile)
 - Git status
   - Branch (⭠) or detached head (➦)
   - Current branch / SHA1 in detached head state

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ To test if your terminal and font support it, check that all the necessary chara
 - Working directory
 - Elevated (root) privileges (⚡)
 
-![Screenshot](https://gist.github.com/raw/3712874/de4828056ec1f04b03dbf4940f1b61e525ec9799/screenshot.png)
+![Screenshot](https://raw.github.com/gist/3712874/5d28e2d9fe2e4d0a4fda0315ad97bdafa399425c/screenshot.png)
 
 ## Future Work
 

diff --git a/README.md b/README.md
@@ -8,6 +8,8 @@ A ZSH theme optimized for people who use:
 
 # Compatibility
 
+**NOTE:** In all likelihood, you will need to install a [Powerline-patched font](https://gist.github.com/1595572) for this theme to render correctly.
+
 To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀ ± ⭠ ➦ ✔ ✘ ⚡"`. The result should look like this:
 
 ![Character Example](http://cl.ly/content/image/2l3w443z363P/aHR0cDovL2YuY2wubHkvaXRlbXMvM2ozTjJpMDMzTzJNM0ozcDFjMjgvU2NyZWVuJTIwU2hvdCUyMDIwMTItMDktMTQlMjBhdCUyMDEyLjA2LjAyJTIwLnBuZw==)

diff --git a/screenshot.png b/screenshot.png
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ A ZSH theme optimized for people who use:
 
 # Compatibility
 
-**NOTE:** In all likelihood, you will need to install a [Powerline-patched font] for this theme to render correctly.
+**NOTE:** In all likelihood, you will need to install a [Powerline-patched font](https://gist.github.com/1595572) for this theme to render correctly.
 
 To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀ ± ⭠ ➦ ✔ ✘ ⚡"`. The result should look like this:
 

diff --git a/README.md b/README.md
@@ -8,6 +8,8 @@ A ZSH theme optimized for people who use:
 
 # Compatibility
 
+**NOTE:** In all likelihood, you will need to install a [Powerline-patched font] for this theme to render correctly.
+
 To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀ ± ⭠ ➦ ✔ ✘ ⚡"`. The result should look like this:
 
 ![Character Example](http://cl.ly/content/image/2l3w443z363P/aHR0cDovL2YuY2wubHkvaXRlbXMvM2ozTjJpMDMzTzJNM0ozcDFjMjgvU2NyZWVuJTIwU2hvdCUyMDIwMTItMDktMTQlMjBhdCUyMDEyLjA2LjAyJTIwLnBuZw==)

diff --git a/README.md b/README.md
@@ -6,6 +6,12 @@ A ZSH theme optimized for people who use:
 - Git
 - Unicode-compatible fonts and terminals (I use iTerm2 + Menlo)
 
+# Compatibility
+
+To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀ ± ⭠ ➦ ✔ ✘ ⚡"`. The result should look like this:
+
+![Character Example](http://cl.ly/content/image/2l3w443z363P/aHR0cDovL2YuY2wubHkvaXRlbXMvM2ozTjJpMDMzTzJNM0ozcDFjMjgvU2NyZWVuJTIwU2hvdCUyMDIwMTItMDktMTQlMjBhdCUyMDEyLjA2LjAyJTIwLnBuZw==)
+
 ## What does it show?
 
 - Success (✔) or failure (✘) of previous command
@@ -22,3 +28,9 @@ A ZSH theme optimized for people who use:
 ## Future Work
 
 I don't want to clutter it up too much, but I am toying with the idea of adding RVM (ruby version) and n (node.js version) display.
+
+It's currently hideously slow, especially inside a git repo. I guess it's not overly so for comparable themes, but it bugs me, and I'd love to hear ideas about how to improve the performance.
+
+Would be nice for the code to be a bit more sane and re-usable. Something to easily append a section with a given FG/BG, and add the correct opening and closing.
+
+Apparently the unicode characters don't display correctly on all systems. It would be nice to be able to say "this font will make it work, always". But what font?
diff --git a/agnoster.zsh-theme b/agnoster.zsh-theme
@@ -1,27 +1,115 @@
-# https://github.com/agnoster zsh theme
+# vim:ft=zsh ts=2 sw=2 sts=2
+#
+# agnoster's Theme
+# A Powerline-inspired theme for ZSH
+#
+# # README
+#
+# In order for this theme to render correctly, you will need a
+# [Powerline-patched font](https://gist.github.com/1595572).
+#
+# 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.
+#
+# # Goals
+#
+# The aim of this theme is to only show you *relevant* information. Like most
+# prompts, it will only show git information when in a git working directory.
+# However, it goes a step further: everything from the current user and
+# hostname to whether the last call exited with an error to whether background
+# jobs are running in this shell will all be displayed automatically when
+# appropriate.
 
-ZSH_THEME_GIT_PROMPT_DIRTY='±'
+### Segment drawing
+# A few utility functions to make it easy and re-usable to draw segmented prompts
 
-function _git_prompt_info() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
-  echo "${ref/refs\/heads\//⭠ }$(parse_git_dirty)"
+CURRENT_BG='NONE'
+SEGMENT_SEPARATOR='⮀'
+
+# Begin a segment
+# Takes two arguments, background and foreground. Both can be omitted,
+# 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
+    echo -n "%{$bg%}%{$fg%} "
+  fi
+  CURRENT_BG=$1
+  [[ -n $3 ]] && echo -n $3
+}
+
+# End the prompt, closing any open segments
+prompt_end() {
+  if [[ -n $CURRENT_BG ]]; then
+    echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
+  else
+    echo -n "%{%k%}"
+  fi
+  echo -n "%{%f%}"
+  CURRENT_BG=''
 }
 
-function _git_info() {
+### Prompt components
+# Each component will draw itself, and hide itself if no information needs to be shown
+
+# Context: user@hostname (who am I and where am I)
+prompt_context() {
+  local user=`whoami`
+
+  if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+    prompt_segment black default "%(!.%{%F{yellow}%}.)$user@%m"
+  fi
+}
+
+# Git: branch/detached head, dirty status
+prompt_git() {
+  local ref dirty
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
-    local BG_COLOR=green
-    if [[ -n $(parse_git_dirty) ]]; then
-      BG_COLOR=yellow
+    ZSH_THEME_GIT_PROMPT_DIRTY='±'
+    dirty=$(parse_git_dirty)
+    ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+    if [[ -n $dirty ]]; then
+      prompt_segment yellow black
+    else
+      prompt_segment green black
     fi
-    echo "%{%K{$BG_COLOR}%}⮀%{%F{black}%} $(_git_prompt_info) %{%F{$BG_COLOR}%K{blue}%}⮀"
-  else
-    echo "%{%K{blue}%}⮀"
+    echo -n "${ref/refs\/heads\//⭠ }$dirty"
   fi
 }
 
-PROMPT_HOST='%{%b%F{gray}%K{black}%} %(?.%{%F{green}%}✔.%{%F{red}%}✘)%{%F{gray}%} %m %{%F{black}%}'
-PROMPT_DIR='%{%F{white}%} %1~ '
-PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}⮀%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})⮀%{%f%k%b%}'
+# Dir: current working directory
+prompt_dir() {
+  prompt_segment blue black '%~'
+}
+
+# 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_context
+  prompt_dir
+  prompt_git
+  prompt_end
+}
 
-PROMPT='%{%f%b%k%}
-$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU '
+PROMPT='%{%f%b%k%}$(build_prompt) '
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ A ZSH theme optimized for people who use:
 
 To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀ ± ⭠ ➦ ✔ ✘ ⚡"`. The result should look like this:
 
-![Character Example](http://cl.ly/image/2l3w443z363P)
+![Character Example](http://cl.ly/content/image/2l3w443z363P/aHR0cDovL2YuY2wubHkvaXRlbXMvM2ozTjJpMDMzTzJNM0ozcDFjMjgvU2NyZWVuJTIwU2hvdCUyMDIwMTItMDktMTQlMjBhdCUyMDEyLjA2LjAyJTIwLnBuZw==)
 
 ## What does it show?
 

diff --git a/README.md b/README.md
@@ -6,9 +6,11 @@ A ZSH theme optimized for people who use:
 - Git
 - Unicode-compatible fonts and terminals (I use iTerm2 + Menlo)
 
-To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀±⭠ ➦✔✘⚡"`. The result should look like this:
+# Compatibility
 
-![Character Example](http://cl.ly/image/3m3b0k2g2Y1A/Screen%20Shot%202012-09-14%20at%2012.01.14%20.png)
+To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀ ± ⭠ ➦ ✔ ✘ ⚡"`. The result should look like this:
+
+![Character Example](http://cl.ly/image/2l3w443z363P)
 
 ## What does it show?
 
@@ -29,4 +31,6 @@ I don't want to clutter it up too much, but I am toying with the idea of adding
 
 It's currently hideously slow, especially inside a git repo. I guess it's not overly so for comparable themes, but it bugs me, and I'd love to hear ideas about how to improve the performance.
 
-Would be nice for the code to be a bit more sane and re-usable. Something to easily append a section with a given FG/BG, and add the correct opening and closing.
+Would be nice for the code to be a bit more sane and re-usable. Something to easily append a section with a given FG/BG, and add the correct opening and closing.
+
+Apparently the unicode characters don't display correctly on all systems. It would be nice to be able to say "this font will make it work, always". But what font?
diff --git a/README.md b/README.md
@@ -6,6 +6,10 @@ A ZSH theme optimized for people who use:
 - Git
 - Unicode-compatible fonts and terminals (I use iTerm2 + Menlo)
 
+To test if your terminal and font support it, check that all the necessary characters are supported by copying the following command to your terminal: `echo "⮀±⭠ ➦✔✘⚡"`. The result should look like this:
+
+![Character Example](http://cl.ly/image/3m3b0k2g2Y1A/Screen%20Shot%202012-09-14%20at%2012.01.14%20.png)
+
 ## What does it show?
 
 - Success (✔) or failure (✘) of previous command
@@ -25,4 +29,4 @@ I don't want to clutter it up too much, but I am toying with the idea of adding
 
 It's currently hideously slow, especially inside a git repo. I guess it's not overly so for comparable themes, but it bugs me, and I'd love to hear ideas about how to improve the performance.
 
-Would be nice for the code to be a bit more sane and re-usable. Something to easily append a section with a given FG/BG, and add the correct opening and closing.
+Would be nice for the code to be a bit more sane and re-usable. Something to easily append a section with a given FG/BG, and add the correct opening and closing.
diff --git a/README.md b/README.md
@@ -22,3 +22,7 @@ A ZSH theme optimized for people who use:
 ## Future Work
 
 I don't want to clutter it up too much, but I am toying with the idea of adding RVM (ruby version) and n (node.js version) display.
+
+It's currently hideously slow, especially inside a git repo. I guess it's not overly so for comparable themes, but it bugs me, and I'd love to hear ideas about how to improve the performance.
+
+Would be nice for the code to be a bit more sane and re-usable. Something to easily append a section with a given FG/BG, and add the correct opening and closing.
diff --git a/README.md b/README.md
@@ -0,0 +1,24 @@
+# agnoster.zsh-theme
+
+A ZSH theme optimized for people who use:
+
+- Solarized
+- Git
+- Unicode-compatible fonts and terminals (I use iTerm2 + Menlo)
+
+## What does it show?
+
+- Success (✔) or failure (✘) of previous command
+- Hostname
+- Git status
+  - Branch (⭠) or detached head (➦)
+  - Current branch / SHA1 in detached head state
+  - Dirty working directory (±, color change)
+- Working directory
+- Elevated (root) privileges (⚡)
+
+![Screenshot](https://gist.github.com/raw/3712874/de4828056ec1f04b03dbf4940f1b61e525ec9799/screenshot.png)
+
+## Future Work
+
+I don't want to clutter it up too much, but I am toying with the idea of adding RVM (ruby version) and n (node.js version) display.
diff --git a/screenshot.png b/screenshot.png
diff --git a/agnoster.zsh-theme b/agnoster.zsh-theme
@@ -0,0 +1,27 @@
+# https://github.com/agnoster zsh theme
+
+ZSH_THEME_GIT_PROMPT_DIRTY='±'
+
+function _git_prompt_info() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+  echo "${ref/refs\/heads\//⭠ }$(parse_git_dirty)"
+}
+
+function _git_info() {
+  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+    local BG_COLOR=green
+    if [[ -n $(parse_git_dirty) ]]; then
+      BG_COLOR=yellow
+    fi
+    echo "%{%K{$BG_COLOR}%}⮀%{%F{black}%} $(_git_prompt_info) %{%F{$BG_COLOR}%K{blue}%}⮀"
+  else
+    echo "%{%K{blue}%}⮀"
+  fi
+}
+
+PROMPT_HOST='%{%b%F{gray}%K{black}%} %(?.%{%F{green}%}✔.%{%F{red}%}✘)%{%F{gray}%} %m %{%F{black}%}'
+PROMPT_DIR='%{%F{white}%} %1~ '
+PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}⮀%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})⮀%{%f%k%b%}'
+
+PROMPT='%{%f%b%k%}
+$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU '