diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/TopC.hs | 22 | ||||
| -rw-r--r-- | src/lib/Bottom.hs | 2 | ||||
| -rw-r--r-- | src/lib/Config.hs | 15 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 9 | ||||
| -rw-r--r-- | src/lib/Music.hs | 8 |
5 files changed, 32 insertions, 24 deletions
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 = diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs index 3cc4d85..a6a79c4 100644 --- a/src/lib/Bottom.hs +++ b/src/lib/Bottom.hs @@ -24,7 +24,7 @@ config cs tpl 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 trayPadding , Run mail , Run masterVol diff --git a/src/lib/Config.hs b/src/lib/Config.hs index 8f05a88..59d9f3d 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -17,6 +17,7 @@ data Palette = Palette { pNormal :: String , pBackground :: String , pAlpha :: Int , pIconRoot :: String + , pIsLight :: Bool } lightTheme :: IO Bool @@ -32,19 +33,21 @@ lightPalette = Palette { pNormal = "black" , pBackground = "white" , pAlpha = 255 , pIconRoot = "/home/jao/.xmobar/icons/light" + , pIsLight = True } darkPalette :: Palette -darkPalette = Palette { pNormal = "grey60" - , pLow = "gray50" +darkPalette = Palette { pNormal = "gray77" + , pLow = "gray60" , pHigh = "#a0522d" - , pFont = "xft:Source Code Pro Medium-10" + , pFont = "xft:Source Code Pro Medium-9" -- , pFont = "xft:NotoMono-9,xft:Inconsolata-11" , pBorder = "grey30" - , pForeground = "grey60" - , pBackground = "black" - , pAlpha = 0 + , pForeground = "grey77" -- "grey60" + , pBackground = "#2B2B2B" -- "black" + , pAlpha = 255 , pIconRoot = "/home/jao/.xmobar/icons/dark" + , pIsLight = False } palette :: IO Palette diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index 42f0966..c0a890c 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -76,7 +76,7 @@ uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S" , "On" , "-L", "10", "-H", "100"]) 600 -- 🌧 -weather st = +weather st p = WeatherX st [ ("", "<fc=gray60><fn=4>🌑</fn></fc>") , ("clear", "<fn=4>🌣</fn>") @@ -91,9 +91,8 @@ weather st = , ("partly cloudy", "<fn=3>⛅</fn>") , ("mostly cloudy", "<fn=3>☁</fn>") , ("considerable cloudiness", "<fn=4>⛈</fn>")] - ["-t", "<skyConditionS> <tempC>° <rh>% <windKmh> (<hour>)" - , "-L","10", "-H", "25", "--normal", "black" - , "--high", "lightgoldenrod4", "--low", "darkseagreen4"] + (p <~> ["-t", "<skyConditionS> <tempC>° <rh>% <windKmh>" + , "-L","10", "-H", "25"]) 18000 batt p = @@ -166,7 +165,7 @@ masterVol = Volume "default" "Master" ["-t", "<status> <volume>" , "--", "-C", "black", "-c", "sienna4" - , "-O", "<fn=1>🎧</fn>" + , "-O", "<fn=4>🎧</fn>" , "-o", "<fn=4>🔇</fn>"] 10 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10 diff --git a/src/lib/Music.hs b/src/lib/Music.hs index fa6e278..304a1fc 100644 --- a/src/lib/Music.hs +++ b/src/lib/Music.hs @@ -5,14 +5,14 @@ import Monitors import qualified Bottom import Config (defaultHeight) -mpris client = +mpris client width = Mpris2 client -- "clementine" -- ["-t", " <fn=0><tracknumber>\ \ <title> <fc=sienna4><artist></fc>\ \ <album> <length></fn>" - , "-T", "165", "-E", "...", "-M", "100", "-x", ""] 10 + , "-T", show width, "-E", "...", "-M", "100", "-x", ""] 10 -mprisConfig client p = Bottom.config [Run (mpris client)] "|mpris2|" p +mprisConfig client p = Bottom.config [Run (mpris client 165)] "|mpris2|" p mpd = MPD [ "-W", "12", "-b", "░", "-f", "▒", "-t" , " <lapsed> <fc=honeydew3><fn=5><bar></fn></fc>"] 10 -- fn=5 @@ -31,7 +31,7 @@ mpdConfig p = (Bottom.config [Run mpd, Run (autoMPD "150")] "|mpd| |autompd|" p) } compMPD = concatMonitor " " mpd (autoMPD "150") -alt x = altMonitor (mpris x) compMPD +alt x = altMonitor (mpris x 165) compMPD config cl = if cl == "mpd" |