Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add settings for icons and colors #1

Merged
merged 1 commit into from
Sep 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 36 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,41 @@ POWERLINE_DETECT_SSH="true"

Also you can change the icons of GIT info, default values are:
```
POWERLINE_GIT_CLEAN="✔"
POWERLINE_GIT_DIRTY="✘"
POWERLINE_GIT_ADDED="%F{green}✚%F{black}"
POWERLINE_GIT_MODIFIED="%F{blue}✹%F{black}"
POWERLINE_GIT_DELETED="%F{red}✖%F{black}"
POWERLINE_GIT_UNTRACKED="%F{yellow}✭%F{black}"
POWERLINE_GIT_RENAMED="➜"
POWERLINE_GIT_UNMERGED="═"
POWERLINE_GIT_CLEAN_COLOR="$POWERLINE_GIT_COLOR_FRONT"
POWERLINE_GIT_CLEAN_ICON="✔"
POWERLINE_GIT_DIRTY_COLOR="$POWERLINE_GIT_COLOR_FRONT"
POWERLINE_GIT_DIRTY_ICON="✘"
POWERLINE_GIT_ADDED_COLOR="green"
POWERLINE_GIT_ADDED_ICON="✚"
POWERLINE_GIT_MODIFIED_COLOR="blue"
POWERLINE_GIT_MODIFIED_ICON="✹"
POWERLINE_GIT_DELETED_COLOR="red"
POWERLINE_GIT_DELETED_ICON="✖"
POWERLINE_GIT_UNTRACKED_COLOR="yellow"
POWERLINE_GIT_UNTRACKED_ICON="✭"
POWERLINE_GIT_RENAMED_COLOR="$POWERLINE_GIT_COLOR_FRONT"
POWERLINE_GIT_RENAMED_ICON="➜"
POWERLINE_GIT_UNMERGED_COLOR="$POWERLINE_GIT_COLOR_FRONT"
POWERLINE_GIT_UNMERGED_ICON="═"
POWERLINE_GIT_PROMPT_AHEAD_COLOR="$POWERLINE_GIT_COLOR_FRONT"
POWERLINE_GIT_PROMPT_AHEAD_ICON="⬆"
POWERLINE_GIT_PROMPT_BEHIND_COLOR="$POWERLINE_GIT_COLOR_FRONT"
POWERLINE_GIT_PROMPT_BEHIND_ICON="⬇"
POWERLINE_GIT_PROMPT_DIVERGED_COLOR="$POWERLINE_GIT_COLOR_FRONT"
POWERLINE_GIT_PROMPT_DIVERGED_ICON="⬍"
```

If you want more control over the symbols and colors, you can directly override the derived settings. The default values are below.
```
POWERLINE_GIT_CLEAN="%F{$POWERLINE_GIT_CLEAN_COLOR}$POWERLINE_GIT_CLEAN_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
POWERLINE_GIT_DIRTY="%F{$POWERLINE_GIT_DIRTY_COLOR}$POWERLINE_GIT_DIRTY_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
POWERLINE_GIT_ADDED="%F{$POWERLINE_GIT_ADDED_COLOR}$POWERLINE_GIT_ADDED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
POWERLINE_GIT_MODIFIED="%F{$POWERLINE_GIT_MODIFIED_COLOR}$POWERLINE_GIT_MODIFIED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
POWERLINE_GIT_DELETED="%F{$POWERLINE_GIT_DELETED_COLOR}$POWERLINE_GIT_DELETED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
POWERLINE_GIT_UNTRACKED="%F{$POWERLINE_GIT_UNTRACKED_COLOR}$POWERLINE_GIT_UNTRACKED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
POWERLINE_GIT_RENAMED="%F{$POWERLINE_GIT_RENAMED_COLOR}$POWERLINE_GIT_RENAMED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
POWERLINE_GIT_UNMERGED="%F{$POWERLINE_GIT_UNMERGED_COLOR}$POWERLINE_GIT_UNMERGED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"

```

Requirements
Expand Down Expand Up @@ -212,3 +239,4 @@ Contribute
* [mkraemer](https://github.com/mkraemer)
* [wujtruj](https://github.com/wujtruj)
* [Flavius Aspra](http://flavius.github.com/)
* [Ustice](https://github.com/Ustice)
158 changes: 123 additions & 35 deletions powerline.zsh-theme
Original file line number Diff line number Diff line change
Expand Up @@ -48,38 +48,6 @@ if [ "$POWERLINE_CUSTOM_CURRENT_PATH" != "" ]; then
POWERLINE_CURRENT_PATH="$POWERLINE_CUSTOM_CURRENT_PATH"
fi

if [ "$POWERLINE_GIT_CLEAN" = "" ]; then
POWERLINE_GIT_CLEAN="✔"
fi

if [ "$POWERLINE_GIT_DIRTY" = "" ]; then
POWERLINE_GIT_DIRTY="✘"
fi

if [ "$POWERLINE_GIT_ADDED" = "" ]; then
POWERLINE_GIT_ADDED="%F{green}✚%F{black}"
fi

if [ "$POWERLINE_GIT_MODIFIED" = "" ]; then
POWERLINE_GIT_MODIFIED="%F{blue}✹%F{black}"
fi

if [ "$POWERLINE_GIT_DELETED" = "" ]; then
POWERLINE_GIT_DELETED="%F{red}✖%F{black}"
fi

if [ "$POWERLINE_GIT_UNTRACKED" = "" ]; then
POWERLINE_GIT_UNTRACKED="%F{yellow}✭%F{black}"
fi

if [ "$POWERLINE_GIT_RENAMED" = "" ]; then
POWERLINE_GIT_RENAMED="➜"
fi

if [ "$POWERLINE_GIT_UNMERGED" = "" ]; then
POWERLINE_GIT_UNMERGED="═"
fi

if [ "$POWERLINE_RIGHT_A_COLOR_FRONT" = "" ]; then
POWERLINE_RIGHT_A_COLOR_FRONT="white"
fi
Expand Down Expand Up @@ -128,6 +96,126 @@ if [ "$POWERLINE_SEC1_ROOT_COLOR_BACK" = "" ]; then
POWERLINE_SEC1_ROOT_COLOR_BACK="red"
fi

if [ "$POWERLINE_GIT_CLEAN_ICON" = "" ]; then
POWERLINE_GIT_CLEAN_ICON="✔"
fi

if [ "$POWERLINE_GIT_CLEAN_COLOR" = "" ]; then
POWERLINE_GIT_CLEAN_COLOR="$POWERLINE_GIT_COLOR_FRONT"
fi

if [ "$POWERLINE_GIT_CLEAN" = "" ]; then
POWERLINE_GIT_CLEAN="%F{$POWERLINE_GIT_CLEAN_COLOR}$POWERLINE_GIT_CLEAN_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
fi

if [ "$POWERLINE_GIT_DIRTY_COLOR" = "" ]; then
POWERLINE_GIT_DIRTY_COLOR="$POWERLINE_GIT_COLOR_FRONT"
fi

if [ "$POWERLINE_GIT_DIRTY_ICON" = "" ]; then
POWERLINE_GIT_DIRTY_ICON="✘"
fi

if [ "$POWERLINE_GIT_DIRTY" = "" ]; then
POWERLINE_GIT_DIRTY="%F{$POWERLINE_GIT_DIRTY_COLOR}$POWERLINE_GIT_DIRTY_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
fi

if [ "$POWERLINE_GIT_ADDED_COLOR" = "" ]; then
POWERLINE_GIT_ADDED_COLOR="green"
fi

if [ "$POWERLINE_GIT_ADDED_ICON" = "" ]; then
POWERLINE_GIT_ADDED_ICON="✚"
fi

if [ "$POWERLINE_GIT_ADDED" = "" ]; then
POWERLINE_GIT_ADDED="%F{$POWERLINE_GIT_ADDED_COLOR}$POWERLINE_GIT_ADDED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
fi

if [ "$POWERLINE_GIT_MODIFIED_COLOR" = "" ]; then
POWERLINE_GIT_MODIFIED_COLOR="blue"
fi

if [ "$POWERLINE_GIT_MODIFIED_ICON" = "" ]; then
POWERLINE_GIT_MODIFIED_ICON="✹"
fi

if [ "$POWERLINE_GIT_MODIFIED" = "" ]; then
POWERLINE_GIT_MODIFIED="%F{$POWERLINE_GIT_MODIFIED_COLOR}$POWERLINE_GIT_MODIFIED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
fi

if [ "$POWERLINE_GIT_DELETED_COLOR" = "" ]; then
POWERLINE_GIT_DELETED_COLOR="red"
fi

if [ "$POWERLINE_GIT_DELETED_ICON" = "" ]; then
POWERLINE_GIT_DELETED_ICON="✖"
fi

if [ "$POWERLINE_GIT_DELETED" = "" ]; then
POWERLINE_GIT_DELETED="%F{$POWERLINE_GIT_DELETED_COLOR}$POWERLINE_GIT_DELETED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
fi

if [ "$POWERLINE_GIT_UNTRACKED_COLOR" = "" ]; then
POWERLINE_GIT_UNTRACKED_COLOR="yellow"
fi

if [ "$POWERLINE_GIT_UNTRACKED_ICON" = "" ]; then
POWERLINE_GIT_UNTRACKED_ICON="✭"
fi

if [ "$POWERLINE_GIT_UNTRACKED" = "" ]; then
POWERLINE_GIT_UNTRACKED="%F{$POWERLINE_GIT_UNTRACKED_COLOR}$POWERLINE_GIT_UNTRACKED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
fi

if [ "$POWERLINE_GIT_RENAMED_COLOR" = "" ]; then
POWERLINE_GIT_RENAMED_COLOR="$POWERLINE_GIT_COLOR_FRONT"
fi

if [ "$POWERLINE_GIT_RENAMED_ICON" = "" ]; then
POWERLINE_GIT_RENAMED_ICON="➜"
fi

if [ "$POWERLINE_GIT_RENAMED" = "" ]; then
POWERLINE_GIT_RENAMED="%F{$POWERLINE_GIT_RENAMED_COLOR}$POWERLINE_GIT_RENAMED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
fi

if [ "$POWERLINE_GIT_UNMERGED_COLOR" = "" ]; then
POWERLINE_GIT_UNMERGED_COLOR="$POWERLINE_GIT_COLOR_FRONT"
fi

if [ "$POWERLINE_GIT_UNMERGED_ICON" = "" ]; then
POWERLINE_GIT_UNMERGED_ICON="═"
fi

if [ "$POWERLINE_GIT_UNMERGED" = "" ]; then
POWERLINE_GIT_UNMERGED="%F{$POWERLINE_GIT_UNMERGED_COLOR}$POWERLINE_GIT_UNMERGED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
fi

if [ "$POWERLINE_GIT_PROMPT_AHEAD_COLOR" = "" ]; then
POWERLINE_GIT_PROMPT_AHEAD_COLOR="$POWERLINE_GIT_COLOR_FRONT"
fi

if [ "$POWERLINE_GIT_PROMPT_AHEAD" = "" ]; then
POWERLINE_GIT_PROMPT_AHEAD_ICON="⬆"
fi

if [ "$POWERLINE_GIT_PROMPT_BEHIND_COLOR" = "" ]; then
POWERLINE_GIT_PROMPT_BEHIND_COLOR="$POWERLINE_GIT_COLOR_FRONT"
fi

if [ "$POWERLINE_GIT_PROMPT_AHEAD" = "" ]; then
POWERLINE_GIT_PROMPT_BEHIND_ICON="⬇"
fi

if [ "$POWERLINE_GIT_PROMPT_DIVERGED_COLOR" = "" ]; then
POWERLINE_GIT_PROMPT_DIVERGED_COLOR="$POWERLINE_GIT_COLOR_FRONT"
fi

if [ "$POWERLINE_GIT_PROMPT_DIVERGED" = "" ]; then
POWERLINE_GIT_PROMPT_DIVERGED_ICON="⬍"
fi

ZSH_THEME_GIT_PROMPT_PREFIX=" \ue0a0 "
ZSH_THEME_GIT_PROMPT_SUFFIX=""
ZSH_THEME_GIT_PROMPT_DIRTY=" $POWERLINE_GIT_DIRTY"
Expand All @@ -139,9 +227,9 @@ ZSH_THEME_GIT_PROMPT_DELETED=" $POWERLINE_GIT_DELETED"
ZSH_THEME_GIT_PROMPT_UNTRACKED=" $POWERLINE_GIT_UNTRACKED"
ZSH_THEME_GIT_PROMPT_RENAMED=" $POWERLINE_GIT_RENAMED"
ZSH_THEME_GIT_PROMPT_UNMERGED=" $POWERLINE_GIT_UNMERGED"
ZSH_THEME_GIT_PROMPT_AHEAD=" "
ZSH_THEME_GIT_PROMPT_BEHIND=" "
ZSH_THEME_GIT_PROMPT_DIVERGED=" "
ZSH_THEME_GIT_PROMPT_AHEAD=" %F{$POWERLINE_GIT_PROMPT_AHEAD_COLOR}$POWERLINE_GIT_PROMPT_AHEAD_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
ZSH_THEME_GIT_PROMPT_BEHIND=" %F{$POWERLINE_GIT_PROMPT_BEHIND_COLOR}$POWERLINE_GIT_PROMPT_BEHIND_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"
ZSH_THEME_GIT_PROMPT_DIVERGED=" %F{$POWERLINE_GIT_PROMPT_DIVERGED_COLOR}$POWERLINE_GIT_PROMPT_DIVERGED_ICON%F{$POWERLINE_GIT_COLOR_FRONT}"

# if [ "$(git_prompt_info)" = "" ]; then
# POWERLINE_GIT_INFO_LEFT=""
Expand Down