From b64c228da512350701af84f123241c46b694a00b Mon Sep 17 00:00:00 2001 From: Robert R Evans Date: Thu, 7 Oct 2010 17:15:14 -0700 Subject: [PATCH] Updates --- themes/bobby/bobby.theme.bash | 31 ++++---- themes/colors.theme.bash | 144 +++++++++++++++++----------------- 2 files changed, 89 insertions(+), 86 deletions(-) diff --git a/themes/bobby/bobby.theme.bash b/themes/bobby/bobby.theme.bash index bea85ef..1ead483 100644 --- a/themes/bobby/bobby.theme.bash +++ b/themes/bobby/bobby.theme.bash @@ -1,6 +1,20 @@ #!/bin/bash -# prompt themeing + +PROMPT="${bold_blue}\[\$(prompt_char)\]\[\$(git_prompt_info)\] ${orange}\h ${reset_color}in ${green}\w ${reset_color}\[→ " + + +# git theming +GIT_THEME_PROMPT_DIRTY=" ${red}✗" +GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓" +GIT_THEME_PROMPT_PREFIX=" ${green}|" +GIT_THEME_PROMPT_SUFFIX="${green}|" + +# GIT_THEME_PROMPT_DIRTY=" ✗" +# GIT_THEME_PROMPT_CLEAN=" ✓" +# GIT_THEME_PROMPT_PREFIX=" |" +# GIT_THEME_PROMPT_SUFFIX="|" + #added TITLEBAR for updating the tab and window titles with the pwd case $TERM in @@ -10,17 +24,4 @@ case $TERM in *) TITLEBAR="" ;; -esac -PROMPT="${TITLEBAR}${bold_blue}\$(prompt_char)\$(git_prompt_info) ${orange}\h ${reset_color}in ${green}\w ${reset_color}→ " - - -# git themeing -# GIT_THEME_PROMPT_DIRTY=" ${red}✗" -# GIT_THEME_PROMPT_CLEAN=" ${bold_green}✓" -# GIT_THEME_PROMPT_PREFIX=" ${green}|" -# GIT_THEME_PROMPT_SUFFIX="${green}|" - -GIT_THEME_PROMPT_DIRTY=" ✗" -GIT_THEME_PROMPT_CLEAN=" ✓" -GIT_THEME_PROMPT_PREFIX=" |" -GIT_THEME_PROMPT_SUFFIX="|" +esac \ No newline at end of file diff --git a/themes/colors.theme.bash b/themes/colors.theme.bash index 1211f4b..ae8f616 100644 --- a/themes/colors.theme.bash +++ b/themes/colors.theme.bash @@ -1,79 +1,81 @@ #!/bin/bash -# green=$'\e[0;32m' -# red=$'\e[0;31m' -# blue=$'\e[0;34m' -# white=$'\e[1;37m' -# black=$'\e[0;30m' -# yellow=$'\e[0;33m' -# purple=$'\e[0;35m' -# cyan=$'\e[0;36m' -# orange=$'\e[33;40m' -# -# -# bold_green=$'\e[1;32m' -# bold_red=$'\e[1;31m' -# bold_blue=$'\e[1;34m' -# bold_yellow=$'\e[1;33m' -# bold_purple=$'\e[1;35m' -# bold_cyan=$'\e[1;36m' -# bold_orange=$'\e[1;33;40m' -# -# normal=$'\e[00m' -# reset_color=$'\e[39m' - +green=$'\e[0;32m' +red=$'\e[0;31m' +blue=$'\e[0;34m' +white=$'\e[1;37m' +black=$'\e[0;30m' +yellow=$'\e[0;33m' +purple=$'\e[0;35m' +cyan=$'\e[0;36m' +orange=$'\e[33;40m' -ESC="\033" -NON_BOLD=0 -BOLD=1 +bold_green=$'\e[1;32m' +bold_red=$'\e[1;31m' +bold_blue=$'\e[1;34m' +bold_yellow=$'\e[1;33m' +bold_purple=$'\e[1;35m' +bold_cyan=$'\e[1;36m' +bold_orange=$'\e[1;33;40m' -# Foreground -FG_BLACK=30 -FG_RED=31 -FG_GREEN=32 -FG_YELLOW=33 -FG_BLUE=34 -FG_VIOLET=35 -FG_CYAN=36 -FG_WHITE=37 -FG_ORANGE='33;40' -FG_NULL=00 +normal=$'\e[00m' +reset_color=$'\e[39m' -# Background -BG_BLACK=40 -BG_RED=41 -BG_GREEN=42 -BG_YELLOW=43 -BG_BLUE=44 -BG_VIOLET=45 -BG_CYAN=46 -BG_WHITE=47 -BG_NULL=00 -normal="\[$ESC[m\]" -reset_color="\[$ESC[${NON_BOLD};${FG_WHITE};${BG_NULL}m\]" - -# Non-bold -black="\[$ESC[${NON_BOLD};${FG_BLACK}m\]" -red="\[$ESC[${NON_BOLD};${FG_RED}m\]" -green="\[$ESC[${NON_BOLD};${FG_GREEN}m\]" -yellow="\[$ESC[${NON_BOLD};${FG_YELLOW}m\]" -blue="\[$ESC[${NON_BOLD};${FG_BLUE}m\]" -purple="\[$ESC[${NON_BOLD};${FG_VIOLET}m\]" -cyan="\[$ESC[${NON_BOLD};${FG_CYAN}m\]" -white="\[$ESC[${NON_BOLD};${FG_WHITE}m\]" -orange="\[$ESC[${NON_BOLD};${FG_ORANGE}m\]" - - -# Bold -bold_black="\[$ESC[${BOLD};${FG_BLACK}m\]" -bold_red="\[$ESC[${BOLD};${FG_RED}m\]" -bold_green="\[$ESC[${BOLD};${FG_GREEN}m\]" -bold_yellow="\[$ESC[${BOLD};${FG_YELLOW}m\]" -bold_blue="\[$ESC[${BOLD};${FG_BLUE}m\]" -bold_purple="\[$ESC[${BOLD};${FG_VIOLET}m\]" -bold_cyan="\[$ESC[${BOLD};${FG_CYAN}m\]" -bold_white="\[$ESC[${BOLD};${FG_WHITE}m\]" -bold_orange="\[$ESC[${BOLD};${FG_ORANGE}m\]" \ No newline at end of file +# ESC="\033" +# NON_BOLD=0 +# BOLD=1 +# +# # Foreground +# FG_BLACK=30 +# FG_RED=31 +# FG_GREEN=32 +# FG_YELLOW=33 +# FG_BLUE=34 +# FG_VIOLET=35 +# FG_CYAN=36 +# FG_WHITE=37 +# FG_ORANGE='33;40' +# FG_NULL=00 +# +# # Background +# BG_BLACK=40 +# BG_RED=41 +# BG_GREEN=42 +# BG_YELLOW=43 +# BG_BLUE=44 +# BG_VIOLET=45 +# BG_CYAN=46 +# BG_WHITE=47 +# BG_NULL=00 +# +# +# normal="\[$ESC[m\]" +# reset_color="\[$ESC[${NON_BOLD};${FG_WHITE};${BG_NULL}m\]" +# +# +# +# # Non-bold +# black="\[$ESC[${NON_BOLD};${FG_BLACK}m\]" +# red="\[$ESC[${NON_BOLD};${FG_RED}m\]" +# green="\[$ESC[${NON_BOLD};${FG_GREEN}m\]" +# yellow="\[$ESC[${NON_BOLD};${FG_YELLOW}m\]" +# blue="\[$ESC[${NON_BOLD};${FG_BLUE}m\]" +# purple="\[$ESC[${NON_BOLD};${FG_VIOLET}m\]" +# cyan="\[$ESC[${NON_BOLD};${FG_CYAN}m\]" +# white="\[$ESC[${NON_BOLD};${FG_WHITE}m\]" +# orange="\[$ESC[${NON_BOLD};${FG_ORANGE}m\]" +# +# +# # Bold +# bold_black="\[$ESC[${BOLD};${FG_BLACK}m\]" +# bold_red="\[$ESC[${BOLD};${FG_RED}m\]" +# bold_green="\[$ESC[${BOLD};${FG_GREEN}m\]" +# bold_yellow="\[$ESC[${BOLD};${FG_YELLOW}m\]" +# bold_blue="\[$ESC[${BOLD};${FG_BLUE}m\]" +# bold_purple="\[$ESC[${BOLD};${FG_VIOLET}m\]" +# bold_cyan="\[$ESC[${BOLD};${FG_CYAN}m\]" +# bold_white="\[$ESC[${BOLD};${FG_WHITE}m\]" +# bold_orange="\[$ESC[${BOLD};${FG_ORANGE}m\]" \ No newline at end of file -- 2.17.1