From d9b16fe2b2d3c0f97f885d4637f9437ccdfda89a Mon Sep 17 00:00:00 2001
From: Sean Carolan <scarolan@opscode.com>
Date: Mon, 3 Mar 2014 18:12:24 -0500
Subject: [PATCH] Updated zmoji theme and battery theme.

---
 plugins/battery/battery.plugin.zsh |  2 --
 themes/zmoji.zsh-theme             | 14 ++------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 16ad3e651..1558938c2 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -146,5 +146,3 @@ function battery_level_gauge() {
   [[ $filled -lt $gauge_slots ]] && printf ${empty_symbol//\%/\%\%}'%.0s' {1..$empty}
   printf ${color_reset//\%/\%\%}${battery_suffix//\%/\%\%}${color_reset//\%/\%\%}
 }
-
-
diff --git a/themes/zmoji.zsh-theme b/themes/zmoji.zsh-theme
index 299e787f0..30be10ed3 100644
--- a/themes/zmoji.zsh-theme
+++ b/themes/zmoji.zsh-theme
@@ -1,7 +1,7 @@
 ##############################################################################
 # zmoji: A fun oh_my_zsh theme with an OSX emoji character in your prompt
 # 
-# Requires the zmoji, moonphase, and emoji-clock plugins
+# Requires the zmoji, moonphase, battery, and emoji-clock plugins
 #
 # Open this link in Safari to see a master list:
 # http://www.grumdrig.com/emoji-list/
@@ -47,16 +47,6 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
 
-# Uses the batcharge.py script; need to refactor this into pure zsh
-function battery_charge() {
-  if [ -e ~/bin/batcharge.py ]
-  then
-    echo `python ~/bin/batcharge.py`
-  else
-    echo ''
-  fi
-}
-
 function setprompt {
   # Here we let the user choose an emoji, or pick a random one.
   if (($EMOJI_KEYS[(Ie)$ICON])); then
@@ -65,7 +55,7 @@ function setprompt {
     # Use this prompt if you want your ICON to change every hour
     PROMPT='[%{$fg[yellow]%}%2~%{$reset_color%}] %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}% %{$reset_color%} %(0T.$EMOJI[$ICONLIST[24]].%(1T.$EMOJI[$ICONLIST[1]].%(2T.$EMOJI[$ICONLIST[2]].%(3T.$EMOJI[$ICONLIST[3]].%(4T.$EMOJI[$ICONLIST[4]].%(5T.$EMOJI[$ICONLIST[5]].%(6T.$EMOJI[$ICONLIST[6]].%(7T.$EMOJI[$ICONLIST[7]].%(8T.$EMOJI[$ICONLIST[8]].%(9T.$EMOJI[$ICONLIST[9]].%(10T.$EMOJI[$ICONLIST[10]].%(11T.$EMOJI[$ICONLIST[11]].%(12T.$EMOJI[$ICONLIST[12]].%(13T.$EMOJI[$ICONLIST[13]].%(14T.$EMOJI[$ICONLIST[14]].%(15T.$EMOJI[$ICONLIST[15]].%(16T.$EMOJI[$ICONLIST[16]].%(17T.$EMOJI[$ICONLIST[17]].%(18T.$EMOJI[$ICONLIST[18]].%(19T.$EMOJI[$ICONLIST[19]].%(20T.$EMOJI[$ICONLIST[20]].%(21T.$EMOJI[$ICONLIST[21]].%(22T.$EMOJI[$ICONLIST[22]].%(23T.$EMOJI[$ICONLIST[23]].\$))))))))))))))))))))))))  '
     # RPROMPT includes battery monitor, clock, and moon phase
-    RPROMPT='%{$fg[green]%} $(battery_charge)%{$reset_color%} %(17T.$EMOJI[BEER_MUG].$(emoji-clock))  $(printmoon)'
+    RPROMPT='%{$fg[green]%} $(battery_level_gauge)%{$reset_color%} %(17T.$EMOJI[BEER_MUG].$(emoji-clock))  $(printmoon)'
   fi
 }