From 5c0ce2eb71b950303a50bfcc8679df9441881eef Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 10 Jan 2020 17:59:26 +0000
Subject: Code format

---
 src/TopC.hs | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/TopC.hs b/src/TopC.hs
index 62c08ea..9aea28e 100644
--- a/src/TopC.hs
+++ b/src/TopC.hs
@@ -4,7 +4,7 @@ import Monitors
 import Music (mpris, gpmd)
 
 topProcL p = TopProc (p <~> ["-t"
-                            , "<both1> <both2> <both3>  <mboth1> <mboth2> <mboth3>"
+                            , "<both1> <both2> <both3>  <mboth1> <mboth2> "
                             , "-w", "10", "-L" , "10", "-H", "80"]) 15
 diskIOL p = DiskIO [("/", "<totalbipat>"), ("/home", "<totalbipat>")]
                    (diskArgs p) 10
@@ -54,28 +54,34 @@ config p = (baseConfig p) {
                , Run (diskIOL p)
                , Run brightness'
                , Run kbd
-               -- , Run (batt p)
+               , Run (batt p)
                , Run (wireless p "wlp1s0")
                , Run (dynNetwork p)
                , Run tun0
-               , Run (weather' "<skyConditionS> <tempC>° <weather>" "EGPH" p) -- LEGE, LEBL, KCV0
-               -- , Run (mail p)
+               , Run w -- LEGE, LEBL, KCV0
                , Run masterVol
                , Run captureVol
                , Run laTime
                , Run localTime
                ]
-  , template = " |EGPH|  |bright|\
-               \ <action=`toggle-app.sh nm-applet`>|tun0||wlp1s0wi|</action> \
-               \ |dynnetwork| \
-               \ <action=`toggle-app.sh pasystray`>|default:Master|\
-               \ |default:Capture|</action> \
-               \ <action=`toggle-pipe.sh /tmp/mpris.st`>|" ++ alias m ++
-               "|</action> <fn=1>|kbd|</fn>{}\
-               \ |multicpu|  |top| |memory|\
-               \ <fc=grey60>|diskio|</fc> |disku| \
-               \ <fn=2>🕓  </fn>|datetime| |laTime| "
+  , template = " |batt0| "
+             ++ "|bright| "
+             ++ "<action=`toggle-app.sh nm-applet`>|tun0||wlp1s0wi|</action> "
+             ++ "|dynnetwork| "
+             ++ "<action=`toggle-app.sh pasystray`>|default:Master| \
+                 \|default:Capture|</action> "
+             ++ "<action=`toggle-pipe.sh /tmp/mpris.st`>|" ++ ma ++ "|</action>"
+             ++ " <fn=1>|kbd|</fn>"
+             ++ " {} "
+             ++ " |multicpu| "
+             ++ " |top| "
+             ++ "|memory| "
+             ++ "<fc=grey60>|diskio|</fc> |disku| "
+             ++ " |EGPH| "
+             ++  "<fn=2>🕓  </fn>|datetime| |laTime| "
   } where m = music (pIsLight p)
+          ma = alias m
+          w = (weather' "<skyConditionS> <tempC>° <weather>" "EGPH" p)
 
 main :: IO ()
 main =
-- 
cgit v1.2.3