.bash_prompt: change color definitions back to standard

diff --git a/.bash_prompt b/.bash_prompt
index 9800455f3776a9109b189a29c9312827a8e8e596..1d4f24535cddfce7d5297b73ca309a4728e0ecad 100644 (file)
--- a/.bash_prompt
+++ b/.bash_prompt
@@ -3,15 +3,6 @@
 # bash_prompt; adapted from
 # https://github.com/necolas/dotfiles/blob/master/shell/bash_prompt
 
-# Example:
-# nicolas@host: ~/.dotfiles on master [+!?$]
-# $
-
-# Screenshot: http://i.imgur.com/DSJ1G.png
-# iTerm2 prefs: import Solarized theme (disable bright colors for bold text)
-# Color ref: http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim
-# More tips: http://www.cyberciti.biz/tips/howto-linux-unix-bash-shell-setup-prompt.html
-
 prompt_git() {
     local s=""
     local branchName=""
@@ -87,8 +78,11 @@ set_prompts() {
     local dim_white=""
     local dim_yellow=""
 
+    local charStyle=""
+    local gitStyle=""
     local hostStyle=""
     local userStyle=""
+    local wdirStyle=""
 
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
         tput sgr0 # reset colors
@@ -97,17 +91,15 @@ set_prompts() {
         dim=$(tput dim)
         reset=$(tput sgr0)
 
-        # Solarized colors
-        # (https://github.com/altercation/solarized/tree/master/iterm2-colors-solarized#the-values)
         black=$(tput setaf 0)
-        blue=$(tput setaf 33)
-        cyan=$(tput setaf 37)
-        green=$(tput setaf 64)
-        orange=$(tput setaf 166)
-        red=$(tput setaf 124)
-        white=$(tput setaf 15)
-        yellow=$(tput setaf 136)
+        blue=$(tput setaf 4)
+        cyan=$(tput setaf 6)
+        green=$(tput setaf 2)
+        orange=$(tput setaf 3)
         magenta=$(tput setaf 5)
+        red=$(tput setaf 1)
+        white=$bold$(tput setaf 7)
+        yellow=$(tput setaf 3)
 
         dim_black=$dim$black
         dim_blue=$dim$blue
@@ -123,15 +115,15 @@ set_prompts() {
         dim=""
         reset="\e[0m"
 
-        black="\e[1;30m"
-        blue="\e[1;34m"
-        cyan="\e[1;36m"
-        green="\e[1;32m"
-        orange="\e[1;33m"
-        red="\e[1;31m"
-        white="\e[1;37m"
-        yellow="\e[1;33m"
+        black="\e[0;30m"
+        blue="\e[0;34m"
+        cyan="\e[0;36m"
+        green="\e[0;32m"
+        orange="\e[0;33m"
         magenta="\e[0;35m"
+        red="\e[0;31m"
+        white="\e[0;37m"
+        yellow="\e[0;33m"
 
         dim_black="\e[1;30m"
         dim_blue="\e[1;34m"