HLWM: Color tweaks

2 files changed, 18 insertions, 26 deletions

diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index d81eadb..b5ffcac 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -38,7 +38,7 @@
 ;; keybindings
 (keybind modkey "Mod1-q"  "quit")
 (keybind modkey "Mod1-r" "reload")
-(keybind modkey "Shift-mod1-c" "close")
+(keybind modkey "Shift-Mod1-c" "close")
 (keybind modkey "Return"  "spawn urxvt")
 (keybind modkey "r"
          (string-append
@@ -92,31 +92,21 @@
 (keybind modkey "Shift-l"    "shift right")
 
 ;; colors
-(display "set frame_border_active_color \\#49351D\n")
-(set "frame_border_active_color"   "\\#49351D")
-(display "set frame_border_normal_color\n")
-(set "frame_border_normal_color"   "\\#73532D")
-(display "set frame_bg_normal_color\n")
-(set "frame_bg_normal_color"       "\\#BD9768")
-(display "set frame_bg_active_color\n")
-(set "frame_bg_active_color"       "\\#BD8541")
-(display "set frame_border_width\n")
-(set "frame_border_width"          "2")
-(display "set window_border_width\n")
+(set "frame_border_active_color"   "\\#2e3436")
+(set "frame_border_normal_color"   "\\#0c191c")
+(set "frame_bg_normal_color"       "\\#2e3436")
+(set "frame_bg_active_color"       "\\#0c191c")
+(set "frame_border_width"          "0")
 (set "window_border_width"         "2")
-(display "set window_border_normal_color\n")
-(set "window_border_normal_color"  "\\#AE8451")
-(display "set window_border_active_color\n")
-(set "window_border_active_color"  "\\#F6FF00")
+(set "window_border_normal_color"  "\\#0c191c")
+(set "window_border_active_color"  "\\#800000")
 
 ;; rules
-(display "unrule\n")
 (unrule)
-(display "rule focus=off\n")
 (rule "focus=off")                 ; normally do not focus new clients
-(display "rule focus terminal\n")
 (rule "class~'(.*[Rr]xvt.*|.*[Tt]erm|Konsole)' focus=on")
 (rule "windowtype=_NET_WM_WINDOW_TYPE_DIALOG focus=on pseudotile=on")
+(rule "class=Xephyr pseudotile=on")
 
 ;; Show panel
 
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index ac83e17..ade5077 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -12,7 +12,9 @@ y=${geometry[1]}
 width=${geometry[2]}
 height=16
 font="-misc-dejavu sans mono-medium-r-*-*-10-*-*-*-*-*-*-*"
+fgcolor='#eeeeec'
 bgcolor='#252a2b'
+hintcolor="#0c191c"
 
 function uniq_linebuffered() {
     awk '$0 != l { print ; l=$0 ; fflush(); }' "$@"
@@ -23,7 +25,7 @@ herbstclient pad $monitor $height
     # events:
     #mpc idleloop player &
     while true ; do
-        date +'date ^fg(#eeeeec)%H:%M^fg(#909090), %Y-%m-^fg(#eeeeec)%d'
+        date +'date ^fg($fgcolor)%H:%M^fg(#909090), %Y-%m-^fg($fgcolor)%d'
         sleep 1 || break
     done > >(uniq_linebuffered)  &
     childpid=$!
@@ -34,22 +36,22 @@ herbstclient pad $monitor $height
     date=""
     while true ; do
         bordercolor="#26221C"
-        hintcolor="#573500"
         separator="^fg(#141414)^ro(1x$height)^fg()"
         # draw tags
+        echo -n "$separator"
         for i in "${TAGS[@]}" ; do
             case ${i:0:1} in
                 '#')
-                    echo -n "^bg(#9fbc00)^fg(#141414)"
+                    echo -n "^bg(#0c191c)^fg(#eeeeec)"
                     ;;
                 '+')
-                    echo -n "^bg(#9CA668)^fg(#141414)"
+                    echo -n "^bg(#2e3436)^fg(#555753)"
                     ;;
                 ':')
-                    echo -n "^bg(#6A4100)^fg(#141414)"
+                    echo -n "^bg(#2e3436)^fg($fgcolor)"
                     ;;
                 '!')
-                    echo -n "^bg(#FF0675)^fg(#141414)"
+                    echo -n "^bg(#a40000)^fg(#edd400)"
                     ;;
                 *)
                     echo -n "^bg()^fg()"
@@ -91,4 +93,4 @@ herbstclient pad $monitor $height
         esac
         done
 } 2> /dev/null | dzen2 -w $width -x $x -y $y -fn "$font" -h $height \
-    -ta l -bg "$bgcolor" -fg '#eeeeec'
+    -ta l -bg "$bgcolor" -fg "$fgcolor"