From 5005408b3e4fdb7471d4c5ff673247073d06238b Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Mon, 29 Jul 2013 10:29:10 +0200
Subject: [PATCH] Applied new color definitions to Xresources and Mutt

---
 .Xresources           | 38 ++++++++++-----------
 .mutt/colors.ambrevar |  2 +-
 .mutt/colorset.sh     |  8 +++--
 .shell.d/colors_zsh   | 77 -------------------------------------------
 .shell.d/funs_rc      | 10 ++++--
 5 files changed, 33 insertions(+), 102 deletions(-)
 delete mode 100644 .shell.d/colors_zsh

diff --git a/.Xresources b/.Xresources
index a84fa97a..015bb49c 100644
--- a/.Xresources
+++ b/.Xresources
@@ -9,7 +9,7 @@
 !!------------------------------------------------------------------------------
 !! URxvt
 !! ------------------------------------------------------------------------------
-!! url-select, clipboard and keyboard-select are provided in Muennich's perl
+!! url-select, clipboard and keyboard-select are provided in Muennich perl
 !! plugins.
 
 !! Plugin dir.
@@ -87,25 +87,25 @@ Xft.rgba: rgb
 !! color14 = bright cyan 	
 !! color15 = bright white 	
 
-!! Gnome style
+!! Almost natural colors
 URxvt.background: black
-URxvt.foreground: #CCCCCC
-URxvt.color0  : #000000
-URxvt.color1  : #AA0000
-URxvt.color2  : #00AA00
-URxvt.color3  : #AA5500
-URxvt.color4  : #0000AA
-URxvt.color5  : #AA00AA
-URxvt.color6  : #00AAAA
-URxvt.color7  : #AAAAAA
-URxvt.color8  : #555555
-URxvt.color9  : #FF5555
-URxvt.color10 : #55FF55
-URxvt.color11 : #FFFF55
-URxvt.color12 : #5555FF
-URxvt.color13 : #FF55FF
-URxvt.color14 : #55FFFF
-URxvt.color15 : #FFFFFF
+URxvt.foreground: white
+URxvt.color0  : black
+URxvt.color1  : #8b0000
+URxvt.color2  : #228b22
+URxvt.color3  : #cdcd00
+URxvt.color4  : blue
+URxvt.color5  : #8b008b
+URxvt.color6  : #00bfff
+URxvt.color7  : #f5f5f5
+URxvt.color8  : #696969
+URxvt.color9  : red
+URxvt.color10 : green
+URxvt.color11 : yellow
+URxvt.color12 : #1e90ff
+URxvt.color13 : magenta
+URxvt.color14 : cyan
+URxvt.color15 : white
 
 !!==============================================================================
 !! Xterm
diff --git a/.mutt/colors.ambrevar b/.mutt/colors.ambrevar
index 8e0c514b..7a5d42a1 100644
--- a/.mutt/colors.ambrevar
+++ b/.mutt/colors.ambrevar
@@ -70,7 +70,7 @@ color attachment $my_col_shadow $my_col_shadow_bg
 color error red black
 color message white black
 color search brightwhite magenta
-color status brightyellow blue
+color status $my_col_status_fg $my_col_status_bg
 color tree brightblue black
 color normal white black
 color tilde green black
diff --git a/.mutt/colorset.sh b/.mutt/colorset.sh
index a0499858..f37727a4 100755
--- a/.mutt/colorset.sh
+++ b/.mutt/colorset.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 if [ $(tput colors) -eq 256 ]; then
-    ## Emacs colors.
+    ## 256 colors
     cat <<EOF
 set my_col_builtin = color75
 set my_col_comment = color242
@@ -15,9 +15,11 @@ set my_col_variable = brightyellow
 set my_col_warning = color202
 set my_col_shadow = color250
 set my_col_shadow_bg = color234
+set my_col_status_fg = brightwhite
+set my_col_status_bg = color242
 EOF
 else
-    ## 8/16 colors.
+    ## 8/16 colors
     cat <<EOF
 set my_col_builtin = brightblue
 set my_col_comment = white
@@ -32,5 +34,7 @@ set my_col_variable = brightyellow
 set my_col_warning = yellow
 set my_col_shadow = brightwhite
 set my_col_shadow_bg = brightblack
+set my_col_status_fg = yellow
+set my_col_status_bg = blue
 EOF
 fi
diff --git a/.shell.d/colors_zsh b/.shell.d/colors_zsh
deleted file mode 100644
index fbe3d315..00000000
--- a/.shell.d/colors_zsh
+++ /dev/null
@@ -1,77 +0,0 @@
-## -*- mode:sh -*- #
-##==============================================================================
-## Colors for universal support
-##==============================================================================
-
-## Reset
-Color_Off='\e[0m'       # Text Reset
-
-## Regular Colors
-Black='\e[0;30m'        # Black
-Red='\e[0;31m'          # Red
-Green='\e[0;32m'        # Green
-Yellow='\e[0;33m'       # Yellow
-Blue='\e[0;34m'         # Blue
-Purple='\e[0;35m'       # Purple
-Cyan='\e[0;36m'         # Cyan
-White='\e[0;37m'        # White
-
-## Bold
-BBlack='\e[1;30m'       # Black
-BRed='\e[1;31m'         # Red
-BGreen='\e[1;32m'       # Green
-BYellow='\e[1;33m'      # Yellow
-BBlue='\e[1;34m'        # Blue
-BPurple='\e[1;35m'      # Purple
-BCyan='\e[1;36m'        # Cyan
-BWhite='\e[1;37m'       # White
-
-## Underline
-UBlack='\e[4;30m'       # Black
-URed='\e[4;31m'         # Red
-UGreen='\e[4;32m'       # Green
-UYellow='\e[4;33m'      # Yellow
-UBlue='\e[4;34m'        # Blue
-UPurple='\e[4;35m'      # Purple
-UCyan='\e[4;36m'        # Cyan
-UWhite='\e[4;37m'       # White
-
-## Background
-On_Black='\e[40m'       # Black
-On_Red='\e[41m'         # Red
-On_Green='\e[42m'       # Green
-On_Yellow='\e[43m'      # Yellow
-On_Blue='\e[44m'        # Blue
-On_Purple='\e[45m'      # Purple
-On_Cyan='\e[46m'        # Cyan
-On_White='\e[47m'       # White
-
-## High Intensty
-IBlack='\e[0;90m'       # Black
-IRed='\e[0;91m'         # Red
-IGreen='\e[0;92m'       # Green
-IYellow='\e[0;93m'      # Yellow
-IBlue='\e[0;94m'        # Blue
-IPurple='\e[0;95m'      # Purple
-ICyan='\e[0;96m'        # Cyan
-IWhite='\e[0;97m'       # White
-
-## Bold High Intensty
-BIBlack='\e[1;90m'      # Black
-BIRed='\e[1;91m'        # Red
-BIGreen='\e[1;92m'      # Green
-BIYellow='\e[1;93m'     # Yellow
-BIBlue='\e[1;94m'       # Blue
-BIPurple='\e[1;95m'     # Purple
-BICyan='\e[1;96m'       # Cyan
-BIWhite='\e[1;97m'      # White
-
-## High Intensty backgrounds
-On_IBlack='\e[0;100m'   # Black
-On_IRed='\e[0;101m'     # Red
-On_IGreen='\e[0;102m'   # Green
-On_IYellow='\e[0;103m'  # Yellow
-On_IBlue='\e[0;104m'    # Blue
-On_IPurple='\e[10;95m'  # Purple
-On_ICyan='\e[0;106m'    # Cyan
-On_IWhite='\e[0;107m'   # White
diff --git a/.shell.d/funs_rc b/.shell.d/funs_rc
index fc3c993a..d2d73563 100644
--- a/.shell.d/funs_rc
+++ b/.shell.d/funs_rc
@@ -10,14 +10,18 @@
 ## Colored man pager.
 man()
 {
+    # mb = ?
+    # md = bold (titles, commands)
+    # so = status bar
+    # us = italic (arguments, files)
 	env \
 		LESS_TERMCAP_mb=$(printf "\e[1;31m") \
-		LESS_TERMCAP_md=$(printf "\e[1;31m") \
+		LESS_TERMCAP_md=$(printf "\e[0;36m") \
 		LESS_TERMCAP_me=$(printf "\e[0m") \
 		LESS_TERMCAP_se=$(printf "\e[0m") \
-		LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
+		LESS_TERMCAP_so=$(printf "\e[1;4;37m") \
 		LESS_TERMCAP_ue=$(printf "\e[0m") \
-		LESS_TERMCAP_us=$(printf "\e[1;32m") \
+		LESS_TERMCAP_us=$(printf "\e[0;33m") \
 		man "$@"
 }