Unifying MPD and Mpris in a single exec

3 files changed, 47 insertions, 1 deletions

diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index 4bd6614..0c6a372 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -54,7 +54,7 @@ masterVol =
   Volume "default" "Master"
                   ["-t", "<status> <volume>"
                   , "--", "-C", "black", "-c", "sienna4", "-O", ""
-                  , "-o", "×"] 10
+                  , "-o", " ×"] 10
 
 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10
 
diff --git a/src/lib/MPD.hs b/src/lib/MPD.hs
new file mode 100644
index 0000000..be09f5f
--- /dev/null
+++ b/src/lib/MPD.hs
@@ -0,0 +1,26 @@
+module MPD where
+
+import Xmobar
+import Config (palette)
+import qualified Bottom (config)
+
+mpd = MPD [ "-W", "12", "-b", "░", "-f", "▒", "-t"
+          , " <lapsed> <fc=seashell3><fn=1><bar></fn></fc>"] 10
+
+autoMPD = AutoMPD [ "-T", "160", "-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>"]
+
+
+config p = (Bottom.config [(Run mpd), (Run autoMPD)] p) {
+  template =  "|kbd||default:Master| |default:Capture| \
+              \|mpd| |autompd| {} |mbox| \
+              \|EGPH| \
+              \|diskio| |disku| · |bright| · |coretemp| \
+              \|memory| · |uptime| |b0| "
+  , additionalFonts = ["xft:Hack-7"]
+  , textOffsets = [17]
+  }
diff --git a/src/lib/Mpris.hs b/src/lib/Mpris.hs
new file mode 100644
index 0000000..1936d57
--- /dev/null
+++ b/src/lib/Mpris.hs
@@ -0,0 +1,20 @@
+module Mpris where
+
+import Xmobar
+import Config (palette)
+import qualified Bottom (config)
+
+mpris client =
+  Mpris2 client -- "clementine" --
+         ["-t", " <tracknumber>\
+                \ <title> <fc=sienna4><artist></fc>\
+                \ <album> <length>"
+         , "-T", "180", "-E", "...", "-M", "100", "-x", ""] 10
+
+config client p = (Bottom.config [Run (mpris client)] p) {
+  template =  "|kbd||default:Master| |default:Capture| \
+              \|mpris2| {} |mbox| \
+              \|EGPH| \
+              \|diskio| |disku| · |bright| · |coretemp| \
+              \|memory| · |uptime| |b0| "
+  }