From 528a9ad8f74154e2539e2a20953745b0639d075f Mon Sep 17 00:00:00 2001 From: "Helmut K. C. Tessarek" Date: Mon, 6 Jun 2016 19:49:07 -0400 Subject: [PATCH 1/6] add a new theme 'Evermeet' --- themes/Evermeet.bgptheme | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 themes/Evermeet.bgptheme diff --git a/themes/Evermeet.bgptheme b/themes/Evermeet.bgptheme new file mode 100644 index 00000000..9faf3f2e --- /dev/null +++ b/themes/Evermeet.bgptheme @@ -0,0 +1,30 @@ +# This theme for gitprompt.sh is designed for dark color schemes +# It is most suitable for Retina or high resolution displays + +override_git_prompt_colors() { + GIT_PROMPT_THEME_NAME="Evermeet" + + GIT_PROMPT_PREFIX="" # start of the git info string + GIT_PROMPT_SUFFIX="" # the end of the git info string + GIT_PROMPT_SEPARATOR="|" # separates each item + + GIT_PROMPT_BRANCH="${Magenta}" # the git branch that is active in the current directory + GIT_PROMPT_STAGED="${Cyan}●" # the number of staged files/directories + GIT_PROMPT_CONFLICTS="${BoldRed}✖" # the number of files in conflict + GIT_PROMPT_CHANGED="${Cyan}✚" # the number of changed files + + GIT_PROMPT_UNTRACKED="${Cyan}…" # the number of untracked files/dirs + GIT_PROMPT_STASHED="${Magenta}⚑" # the number of stashed files/dir + GIT_PROMPT_CLEAN="${BoldGreen}✔" # a colored flag indicating a "clean" repo + + GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}" + + GIT_PROMPT_START_USER="[\[\e[1;32m\]\u\[\e[0m\]\[\e[1;32m\]@\[\e[0m\]\[\e[1;32m\]\h\[\e[0m\] \[\e[1;33m\]\${?}\[\e[0m\] \[\e[1;34m\]\w\[\e[0m\]" + GIT_PROMPT_START_ROOT="[\[\e[1;31m\]\u\[\e[0m\]\[\e[1;31m\]@\[\e[0m\]\[\e[1;31m\]\h\[\e[0m\] \[\e[1;33m\]\${?}\[\e[0m\] \[\e[1;34m\]\w\[\e[0m\]" + GIT_PROMPT_END_USER="]$ " + GIT_PROMPT_END_ROOT="]# " + + GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING="⭑" # This symbol is written after the branch, if the branch is not tracked +} + +reload_git_prompt_colors "Evermeet" From bd2bd96135c658d484fa878aa8721987a491aa7c Mon Sep 17 00:00:00 2001 From: "Helmut K. C. Tessarek" Date: Mon, 6 Jun 2016 19:50:09 -0400 Subject: [PATCH 2/6] make a few changes for low resolution displays (unicode characters may overlap with the following character) --- themes/Evermeet_lowres_screens.bgptheme | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 themes/Evermeet_lowres_screens.bgptheme diff --git a/themes/Evermeet_lowres_screens.bgptheme b/themes/Evermeet_lowres_screens.bgptheme new file mode 100644 index 00000000..3efda9b2 --- /dev/null +++ b/themes/Evermeet_lowres_screens.bgptheme @@ -0,0 +1,31 @@ +# This theme for gitprompt.sh is designed for dark color schemes +# On lowres screens unicode characters like ✖ require a space after them +# otherwise the following character may overlap with the unicode character + +override_git_prompt_colors() { + GIT_PROMPT_THEME_NAME="Evermeet_lowres_screens" + + GIT_PROMPT_PREFIX="" # start of the git info string + GIT_PROMPT_SUFFIX="" # the end of the git info string + GIT_PROMPT_SEPARATOR="|" # separates each item + + GIT_PROMPT_BRANCH="${Magenta}" # the git branch that is active in the current directory + GIT_PROMPT_STAGED="${Cyan}●" # the number of staged files/directories + GIT_PROMPT_CONFLICTS="${BoldRed}✖ " # the number of files in conflict + GIT_PROMPT_CHANGED="${Cyan}✚ " # the number of changed files + + GIT_PROMPT_UNTRACKED="${Cyan}…" # the number of untracked files/dirs + GIT_PROMPT_STASHED="${Magenta}⚑" # the number of stashed files/dir + GIT_PROMPT_CLEAN="${BoldGreen}✔" # a colored flag indicating a "clean" repo + + GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}" + + GIT_PROMPT_START_USER="[\[\e[1;32m\]\u\[\e[0m\]\[\e[1;32m\]@\[\e[0m\]\[\e[1;32m\]\h\[\e[0m\] \[\e[1;33m\]\${?}\[\e[0m\] \[\e[1;34m\]\w\[\e[0m\]" + GIT_PROMPT_START_ROOT="[\[\e[1;31m\]\u\[\e[0m\]\[\e[1;31m\]@\[\e[0m\]\[\e[1;31m\]\h\[\e[0m\] \[\e[1;33m\]\${?}\[\e[0m\] \[\e[1;34m\]\w\[\e[0m\]" + GIT_PROMPT_END_USER="]$ " + GIT_PROMPT_END_ROOT="]# " + + GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING="⭑ " # This symbol is written after the branch, if the branch is not tracked +} + +reload_git_prompt_colors "Evermeet_lowres_screens" From 9d7cbb7870052256fd0543228a2d61dc0197fca7 Mon Sep 17 00:00:00 2001 From: "Helmut K. C. Tessarek" Date: Tue, 7 Jun 2016 18:44:24 -0400 Subject: [PATCH 3/6] replace escape sequences with color names --- themes/Evermeet.bgptheme | 4 ++-- themes/Evermeet_lowres_screens.bgptheme | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/Evermeet.bgptheme b/themes/Evermeet.bgptheme index 9faf3f2e..56c2f419 100644 --- a/themes/Evermeet.bgptheme +++ b/themes/Evermeet.bgptheme @@ -19,8 +19,8 @@ override_git_prompt_colors() { GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}" - GIT_PROMPT_START_USER="[\[\e[1;32m\]\u\[\e[0m\]\[\e[1;32m\]@\[\e[0m\]\[\e[1;32m\]\h\[\e[0m\] \[\e[1;33m\]\${?}\[\e[0m\] \[\e[1;34m\]\w\[\e[0m\]" - GIT_PROMPT_START_ROOT="[\[\e[1;31m\]\u\[\e[0m\]\[\e[1;31m\]@\[\e[0m\]\[\e[1;31m\]\h\[\e[0m\] \[\e[1;33m\]\${?}\[\e[0m\] \[\e[1;34m\]\w\[\e[0m\]" + GIT_PROMPT_START_USER="[${BoldGreen}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}" + GIT_PROMPT_START_ROOT="[${BoldRed}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}" GIT_PROMPT_END_USER="]$ " GIT_PROMPT_END_ROOT="]# " diff --git a/themes/Evermeet_lowres_screens.bgptheme b/themes/Evermeet_lowres_screens.bgptheme index 3efda9b2..f6c1ea2b 100644 --- a/themes/Evermeet_lowres_screens.bgptheme +++ b/themes/Evermeet_lowres_screens.bgptheme @@ -20,8 +20,8 @@ override_git_prompt_colors() { GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}" - GIT_PROMPT_START_USER="[\[\e[1;32m\]\u\[\e[0m\]\[\e[1;32m\]@\[\e[0m\]\[\e[1;32m\]\h\[\e[0m\] \[\e[1;33m\]\${?}\[\e[0m\] \[\e[1;34m\]\w\[\e[0m\]" - GIT_PROMPT_START_ROOT="[\[\e[1;31m\]\u\[\e[0m\]\[\e[1;31m\]@\[\e[0m\]\[\e[1;31m\]\h\[\e[0m\] \[\e[1;33m\]\${?}\[\e[0m\] \[\e[1;34m\]\w\[\e[0m\]" + GIT_PROMPT_START_USER="[${BoldGreen}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}" + GIT_PROMPT_START_ROOT="[${BoldRed}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}" GIT_PROMPT_END_USER="]$ " GIT_PROMPT_END_ROOT="]# " From c1310f41bc62dc9af82d2dba5b1c1c18abe762d5 Mon Sep 17 00:00:00 2001 From: "Helmut K. C. Tessarek" Date: Tue, 7 Jun 2016 18:47:03 -0400 Subject: [PATCH 4/6] renamed: Evermeet_lowres_screens.bgptheme -> Evermeet_Ubuntu.bgptheme --- ...rmeet_lowres_screens.bgptheme => Evermeet_Ubuntu.bgptheme} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename themes/{Evermeet_lowres_screens.bgptheme => Evermeet_Ubuntu.bgptheme} (93%) diff --git a/themes/Evermeet_lowres_screens.bgptheme b/themes/Evermeet_Ubuntu.bgptheme similarity index 93% rename from themes/Evermeet_lowres_screens.bgptheme rename to themes/Evermeet_Ubuntu.bgptheme index f6c1ea2b..3b0cc411 100644 --- a/themes/Evermeet_lowres_screens.bgptheme +++ b/themes/Evermeet_Ubuntu.bgptheme @@ -3,7 +3,7 @@ # otherwise the following character may overlap with the unicode character override_git_prompt_colors() { - GIT_PROMPT_THEME_NAME="Evermeet_lowres_screens" + GIT_PROMPT_THEME_NAME="Evermeet_Ubuntu" GIT_PROMPT_PREFIX="" # start of the git info string GIT_PROMPT_SUFFIX="" # the end of the git info string @@ -28,4 +28,4 @@ override_git_prompt_colors() { GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING="⭑ " # This symbol is written after the branch, if the branch is not tracked } -reload_git_prompt_colors "Evermeet_lowres_screens" +reload_git_prompt_colors "Evermeet_Ubuntu" From 2da8770cb16800c8792982efaa6d1e2fb3b10e69 Mon Sep 17 00:00:00 2001 From: "Helmut K. C. Tessarek" Date: Wed, 8 Jun 2016 10:53:36 -0400 Subject: [PATCH 5/6] add trailing spaces to 3 more symbols --- themes/Evermeet_Ubuntu.bgptheme | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/themes/Evermeet_Ubuntu.bgptheme b/themes/Evermeet_Ubuntu.bgptheme index 3b0cc411..14077b9e 100644 --- a/themes/Evermeet_Ubuntu.bgptheme +++ b/themes/Evermeet_Ubuntu.bgptheme @@ -1,6 +1,7 @@ # This theme for gitprompt.sh is designed for dark color schemes # On lowres screens unicode characters like ✖ require a space after them # otherwise the following character may overlap with the unicode character +# tweaked for Ubuntu terminal fonts override_git_prompt_colors() { GIT_PROMPT_THEME_NAME="Evermeet_Ubuntu" @@ -10,13 +11,13 @@ override_git_prompt_colors() { GIT_PROMPT_SEPARATOR="|" # separates each item GIT_PROMPT_BRANCH="${Magenta}" # the git branch that is active in the current directory - GIT_PROMPT_STAGED="${Cyan}●" # the number of staged files/directories + GIT_PROMPT_STAGED="${Cyan}● " # the number of staged files/directories GIT_PROMPT_CONFLICTS="${BoldRed}✖ " # the number of files in conflict GIT_PROMPT_CHANGED="${Cyan}✚ " # the number of changed files GIT_PROMPT_UNTRACKED="${Cyan}…" # the number of untracked files/dirs - GIT_PROMPT_STASHED="${Magenta}⚑" # the number of stashed files/dir - GIT_PROMPT_CLEAN="${BoldGreen}✔" # a colored flag indicating a "clean" repo + GIT_PROMPT_STASHED="${Magenta}⚑ " # the number of stashed files/dir + GIT_PROMPT_CLEAN="${BoldGreen}✔ " # a colored flag indicating a "clean" repo GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}" From 720ac90861f77d601cc8c0963efb5a9f966a8c23 Mon Sep 17 00:00:00 2001 From: "Helmut K. C. Tessarek" Date: Wed, 8 Jun 2016 10:56:06 -0400 Subject: [PATCH 6/6] add a slightly modified theme for lowres and non-retina screens --- themes/Evermeet_Lowres.bgptheme | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 themes/Evermeet_Lowres.bgptheme diff --git a/themes/Evermeet_Lowres.bgptheme b/themes/Evermeet_Lowres.bgptheme new file mode 100644 index 00000000..421ed764 --- /dev/null +++ b/themes/Evermeet_Lowres.bgptheme @@ -0,0 +1,32 @@ +# This theme for gitprompt.sh is designed for dark color schemes +# On lowres screens unicode characters like ✖ require a space after them +# otherwise the following character may overlap with the unicode character +# tweaked for low resolution and non-retina screens + +override_git_prompt_colors() { + GIT_PROMPT_THEME_NAME="Evermeet_Lowres" + + GIT_PROMPT_PREFIX="" # start of the git info string + GIT_PROMPT_SUFFIX="" # the end of the git info string + GIT_PROMPT_SEPARATOR="|" # separates each item + + GIT_PROMPT_BRANCH="${Magenta}" # the git branch that is active in the current directory + GIT_PROMPT_STAGED="${Cyan}●" # the number of staged files/directories + GIT_PROMPT_CONFLICTS="${BoldRed}✖ " # the number of files in conflict + GIT_PROMPT_CHANGED="${Cyan}✚ " # the number of changed files + + GIT_PROMPT_UNTRACKED="${Cyan}…" # the number of untracked files/dirs + GIT_PROMPT_STASHED="${Magenta}⚑" # the number of stashed files/dir + GIT_PROMPT_CLEAN="${BoldGreen}✔" # a colored flag indicating a "clean" repo + + GIT_PROMPT_UPSTREAM=" {${Magenta}_UPSTREAM_${ResetColor}}" + + GIT_PROMPT_START_USER="[${BoldGreen}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}" + GIT_PROMPT_START_ROOT="[${BoldRed}\u@\h${ResetColor} ${BoldYellow}\${?}${ResetColor} ${BoldBlue}\w${ResetColor}" + GIT_PROMPT_END_USER="]$ " + GIT_PROMPT_END_ROOT="]# " + + GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING="⭑ " # This symbol is written after the branch, if the branch is not tracked +} + +reload_git_prompt_colors "Evermeet_Lowres"