Merge 3dfd8c4efe into d05b2010ff

plugins/battery/battery.plugin.zsh

@@ -12,6 +12,21 @@ if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
     fi
     echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
   }
+elif [[ -e /usr/bin/pmset ]] ; then
+  function battery_pct_remaining() { echo "$(pmset -g ps | tr -cd '[:digit:][:blank:]:' | awk '{print $2}')"}
+  function battery_time_remaining() { echo "$(pmset -g ps | tr -cd '[:digit:][:blank:]:' | awk '{print $3}')"}
+  function battery_pct_prompt() {
+    b=$(battery_pct_remaining)
+    display=""
+    if [[ $1 == steps ]] ; then
+      fuel=$(( $b / 12.5 ))
+      echo ${(r:$fuel::▁▂▃▄▅▆▇█:)}
+    else ;
+      fuel=$(( $b / 10 ))
+      remainder=$(( 10 - $fuel ))
+      echo ${(r:$fuel::▶:)}${(l:$remainder::▷:)}
+    fi
+  }
 else
   error_msg='no battery'
   function battery_pct_remaining() { echo $error_msg }

themes/north.zsh-theme

@@ -0,0 +1,72 @@
+autoload -U promptinit
+promptinit
+autoload -U colors; colors
+
+case $USER in
+    'root')
+    export PS1="$PS1_NAME$PS1_TIME$PS1_PATH# "
+    local user_prompt="%B$fg[red]%b%% "
+    ;;
+
+    *)
+    local user_prompt="%B$fg[magenta]%b%% "
+    ;;
+esac
+
+local HOST_STRING="$fg[green]`hostname`"
+local blue_ob="%{%B$fg[blue]%}[%{$reset_color%}%b"
+local blue_cb="%{%B$fg[blue]%}]%{$reset_color%}%b"
+local blue_op="%{%B$fg[blue]%}(%{$reset_color%}%b"
+local blue_cp="%{%B$fg[blue]%})%{$reset_color%}%b"
+local path_p="${blue_ob}$fg[red]%~${blue_cb}"
+local user_host="${blue_ob}${HOST_STRING}$fg[magenta]@$fg[green]%m${blue_cb}"
+local ret_status="${blue_ob}$fg[yellow]ret:%?${blue_cb}"
+local hist_no="${blue_ob}$fg[yellow]hist:%h${blue_cb}"
+local panic="${blue_ob}%(?,%{$fg[green]%}%BDON'T PANIC%b%{$reset_color%},%{$fg[red]%}>> PANIC <<%{$reset_color%})${blue_cb}"
+local smiley="%(?,%{$fg[green]%}:%)%{$reset_color%},%{$fg[red]%}:(%{$reset_color%})"
+
+
+function collapse_pwd {
+    echo $(pwd | sed -e "s,^$HOME,~,")
+}
+
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo "${fg[red]}git ∓∓∓${reset_color}" && return
+    # hg root >/dev/null 2>/dev/null && echo "${fg[red]}hg ☿${reset_color}" && return
+    # svn info >/dev/null 2>/dev/null && echo "${fg[red]}svn s${reset_color}" && return
+    echo "${fg[blue]}○${reset_color}"
+}
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo "${blue_op}$fg[magenta]"`basename $VIRTUAL_ENV`"$fg[reset]${blue_cp}─"
+}
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+function hg_prompt_info() {
+    hg prompt --angle-brackets "\
+< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
+< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
+%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<
+patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
+}
+
+# get the name of the branch we are on
+function git_prompt_info2() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  branch=${ref#refs/heads/}
+  sha=$(git rev-parse --short ${branch})
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${branch}%{$fg[green]%}@%{$fg[magenta]%}${sha}$ZSH_THEME_GIT_PROMPT_SUFFIX$(parse_git_dirty)"
+}
+
+PROMPT='╭─$(virtualenv_info)$(prompt_char)$(git_prompt_info2)─${user_host}─${path_p}─${panic}-${ret_status}─${hist_no}
+╰─${blue_ob}${smiley}${blue_cb}${user_color}─> ⚡ '
+PROMPT2='${blue_ob}$_${blue_cb}> '
+
+# righthand side
+RPROMPT='$(battery_pct_prompt)'
+