From 738df74921f796f4cc396b6d58de7c6b426ae6f3 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 12 Oct 2019 15:36:36 +0100
Subject: xmobar-exwm with a toggled music monitor

---
 src/TopC.hs         | 32 +++++++++++++++++++++++++-------
 src/lib/Monitors.hs | 18 +++++++++---------
 src/lib/Music.hs    | 19 ++++++++++---------
 3 files changed, 44 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/TopC.hs b/src/TopC.hs
index fa75f75..a86c542 100644
--- a/src/TopC.hs
+++ b/src/TopC.hs
@@ -1,6 +1,23 @@
 import Xmobar
 import Config
 import Monitors
+import Music (mpris)
+
+topProcL p = TopProc (p <~> ["-t" , "<both1>  <mboth1>"
+                            , "-w", "10", "-L" , "10", "-H", "80"]) 15
+diskIOL p = DiskIO [("nvme0n1p2", "<total>")] (diskArgs p) 10
+
+mpd = MPD [ "-W", "12", "-b", "░", "-f", "▒", "-t", " <remaining>"] 10
+
+autoMPD = AutoMPD [ "-T", "110", "-E", "…", "-W", "10", "-t"
+                  , "<ppos>/<plength> \
+                    \<fn=0><fc=darkolivegreen><title></fc></fn> \
+                    \<fn=0><album></fn> \
+                    \<fn=0><fc=dodgerblue4><artist></fc> \
+                    \<fc=burlywood4><composer></fc> <date></fn>"]
+
+compMPD = concatMonitor " " mpd autoMPD
+music = toggleMonitor "/tmp/mpris.st" (mpris "spotify") compMPD
 
 -- <fn=1> 💡 </fn>
 config p = (baseConfig p) {
@@ -8,15 +25,14 @@ config p = (baseConfig p) {
   , textOffset = defaultHeight - 8
   , textOffsets = [defaultHeight - 9, defaultHeight - 9,
                    defaultHeight - 6, defaultHeight - 8]
-  , iconOffset = 10
   , border = BottomB
   , alpha = 255
-  , commands = [ Run (topProc' p)
+  , commands = [ Run (topProcL p)
+               , Run music
                , Run (cpuBars p)
                , Run memory
                , Run (diskU p)
-               , Run (diskIO p)
-               -- , Run (coreTemp p)
+               , Run (diskIOL p)
                , Run brightness'
                , Run kbd
                , Run (batt p)
@@ -36,9 +52,11 @@ config p = (baseConfig p) {
                \ <action=`toggle-app.sh blueman-tray`></action>\
                \<action=`toggle-app.sh pasystray`>|default:Master|\
                \ |default:Capture|</action>  |EGPH|\
-               \ |mail| <fn=1>|kbd|</fn>{} \
-               \  |top| |multicpu|\
-               \   |diskio| |disku| |memory| \
+               \ |mail| <fn=1>|kbd|</fn>{}\
+               \ <action=`toggle-pipe.sh /tmp/mpris.st`>|" ++ (alias music) ++
+               "|</action>\
+               \ |multicpu|  |top| |memory|\
+               \ |diskio| |disku| \
                \ <fn=2>🕓  </fn>|datetime| |laTime| "
 }
 
diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs
index 0dbe8b1..42f0966 100644
--- a/src/lib/Monitors.hs
+++ b/src/lib/Monitors.hs
@@ -58,8 +58,8 @@ multiCPU p = MultiCpu (p <~> ["-t", "<autototal>"
                              , "-p", "3", "-a", "l"]) 10
 
 cpuBars p = MultiCpu (mkArgs p
-                             ["--template" , "  <autoipat> <total>%"
-                               , "-L", "50", "--H", "85"]
+                             ["--template" , "<autoipat> <total>%"
+                               , "-L", "50", "-H", "85", "-w", "2"]
                              ["--fallback-icon-pattern", "<icon=load_%%.xpm/>"
                              , "--contiguous-icons"])
             10
@@ -124,16 +124,16 @@ diskU p =
         (p <~> ["-L", "20", "-H", "70", "-m", "1", "-p", "3"])
         20
 
+diskArgs p = mkArgs p
+                ["-f", "░", "-b", " ", "-L", "200000", "-H" , "10000000"
+                , "-W", "5", "-w", "5", "-p", "3"]
+                ["--total-icon-pattern", "<icon=load_%%.xpm/>"]
+
 diskIO p =
   DiskIO [("nvme0n1p2"
 --          , "<fn=1>⎗</fn> <readb> <fn=1>⎘</fn> <writeb> <fn=1><totalbbar></fn>")
           , "<readb> <writeb> <fn=0><totalbipat></fn>")
-         ]
-        (mkArgs p
-                ["-f", "░", "-b", " ", "-L", "200000", "-H" , "10000000"
-                , "-W", "5", "-w", "5", "-p", "3"]
-                ["--total-icon-pattern", "<icon=load_%%.xpm/>"])
-         10
+         ] (diskArgs p) 10
 
 -- <fn=1>📨 🖅 🖃 📩 ✉ </fn>
 mbox = MBox [ ("L", "/var/mail/jao", "grey60")
@@ -176,7 +176,7 @@ kbd = Kbd [("us", ""), ("us(intl)", "   ⃣")]
 brightness = Brightness ["--", "-D", "intel_backlight"] 10
 brightness' = Brightness ["--", "-D", "amdgpu_bl0", "-C", "brightness"] 10
 
-memory = Memory ["-t","<available> M", "-p", "2", "w", "7"] 20
+memory = Memory ["-t","<available> M", "-p", "2", "-W", "7"] 20
 
 tun0 = Network "tun0" ["-t", "<dev>:", "-x", ""] 20
 
diff --git a/src/lib/Music.hs b/src/lib/Music.hs
index 949f13d..fa6e278 100644
--- a/src/lib/Music.hs
+++ b/src/lib/Music.hs
@@ -15,21 +15,22 @@ mpris client =
 mprisConfig client p = Bottom.config [Run (mpris client)] "|mpris2|" p
 
 mpd = MPD [ "-W", "12", "-b", "░", "-f", "▒", "-t"
-          , " <lapsed> <fc=honeydew3><fn=5><bar></fn></fc>"] 10
+          , " <lapsed> <fc=honeydew3><fn=5><bar></fn></fc>"] 10 -- fn=5
 
-autoMPD = AutoMPD [ "-T", "150", "-E", "...", "-W", "10", "-t"
-                  , "<length> <ppos>/<plength> \
-                    \<fn=0><fc=darkolivegreen><title></fc></fn> \
-                    \<fn=0><album></fn> \
-                    \<fn=0><fc=dodgerblue4><artist></fc> \
-                    \<fc=burlywood4><composer></fc> <date></fn>"]
 
-mpdConfig p = (Bottom.config [Run mpd, Run autoMPD] "|mpd| |autompd|" p)
+autoMPD l = AutoMPD [ "-T", l, "-E", "...", "-W", "10", "-t"
+                    , "<length> <ppos>/<plength> \
+                      \<fn=0><fc=darkolivegreen><title></fc></fn> \
+                      \<fn=0><album></fn> \
+                      \<fn=0><fc=dodgerblue4><artist></fc> \
+                      \<fc=burlywood4><composer></fc> <date></fn>"]
+
+mpdConfig p = (Bottom.config [Run mpd, Run (autoMPD "150")] "|mpd| |autompd|" p)
   {
   textOffsets = [defaultHeight - 7, defaultHeight - 6]
   }
 
-compMPD = concatMonitor " " mpd autoMPD
+compMPD = concatMonitor " " mpd (autoMPD "150")
 alt x = altMonitor (mpris x) compMPD
 
 config cl =
-- 
cgit v1.2.3