From 26767d5adb227e11077c7b4089a082679e59394e Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 20 Sep 2019 00:26:12 +0100
Subject: TopC for xmobar-exwm

---
 src/lib/Monitors.hs | 52 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 14 deletions(-)

(limited to 'src/lib/Monitors.hs')

diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs
index 473eebf..3c35488 100644
--- a/src/lib/Monitors.hs
+++ b/src/lib/Monitors.hs
@@ -40,6 +40,10 @@ topProc p = TopProc (p <~> ["-t" , "<mboth3>  <mboth2>  <mboth1> \
                                    \· <both3>  <both2>  <both1>"
                            , "-w", "10", "-L" , "10", "-H", "80"]) 15
 
+topProc' p = TopProc (p <~> ["-t" , "<mboth1>  <mboth2>  <mboth3> \
+                                   \· <both1>  <both2>  <both3>"
+                           , "-w", "10", "-L" , "10", "-H", "80"]) 15
+
 wireless p = Wireless "wlp2s0" (p <~> ["-t" , "<essid> <quality>"
                                       , "-W", "5", "-M", "15" , "-m", "3"
                                       , "-L", "20", "-H", "80"]) 20
@@ -60,18 +64,21 @@ dynNetwork p = DynNetwork (p <~> ["-t", "<fn=1>↑</fn> <tx>  <fn=1>↓</fn> <rx
 uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S"
                          , "On" , "-L", "10", "-H", "100"]) 600
 
+-- 🌧
 weather st =
   WeatherX st
-           [ ("clear", "<fn=4>🌣</fn>")
+           [ ("", "<fc=gray60><fn=4>🌑</fn></fc>")
+           , ("clear", "<fn=4>🌣</fn>")
            , ("sunny", "<fn=4>🌣</fn>")
            , ("mostly clear", "<fn=4>🌤</fn>")
            , ("mostly sunny", "<fn=4>🌤</fn>")
            , ("partly sunny", "<fn=3>⛅</fn>")
            , ("fair", "<fn=4>🌑</fn>")
+           , ("obscured", "<fn=4>🌁</fn>") -- 🌫
            , ("cloudy","<fn=3>☁</fn>")
            , ("overcast","<fn=3>☁</fn>")
            , ("partly cloudy", "<fn=3>⛅</fn>")
-           , ("mostly cloudy", "<fn=4>🌧</fn>")
+           , ("mostly cloudy", "<fn=3>☁</fn>")
            , ("considerable cloudiness", "<fn=4>⛈</fn>")]
            ["-t", "<skyConditionS> <tempC>° <rh>%  <windKmh> (<hour>)"
            , "-L","10", "-H", "25", "--normal", "black"
@@ -94,8 +101,8 @@ batt p =
            , "-h", "sienna4", "-l", "gray20"] 50 "batt0"
 
 coreTemp p =
-  CoreTemp (p <~> ["-t", "<core1>° <core2>°"
-                  , "-L", "50", "-H", "75", "-d", "0"]) 50
+  MultiCoreTemp (p <~> ["-t", "<avg>°"
+                       , "-L", "50", "-H", "75", "-d", "0"]) 50
 
 diskU p =
   DiskU [("dm-1", "<used>") , ("/media/sdb", " s <used>")]
@@ -111,21 +118,38 @@ diskIO p =
                 , "-W", "5", "-w", "5", "-p", "3"])
          10
 
--- <fn=1>📨 🖅 🖃 📩</fn>
-mbox = MBox [ ("I", "inbox", "darkseagreen4")
-            , ("B", "bigml.spool", "sienna4")
-            , ("S", "bigsup.spool", "sienna4")
-            , ("G", "geiser.spool", "darkseagreen4")
-            , ("X", "xmobar.spool", "darkseagreen4")
-            , ("g", "gnu.spool", "")
-            , ("k", "books.spool", "")
-            ] ["-d", "/home/jao/var/mail", "-p", "<fn=2>🖄 </fn>", "-s", ""] "mbox"
+-- <fn=1>📨 🖅 🖃 📩 ✉ </fn>
+mbox = MBox [ ("L", "/var/mail/jao", "grey60")
+            -- , ("B", "bigml.spool", "sienna4")
+            -- , ("S", "bigsup.spool", "sienna4")
+            -- , ("G", "geiser.spool", "darkseagreen4")
+            -- , ("X", "xmobar.spool", "darkseagreen4")
+            -- , ("g", "gnu.spool", "")
+            -- , ("k", "books.spool", "")
+            ] [] -- ["-p", "<fn=2>📩 </fn>", "-s", ""]
+           "mbox"
+
+mail = Mail [ ("I", "~/var/maildir/jao/inbox")
+            , ("G", "~/var/maildir/jao/geiser")
+            , ("X", "~/var/maildir/jao/xmobar")
+            , ("B", "~/var/maildir/bigml/inbox")
+            , ("S", "~/var/maildir/bigml/support")
+            ]
+            "mail"
+
+-- mail = Mail [ ("<fc=darkseagreen4><fn=2>🖃 </fn></fc>", "~/var/maildir/jao/inbox")
+--             , ("<fc=darkseagreen3><fn=2>🖃 </fn></fc>", "~/var/maildir/jao/geiser")
+--             , ("<fc=darkseagreen3><fn=2>🖃 </fn></fc>", "~/var/maildir/jao/xmobar")
+--             , ("<fc=sienna2><fn=2>🖄 </fn></fc>", "~/var/maildir/bigml/inbox")
+--             , ("<fc=sienna4><fn=2>🖄 </fn></fc>", "~/var/maildir/bigml/support")
+--             ]
+--             "mail"
 
 masterVol =
   Volume "default" "Master"
                   ["-t", "<status> <volume>"
                   , "--", "-C", "black", "-c", "sienna4", "-O", ""
-                  , "-o", " ×"] 10
+                  , "-o", " <fn=4>🔇</fn>"] 10
 
 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10
 
-- 
cgit v1.2.3