From 447193d859a74ff2cc7b3ec2e76517346afa4269 Mon Sep 17 00:00:00 2001 From: Jack Spirou Date: Sun, 14 Dec 2014 18:29:46 -0600 Subject: [PATCH 1/4] Modified battery gauge to allow custom chars and added simple Jarvis theme --- plugins/battery/battery.plugin.zsh | 13 ++++-- themes/jarvis.zsh-theme | 70 ++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 themes/jarvis.zsh-theme diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index 014bb15dd..5a170dd76 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -7,6 +7,10 @@ # Email: neuralsandwich@gmail.com # # Modified to add support for Apple Mac # ########################################### +# Author: Jack Spirou (JackSpirou) # +# Email: jack.spirou@me.com # +# Modified battery gauge for custom chars # +########################################### if [[ "$OSTYPE" = darwin* ]] ; then @@ -91,7 +95,7 @@ elif [[ $(uname) == "Linux" ]] ; then } function battery_pct_prompt() { - b=$(battery_pct_remaining) + b=$(battery_pct_remaining) if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then if [ $b -gt 50 ] ; then color='green' @@ -135,6 +139,11 @@ function battery_level_gauge() { local battery_remaining_percentage=$(battery_pct); + if [[ $1 ]] && [[ $2 ]]; then + filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-$1}; + empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-$2}; + fi + if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then local filled=$(((( $battery_remaining_percentage + $gauge_slots - 1) / $gauge_slots))); local empty=$(($gauge_slots - $filled)); @@ -156,5 +165,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/jarvis.zsh-theme b/themes/jarvis.zsh-theme new file mode 100644 index 000000000..d1394537b --- /dev/null +++ b/themes/jarvis.zsh-theme @@ -0,0 +1,70 @@ +########################################### +# Jarvis oh-my-zsh theme # +# Original Author: Jack Spirou # +# Email: jack.spirou@me.com # +########################################### + +#### SOURCES #### +# shortcut color code +# https://github.com/ethervoid/dotfiles/blob/master/zsh/jarvis.zsh-theme~ +# +# original idea code +# https://github.com/andrew8088/oh-my-zsh/blob/master/themes/doubleend.zsh-theme + +# Color shortcuts +RED=$fg[red] +YELLOW=$fg[yellow] +GREEN=$fg[green] +WHITE=$fg[white] +BLUE=$fg[blue] +CYAN=$fg[cyan] +RED_BOLD=$fg_bold[red] +YELLOW_BOLD=$fg_bold[yellow] +GREEN_BOLD=$fg_bold[green] +WHITE_BOLD=$fg_bold[white] +BLUE_BOLD=$fg_bold[blue] +RESET_COLOR=$reset_color + +# Format for git_prompt_info() +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" + +# Format for parse_git_dirty() +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GREEN%}" + +# Format for git_prompt_status() +ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged" +ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted" +ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed" +ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified" +ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added" +ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked" + +# Format for git_prompt_ahead() +ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)" + +# Format for git_prompt_long_sha() and git_prompt_short_sha() +ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}" +ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]" + +# Define git info +function git_prompt_info() { + ref=$(git symbolic-ref HEAD 2> /dev/null) || return + echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" +} + +# Define get pwd +function get_pwd() { + print -D $PWD +} + +# Define pre command text. Note: The format below is intended +function precmd() { +print -rP ' +$CYAN%m: $YELLOW$(get_pwd)' +} + +# Define prompt vars +PROMPT='%{$reset_color%}→ ' +RPROMPT='${return_status}$(git_prompt_info) $(battery_level_gauge ■ □)%{$reset_color%}' From ff705eede6a592e2f47dca5b02d7cc40e71e13d0 Mon Sep 17 00:00:00 2001 From: JackSpirou Date: Sun, 14 Dec 2014 22:36:42 -0600 Subject: [PATCH 2/4] fixing spacing issue with power symbol --- plugins/battery/battery.plugin.zsh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index 5a170dd76..228bba511 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -7,10 +7,6 @@ # Email: neuralsandwich@gmail.com # # Modified to add support for Apple Mac # ########################################### -# Author: Jack Spirou (JackSpirou) # -# Email: jack.spirou@me.com # -# Modified battery gauge for custom chars # -########################################### if [[ "$OSTYPE" = darwin* ]] ; then @@ -158,7 +154,7 @@ function battery_level_gauge() { filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'}; fi - local charging=' ' && battery_is_charging && charging=$charging_symbol; + local charging=' ' && battery_is_charging && charging=$charging_symbol' '; printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%} printf ${filled_symbol//\%/\%\%}'%.0s' {1..$filled} From 6d7e6c4171fba4a92f0b966be2d157d825d482ee Mon Sep 17 00:00:00 2001 From: JackSpirou Date: Sun, 14 Dec 2014 22:48:14 -0600 Subject: [PATCH 3/4] removing theme per project readme --- themes/jarvis.zsh-theme | 70 ----------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 themes/jarvis.zsh-theme diff --git a/themes/jarvis.zsh-theme b/themes/jarvis.zsh-theme deleted file mode 100644 index d1394537b..000000000 --- a/themes/jarvis.zsh-theme +++ /dev/null @@ -1,70 +0,0 @@ -########################################### -# Jarvis oh-my-zsh theme # -# Original Author: Jack Spirou # -# Email: jack.spirou@me.com # -########################################### - -#### SOURCES #### -# shortcut color code -# https://github.com/ethervoid/dotfiles/blob/master/zsh/jarvis.zsh-theme~ -# -# original idea code -# https://github.com/andrew8088/oh-my-zsh/blob/master/themes/doubleend.zsh-theme - -# Color shortcuts -RED=$fg[red] -YELLOW=$fg[yellow] -GREEN=$fg[green] -WHITE=$fg[white] -BLUE=$fg[blue] -CYAN=$fg[cyan] -RED_BOLD=$fg_bold[red] -YELLOW_BOLD=$fg_bold[yellow] -GREEN_BOLD=$fg_bold[green] -WHITE_BOLD=$fg_bold[white] -BLUE_BOLD=$fg_bold[blue] -RESET_COLOR=$reset_color - -# Format for git_prompt_info() -ZSH_THEME_GIT_PROMPT_PREFIX="" -ZSH_THEME_GIT_PROMPT_SUFFIX="" - -# Format for parse_git_dirty() -ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}" -ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GREEN%}" - -# Format for git_prompt_status() -ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged" -ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted" -ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed" -ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified" -ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added" -ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked" - -# Format for git_prompt_ahead() -ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)" - -# Format for git_prompt_long_sha() and git_prompt_short_sha() -ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}" -ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]" - -# Define git info -function git_prompt_info() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || return - echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" -} - -# Define get pwd -function get_pwd() { - print -D $PWD -} - -# Define pre command text. Note: The format below is intended -function precmd() { -print -rP ' -$CYAN%m: $YELLOW$(get_pwd)' -} - -# Define prompt vars -PROMPT='%{$reset_color%}→ ' -RPROMPT='${return_status}$(git_prompt_info) $(battery_level_gauge ■ □)%{$reset_color%}' From 11188fc279efa34f043da2c29149b54c75920302 Mon Sep 17 00:00:00 2001 From: JackSpirou Date: Thu, 18 Dec 2014 17:22:13 -0600 Subject: [PATCH 4/4] syntax change for zsh version compatibility --- plugins/battery/battery.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh index 228bba511..1358d7ceb 100644 --- a/plugins/battery/battery.plugin.zsh +++ b/plugins/battery/battery.plugin.zsh @@ -135,7 +135,7 @@ function battery_level_gauge() { local battery_remaining_percentage=$(battery_pct); - if [[ $1 ]] && [[ $2 ]]; then + if [ "$1" ] && [ "$2" ]; then filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-$1}; empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-$2}; fi