From 68f2f5fc251c611c3848c0810fd303e655860038 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Mon, 14 Oct 2019 00:48:46 +0100
Subject: better dark colors

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

(limited to 'src/TopC.hs')

diff --git a/src/TopC.hs b/src/TopC.hs
index a86c542..54c3bb8 100644
--- a/src/TopC.hs
+++ b/src/TopC.hs
@@ -16,8 +16,15 @@ autoMPD = AutoMPD [ "-T", "110", "-E", "…", "-W", "10", "-t"
                     \<fn=0><fc=dodgerblue4><artist></fc> \
                     \<fc=burlywood4><composer></fc> <date></fn>"]
 
-compMPD = concatMonitor " " mpd autoMPD
-music = toggleMonitor "/tmp/mpris.st" (mpris "spotify") compMPD
+autoMPDD = AutoMPD [ "-T", "110", "-E", "…", "-W", "10", "-t"
+                   , "<ppos>/<plength> \
+                     \<fn=0><title></fn> \
+                     \<fn=0><fc=darkseagreen><album></fc></fn> \
+                     \<fn=0><fc=darkseagreen4><artist></fc> \
+                     \<fc=burlywood4><composer></fc> <date></fn>"]
+
+compMPD light = concatMonitor " " mpd (if light then autoMPD else autoMPDD)
+music light = toggleMonitor "/tmp/mpris.st" (mpris "spotify" 120) (compMPD light)
 
 -- <fn=1> 💡 </fn>
 config p = (baseConfig p) {
@@ -28,7 +35,7 @@ config p = (baseConfig p) {
   , border = BottomB
   , alpha = 255
   , commands = [ Run (topProcL p)
-               , Run music
+               , Run m
                , Run (cpuBars p)
                , Run memory
                , Run (diskU p)
@@ -39,7 +46,7 @@ config p = (baseConfig p) {
                , Run (wireless p "wlp1s0")
                , Run (dynNetwork p)
                , Run tun0
-               , Run (weather "EGPH") -- LEGE, LEBL, KCV0
+               , Run (weather "EGPH" p) -- LEGE, LEBL, KCV0
                , Run mail
                , Run masterVol
                , Run captureVol
@@ -49,16 +56,15 @@ config p = (baseConfig p) {
   , template = " |batt0| |bright|\
                \ <action=`toggle-app.sh nm-applet`>|tun0||wlp1s0wi|</action> \
                \ |dynnetwork| \
-               \ <action=`toggle-app.sh blueman-tray`></action>\
-               \<action=`toggle-app.sh pasystray`>|default:Master|\
+               \ <action=`toggle-app.sh pasystray`>|default:Master|\
                \ |default:Capture|</action>  |EGPH|\
                \ |mail| <fn=1>|kbd|</fn>{}\
-               \ <action=`toggle-pipe.sh /tmp/mpris.st`>|" ++ (alias music) ++
+               \ <action=`toggle-pipe.sh /tmp/mpris.st`>|" ++ (alias m) ++
                "|</action>\
                \ |multicpu|  |top| |memory|\
                \ |diskio| |disku| \
                \ <fn=2>🕓  </fn>|datetime| |laTime| "
-}
+  } where m = music (pIsLight p)
 
 main :: IO ()
 main =
-- 
cgit v1.2.3