From f64764b95e9e713157bdb96a377c636479bfc40c Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 1 Feb 2020 04:33:16 +0000
Subject: fn, fc

---
 src/lib/Monitors.hs | 48 ++++++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

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

diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs
index 324043d..1a8d0d6 100644
--- a/src/lib/Monitors.hs
+++ b/src/lib/Monitors.hs
@@ -68,7 +68,7 @@ cpuFreq p = CpuFreq (p <~> ["-t" , "<cpu0> <cpu1> <cpu2> <cpu3>"
                            , "-L", "1", "-H", "2", "-S", "Off" , "-d", "2"]) 50
 
 -- ⤒⤊⍐ ⊼ ⇧  ⇩ ⎗ ⎘
-dynNetwork p = DynNetwork (p <~> ["-t", "<fn=1>↑</fn> <tx>  <fn=1>↓</fn> <rx>"
+dynNetwork p = DynNetwork (p <~> ["-t", fn 1 "↑ " ++ "<tx>  " ++ fn 1 "↓" ++ " <rx>"
                                  , "-L", "20", "-H", "1024000"
                                  , "-m", "5", "-W", "10", "-S", "Off"]) 10
 
@@ -78,19 +78,19 @@ uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S"
 -- 🌧
 weather' tmp st p =
   WeatherX st
-           [ ("", "<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=3>☁</fn>")
-           , ("considerable cloudiness", "<fn=4>⛈</fn>")]
+           [ ("", fc "gray60" $ fn 4 "🌑")
+           , ("clear", fn 4 "🌣")
+           , ("sunny", fn 4 "🌣")
+           , ("mostly clear", fn 4 "🌤")
+           , ("mostly sunny", fn 4 "🌤")
+           , ("partly sunny", fn 3 "⛅")
+           , ("fair", fn 4 "🌑")
+           , ("obscured", fn 4 "🌁") -- 🌫
+           , ("cloudy", fn 3 "☁")
+           , ("overcast", fn 3 "☁")
+           , ("partly cloudy", fn 3 "⛅")
+           , ("mostly cloudy", fn 3 "☁")
+           , ("considerable cloudiness", fn 4 "⛈")]
            (mkArgs p ["-t", tmp , "-L","10", "-H", "25"] ["-w", ""])
            18000
 
@@ -106,9 +106,9 @@ batt p =
            , "-P"
            , "-a", "notify-send -u critical 'Battery running out!!!!!!'"
            , "-A", "7"
-           , "-i", "<fn=2>\9211</fn>"
-           , "-O", " <fn=2>\9211</fn> <timeleft> <watts>"
-           , "-o", " <fn=2>🔋</fn> <timeleft> <watts>"
+           , "-i", fn 2 "\9211"
+           , "-O", fn 2 " \9211" ++ " <timeleft> <watts>"
+           , "-o", fn 2 " 🔋" ++ " <timeleft> <watts>"
            , "-H", "10", "-L", "7"
            , "-h", pHigh p, "-l", pLow p] 50 "batt0"
 
@@ -133,7 +133,7 @@ diskArgs p = mkArgs p
 diskIO p =
   DiskIO [("nvme0n1p2"
 --          , "<fn=1>⎗</fn> <readb> <fn=1>⎘</fn> <writeb> <fn=1><totalbbar></fn>")
-          , "<readb> <writeb> <fn=0><totalbipat></fn>")
+          , "<readb> <writeb> <totalbipat>")
          ] (diskArgs p) 10
 
 -- <fn=1>📨 🖅 🖃 📩 ✉ </fn>
@@ -165,20 +165,12 @@ mail p = MailX [ ("I", "jao/inbox", pHigh p)
                ["-d", "~/var/maildir", "-p", " ", "-s", " "]
                "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", "<fn=4>🎧</fn>" -- 🎧
-                  , "-o", "<fn=4>🔇</fn>"] 10
+                  , "-O", fn 4 "🎧"
+                  , "-o", fn 4 "🔇"] 10
 
 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10
 
-- 
cgit v1.2.3