From 3d00a4dfea9e820b92de33de7ff42421317c1ee0 Mon Sep 17 00:00:00 2001
From: Benjamin Martinez <cruznick@archlinux.us>
Date: Fri, 8 Apr 2011 22:23:44 -0700
Subject: [PATCH] updated batt arch and theme

---
 plugins/archlinux/archlinux.plugin.zsh | 10 +++++-----
 themes/cruznick.zsh-theme              | 21 ++++++++++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index d26dddb96..3b40855f2 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -50,8 +50,8 @@ alias pacrmd='_ $pcman -Rs' ##remove a package and deps which are not required b
 alias pacrma='_ $pcman -Rsn' ##remove a package and deps and .pacsave files
 alias pacclc='_ S $pcman -Scc' ## cleans pkgs cache and repos db
 ##makepkg alias
-alias mksource='makepkg --source -f'
-alias mkp='makepkg -sf ;alert'
-alias mkpi='makepkg -sfi '
-alias mkall='makepkg -sf && makepkg --source -f '
-alias mkalli='makepkg -sfi && makepkg --source -f '
+alias mksource='makepkg --source -f'  ##creates pkgbuild source tar if existing same ver of source pkg overwritte it
+alias mkp='makepkg -sf ' ## check for needed deps in main repos install them and build pkg if existing same version of pkg overwrittes it
+alias mkpi='makepkg -sfi' ##  same as above but this one also installs it
+alias mkall='makepkg -sf && makepkg --source -f ' ##create pkg and source pkg if existing same version of pkg overwrittes it
+alias mkalli='makepkg -sfi && makepkg --source -f ' ##same as above but this one also installs it
diff --git a/themes/cruznick.zsh-theme b/themes/cruznick.zsh-theme
index 9d558caf4..3d1ada91b 100644
--- a/themes/cruznick.zsh-theme
+++ b/themes/cruznick.zsh-theme
@@ -1,11 +1,11 @@
 
 prompt_char() {
-    git branch >/dev/null 2>/dev/null && echo "%F{cyan}±%f" && return
-    hg root >/dev/null 2>/dev/null && echo "%F{cyan}☿%f" && return
+    git branch >/dev/null 2>/dev/null && echo "%F{cyan}±%f" || return
+    hg root >/dev/null 2>/dev/null && echo "%F{cyan}☿%f" || return
 }
 custom_prompt_info() {
-    git branch >/dev/null 2>/dev/null && echo  "$(git_prompt_info)%F{green}--%f[$(git_prompt_status)]" && return
-    hg root >/dev/null 2>/dev/null && hg prompt "{ on {branch}}{ at {bookmark}}{status}" 2> /dev/null && return
+    git branch >/dev/null 2>/dev/null && echo  "$(git_prompt_info)%F{green}<->%f[$(git_prompt_status)]" || return
+    hg root >/dev/null 2>/dev/null && hg prompt "{ on {branch}}{ at {bookmark}}{status}" 2> /dev/null || return
    
 }
 command_succes() {
@@ -18,7 +18,7 @@ fi
 }
 
 PROMPT='┌[%F{green}%3c%f] $(custom_prompt_info) 
-%F{white}└%f %F{green}%#%f >> '
+└[%F{green}%#%f]>> '
 RPROMPT='$(command_succes) $(batt_prompt_perc)$(bat_prompt_acstt) $(prompt_char)'
 
 
@@ -34,3 +34,14 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%F{magenta}->%f"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%F{yellow}═%f"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan}?%f"
 
+ZSH_THEME_ACBAT_PROMPT_CHARGED="%F{green}°%"
+ZSH_THEME_ACBAT_PROMPT_CHARGING="%F{cyan}+%"
+ZSH_THEME_ACBAT_PROMPT_DISCHARGING="%F{yellow}-%"
+
+#ZSH_THEME_BATPERC_PROMPT_PREFIX="bat:"
+#ZSH_THEME_BATPERC_PROMPT_SUFFIX=" %%"
+ZSH_THEME_BATPERC_PROMPT_CLRLESS25PRC="red"
+ZSH_THEME_BATPERC_PROMPT_CLRMORE80PRC="cyan"
+ZSH_THEME_BATPERC_PROMPT_CLR40TO80PRC="green"
+ZSH_THEME_BATPERC_PROMPT_CLR25TO40PRC="yellow"
+