1 files changed, 23 insertions, 15 deletions

diff --git a/src/TopC.hs b/src/TopC.hs
index 3e5748a..3fa6c51 100644
--- a/src/TopC.hs
+++ b/src/TopC.hs
@@ -4,19 +4,25 @@ import Monitors
 import Music (mpris, gpmd, mpdt)
 
 topProcL p = TopProc (p <~> ["-t"
-                            , "<both1> <both2> <both3>  <mboth1> <mboth2> <mboth3>"
-                            , "-w", "10", "-L" , "10", "-H", "80"]) 15
+                            , "<both1> <both2> <both3> <both4>"
+                              ++ "  ·  <mboth1> <mboth2> <mboth3> <mboth4>"
+                            , "-w", "12", "-L" , "10", "-H", "80"]) 15
 diskIOL p = DiskIO [("/", "<totalbipat>"), ("/home", "<totalbipat>")]
                    (diskArgs p) 10
 
 mpd = MPD [ "-W", "12", "-b", "░", "-f", "▒", "-t", " <remaining>"] 10
 
+
+
 autoMPD light = AutoMPD [ "-T", "110", "-E", "…", "-W", "10", "-t" ,
-                          " <remaining> " ++ mpdt light]
+                          fc "grey40" (fni "\xf001") ++
+                            " <lapsed>/<length> <ppos>/<plength>" --  ++ mpdt light
+                        ]
 
 pollMPD light =
   MPD [ "-T", "120", "-W", "10", "-E", "…", "-t", tm, "--", "-p", "6600"] 20
-  where tm = " <remaining> " ++ mpdt light
+  where tm = fc "grey40" (fni "\xf001") ++ " <remaining> " ++ "<ppos>/<plength>"
+   -- ++ mpdt light
 
 -- mprisName = "MellowPlayer3"
 mprisName = "spotifyd"
@@ -25,7 +31,8 @@ musicPipe = PipeReader "/tmp/music" "musicpipe"
 musicMPRIS p = mpris p mprisName 180
 
 -- music light = toggleMonitor "/tmp/mpris.st" musicPipe (pollMPD light)
-music p = toggleMonitor "/tmp/mpris.st" (musicMPRIS p) (pollMPD (pIsLight p))
+-- music p = toggleMonitor "/tmp/mpris.st" (pollMPD (pIsLight p)) (musicMPRIS p)
+music = pollMPD . pIsLight
 
 -- <fn=1> 💡 </fn>
 config p = (baseConfig p) {
@@ -44,7 +51,7 @@ config p = (baseConfig p) {
                , Run memory
                , Run (diskU p)
                , Run (diskIOL p)
---               , Run brightness'
+               , Run brightness'
                , Run kbd
                , Run (miniBatt p)
                , Run (wireless p "wlp1s0")
@@ -53,29 +60,30 @@ config p = (baseConfig p) {
                , Run w -- LEGE, LEBL, KCV0
                , Run (masterVol p)
                , Run captureVol
---               , Run laTime
+               , Run laTime
                , Run localTime
                ]
   , template = " "
              ++ "|batt0| "
---             ++ "|bright| "
+             ++ fni "\xf185" ++ " |bright| "
              ++ "<action=`toggle-app.sh nm-applet`>|proton0||wlp1s0wi|</action> "
              ++ "|dynnetwork| "
              ++ "<action=`toggle-app.sh pasystray`>|default:Master| \
                  \|default:Capture|</action> "
-             ++ "<action=`toggle-pipe.sh /tmp/mpris.st`>" ++ ma ++ "</action>"
-             ++ " |kbd|"
+             ++  ma
+             ++ " |EGPH| "
              ++ " {} "
 --             ++ "|mail|"
+             ++ " |kbd| "
              ++ "|multicpu| "
              ++ "|multicoretemp| "
              ++ " |top| "
-             ++ "|memory| "
-             ++ fc "grey60" "|diskio|" ++ " |disku| "
-             ++ " |EGPH| "
-             ++ fni "\xf017  " ++ "|datetime| "
+             ++ fni "\xf080" ++ " |memory| "
+             ++ fni "\xf0a0" ++ fc "grey60" " |diskio|" ++ " |disku| "
+             ++ fni "\xf017" ++ " |datetime| "
+             ++ "|laTime| "
   } where m = music p
-          ma = fc "grey40" (fni "\xf001 ") ++ "|" ++ alias m ++ "|"
+          ma = " |" ++ alias m ++ "| "
           w = (weather' "<skyConditionS> <tempC>° <weather>" "EGPH" p)
 
 main :: IO ()