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

---
 bin/toggle-app.sh   |  3 +++
 bin/xmobars.sh      |  4 +++-
 src/Bottom.hs       |  3 +--
 src/Top.hs          |  3 +--
 src/TopC.hs         | 45 +++++++++++++++++++++++++++++++++++++++++++++
 src/lib/Bottom.hs   |  8 ++++----
 src/lib/Monitors.hs | 52 ++++++++++++++++++++++++++++++++++++++--------------
 xmobar-config.cabal |  7 +++++++
 8 files changed, 102 insertions(+), 23 deletions(-)
 create mode 100755 bin/toggle-app.sh
 create mode 100644 src/TopC.hs

diff --git a/bin/toggle-app.sh b/bin/toggle-app.sh
new file mode 100755
index 0000000..a2105ad
--- /dev/null
+++ b/bin/toggle-app.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+(pidof $1 && killall $1) || ($1 &)
diff --git a/bin/xmobars.sh b/bin/xmobars.sh
index 4b49f08..ae93c15 100755
--- a/bin/xmobars.sh
+++ b/bin/xmobars.sh
@@ -4,5 +4,7 @@ killall trayer
 run-trayer.sh &
 
 killall xmobar-top
+killall xmobar-bottom
 xmobar-top $* &
-toggle-xmobar-bottom.sh
+xmobar-bottom $* &
+
diff --git a/src/Bottom.hs b/src/Bottom.hs
index a13662b..92e2d3e 100644
--- a/src/Bottom.hs
+++ b/src/Bottom.hs
@@ -8,5 +8,4 @@ import System.Environment (getArgs)
 main :: IO ()
 main = do
   args <- getArgs
-  let mpris = if null args then "spotify" else last args
-  palette >>= configFromArgs . Music.config mpris >>= xmobar
+  palette >>= configFromArgs . Music.config "spotify" >>= xmobar
diff --git a/src/Top.hs b/src/Top.hs
index 98ee9eb..4ee2ab8 100644
--- a/src/Top.hs
+++ b/src/Top.hs
@@ -23,8 +23,7 @@ config p = (baseConfig p) {
   , template = " |bright| |memory| |top| <fn=1>|kbd|</fn>\
                \{|XMonadLog|}\
                \ |diskio| |disku| |cpufreq| |multicpu|\
-               \ |coretemp| \
-               \ |batt0| "
+               \  |multicoretemp| |batt0| "
 }
 
 main :: IO ()
diff --git a/src/TopC.hs b/src/TopC.hs
new file mode 100644
index 0000000..e4529ae
--- /dev/null
+++ b/src/TopC.hs
@@ -0,0 +1,45 @@
+import Xmobar
+import Config
+import Monitors
+
+-- <fn=1> 💡 </fn>
+config p = (baseConfig p) {
+  position = TopSize C 100 (defaultHeight - 1)
+  , textOffset = defaultHeight - 8
+  , textOffsets = [defaultHeight - 9, defaultHeight - 9,
+                   defaultHeight - 6, defaultHeight - 8]
+  , border = BottomB
+  , alpha = 255
+  , commands = [ Run (topProc' p)
+               , Run (multiCPU p)
+               , Run memory
+               , Run (diskU p)
+               , Run (diskIO p)
+               , Run (coreTemp p)
+               , Run brightness
+               , Run (batt p)
+               , Run (wireless p)
+               , Run (dynNetwork p)
+               , Run tun0
+               , Run (weather "EGPH") -- LEGE, LEBL, KCV0
+               , Run mail
+               , Run masterVol
+               , Run captureVol
+               , Run laTime
+               , Run localTime
+               ]
+  , template = " |batt0| |bright|\
+               \ <action=`toggle-app.sh nm-applet`>|tun0||wlp2s0wi|</action> \
+               \ |dynnetwork| \
+               \ <action=`toggle-app.sh blueman-tray`><fn=1>🎧</fn></action>\
+               \<action=`toggle-app.sh pasystray`>|default:Master|\
+               \ |default:Capture|</action>  |EGPH|\
+               \ |mail| {} \
+               \  |top| |multicpu|  |multicoretemp|\
+               \   |diskio| |disku| |memory| \
+               \ <fn=2>🕓  </fn>|datetime| |laTime| "
+}
+
+main :: IO ()
+main =
+  palette >>= configFromArgs . config >>= xmobar
diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index dd0f534..a4e907e 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -13,12 +13,12 @@ config cs tpl p = (baseConfig p) {
                    defaultHeight - 7]
   , border = TopB
   , template = "|tray| \
-               \<action=`toggle-nm-applet.sh `>|tun0||wlp2s0wi|</action> \
+               \<action=`toggle-app.sh nm-applet`>|tun0||wlp2s0wi|</action> \
                \ |dynnetwork| \
-               \ <action=`toggle-pasystray.sh `><fn=1>🎧</fn>|default:Master|\
+               \ <action=`toggle-app.sh pasystray`><fn=1>🎧</fn>|default:Master|\
                \ |default:Capture|</action>  <fn=2>🎵</fn>"
              ++ tpl
-             ++ " {} |mbox|  |EGPH| \
+             ++ " {} |mail|  |EGPH| \
                 \ <fn=2>🗓  </fn>|uptime| <fn=2>🕓 </fn>|datetime| |laTime| "
   , commands = [ Run (uptime p)
                , Run (wireless p)
@@ -26,7 +26,7 @@ config cs tpl p = (baseConfig p) {
                , Run tun0
                , Run (weather "EGPH") -- LEGE, LEBL, KCV0
                , Run trayPadding
-               , Run mbox
+               , Run mail
                , Run masterVol
                , Run captureVol
                , Run laTime
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
 
diff --git a/xmobar-config.cabal b/xmobar-config.cabal
index 9492938..841206e 100644
--- a/xmobar-config.cabal
+++ b/xmobar-config.cabal
@@ -25,6 +25,13 @@ executable xmobar-top
   build-depends: base, xmobar, xmobar-config
   default-language: Haskell2010
 
+executable xmobar-exwm
+  main-is: TopC.hs
+  hs-source-dirs: src
+  ghc-options: -rtsopts -with-rtsopts=-V0
+  build-depends: base, xmobar, xmobar-config
+  default-language: Haskell2010
+
 executable xmobar-bottom
   main-is: Bottom.hs
   hs-source-dirs: src
-- 
cgit v1.2.3