From 99ba9909926694a52f5df25094f0d96e2e3a2a03 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Wed, 10 Apr 2013 17:28:48 -0500
Subject: [PATCH] some more conky and xmonad updates

---
 conky     | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
 xmonad.hs |  3 ++-
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/conky b/conky
index dfc098f..db2dbb8 100644
--- a/conky
+++ b/conky
@@ -7,10 +7,47 @@ update_interval 1
 #± ${weather 'http://weather.noaa.gov/pub/data/observations/metar/stations/' 'KORD' temperature} \
 
 TEXT
-^fg(\#66aaff)Ú^fg() ^fg(white)${downspeedf eth0}KiB ^fg()\
-^fg(\#66aaff)Û^fg() ^fg(white)${upspeedf eth0}KiB ^fg()\
-^fg(\#66aaff)í^fg() ^fg(white)${mixer vol}% ^fg()\
-^fg(\#66aaff)¡^fg() ^fg(white)${battery_percent}% ^fg()\
-^fg(\#66aaff)Ñ^fg() ^fg(white)${cpu}% ^fg()\
-^fg(\#66aaff)Î^fg() ^fg(white)${memperc}% ^fg()\
-^fg(\#66aaff)É^fg() ^fg(white)${time %d %b %R}^fg() \
+# Net speeds
+${if_match ${downspeedf eth0} > 100}^fg(\#ff0000)\
+${else}\
+${if_match ${downspeedf eth0} > 5}^fg(\#66ff66)\
+${else}^fg(\#66aaff)\
+${endif}\
+${endif}\
+Ú ^fg(white)${downspeedf eth0}KiB \
+#
+${if_match ${upspeedf eth0} > 100}^fg(\#ff0000)\
+${else}\
+${if_match ${upspeedf eth0} > 5}^fg(\#66ff66)\
+${else}^fg(\#66aaff)\
+${endif}\
+${endif}\
+Û ^fg(white)${upspeedf eth0}KiB \
+#
+# Speaker
+${if_match ${mixer vol} == 0}^fg(\#ff0000)ë \
+${else}^fg(\#66aaff)í \
+${endif}\
+^fg(white)${mixer vol}% \
+#
+# Battery
+${if_match ${battery_percent} <= 10}^fg(\#ff0000)î \
+${else}^fg(\#66aaff)\
+${if_match ${battery_percent} <= 66}ï \
+${else}¡ \
+${endif}\
+${endif}\
+^fg(white)${battery_percent}% \
+#
+# CPU
+${if_match ${cpu} > 50}^fg(\#ff0000)\
+${else}\
+${if_match ${cpu} > 10}^fg(\#66ff66)\
+${else}^fg(\#66aaff)\
+${endif}\
+${endif}\
+Ñ ^fg(white)${cpu}% \
+#
+# Memory
+^fg(\#66aaff)Î ^fg(white)${memperc}% \
+^fg(\#66aaff)É ^fg(white)${time %d %b %R} \
diff --git a/xmonad.hs b/xmonad.hs
index 891c8fb..436f8b4 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -27,8 +27,9 @@ myManageHook = composeAll
     ]
 
 --myWorkspaces =  [ "!" , "@" , "#" , "$" , "%", "^^", "&", "*", "(" ]
-myWorkspaces =  [ "1" , "2" , "3" , "4" , "5", "6", "7", "8", "9" ]
+--myWorkspaces =  [ "1" , "2" , "3" , "4" , "5", "6", "7", "8", "9" ]
 --myWorkspaces =  [ "α" , "β" , "γ" , "δ" , "ε", "ζ", "η", "θ", "ι" ]
+myWorkspaces =  [ "1" , "2" , "3" , "Ë" , "ê", "®", "7", "8", "9" ]
 
 myNormalBorderColor     = "#000000"
 myFocusedBorderColor    = darkBlue