diff options
Diffstat (limited to 'src/TopC.hs')
| -rw-r--r-- | src/TopC.hs | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/src/TopC.hs b/src/TopC.hs index 45d2453..b4b4afa 100644 --- a/src/TopC.hs +++ b/src/TopC.hs @@ -1,31 +1,41 @@ import Xmobar import Config import Monitors -import Music (mpris) +import Music (mpris, gpmd) -topProcL p = TopProc (p <~> ["-t" , "<both1> <mboth1>" +topProcL p = TopProc (p <~> ["-t" , "<both1> <both2> <mboth1> <mboth2>" , "-w", "10", "-L" , "10", "-H", "80"]) 15 -diskIOL p = DiskIO [("/", "<totalbvbar>"), ("/home", "<totalbvbar>")] +diskIOL p = DiskIO [("/", "<totalbipat>"), ("/home", "<totalbipat>")] (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>"] +mpdt light = + if light + then "<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>" + else "<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>" -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>"] +autoMPD light = AutoMPD [ "-T", "110", "-E", "…", "-W", "10", "-t" , mpdt light] -compMPD light = concatMonitor " " mpd (if light then autoMPD else autoMPDD) -music light = toggleMonitor "/tmp/mpris.st" (mpris "spotify" 120) (compMPD light) +ompd light = + MPD [ "-T", "120", "-W", "10", "-E", "…", "-t", tm, "--", "-p", "6669"] 20 + where tm = " <remaining> " ++ mpdt light + +compMPD light = concatMonitor " " mpd (autoMPD light) +mpn = "spotify" +-- mpn = "google_play_music_desktop_player" +-- music light = toggleMonitor "/tmp/mpris.st" (mpris mpn 120) (compMPD light) +-- music light = toggleMonitor "/tmp/mpris.st" gpmd (compMPD light) +music light = toggleMonitor "/tmp/mpris.st" (compMPD light) (ompd light) +-- music light = ompd light -- <fn=1> 💡 </fn> config p = (baseConfig p) { @@ -43,27 +53,27 @@ 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 "EGPH" p) -- LEGE, LEBL, KCV0 - , Run (mail p) + , Run (weather' "<skyConditionS> <tempC>°" "EGPH" p) -- LEGE, LEBL, KCV0 + -- , Run (mail p) , Run masterVol , Run captureVol , Run laTime , Run localTime ] - , template = " |batt0| |bright|\ + , template = " |bright|\ \ <action=`toggle-app.sh nm-applet`>|tun0||wlp1s0wi|</action> \ \ |dynnetwork| \ \ <action=`toggle-app.sh pasystray`>|default:Master|\ \ |default:Capture|</action> |EGPH|\ - \|mail|<fn=1>|kbd|</fn>{}\ + \<fn=1>|kbd|</fn>{}\ \ <action=`toggle-pipe.sh /tmp/mpris.st`>|" ++ (alias m) ++ "|</action>\ \ |multicpu| |top| |memory|\ - \ |diskio| |disku| \ + \ <fc=grey60>|diskio|</fc> |disku| \ \ <fn=2>🕓 </fn>|datetime| |laTime| " } where m = music (pIsLight p) |