diff options
| -rw-r--r-- | src/TopC.hs | 13 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/TopC.hs b/src/TopC.hs index 5c87702..5c9964e 100644 --- a/src/TopC.hs +++ b/src/TopC.hs @@ -35,7 +35,6 @@ musicMPRIS p = mpris p mprisName 180 -- music p = toggleMonitor "/tmp/mpris.st" (pollMPD (pIsLight p)) (musicMPRIS p) music = pollMPD . pIsLight --- <fn=1> 💡 </fn> config p = (baseConfig p) { position = TopSize C 100 (defaultHeight - 1) , textOffset = defaultHeight - 8 @@ -66,11 +65,12 @@ config p = (baseConfig p) { ] , template = " " ++ "|batt0| " - ++ fni "\xf185" ++ " |bright| " - ++ "<action=`toggle-app.sh nm-applet`>|proton0||wlp1s0wi|</action> " + ++ dimi "\xf26c" ++ " |bright| " + ++ "<action=`toggle-app.sh nm-applet`> |proton0||wlp1s0wi|</action> " ++ "|dynnetwork| " - ++ "<action=`toggle-app.sh pasystray`>|default:Master| \ - \|default:Capture|</action> " + ++ "<action=`toggle-app.sh pasystray`>" + ++ " |default:Master| " ++ dimi "\xf130" ++ " |default:Capture|" + ++ "</action> " ++ ma ++ " |EGPH| " ++ " {} " @@ -83,7 +83,8 @@ config p = (baseConfig p) { ++ fni "\xf0a0" ++ fc "grey60" " |diskio|" ++ " |disku| " ++ fni "\xf017" ++ " |datetime| " ++ "|laTime| " - } where m = music p + } where dimi = fc (pDim p) . fni + m = music p ma = " |" ++ alias m ++ "| " w = (weather' "<skyConditionS> <tempC>° <weather>" "EGPH" p) diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index 35601cd..ddea7e5 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -79,13 +79,13 @@ uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S" -- 🌧 weather' tmp st p = WeatherX st - [ ("", fc "gray60" $ fn 4 "🌑") + [ ("", fc (pDim p) $ fni "\xf185") , ("clear", fn 4 "🌣") - , ("sunny", fn 4 "🌣") + , ("sunny", fc (pHigh p) $ fn 4 "🌣") + , ("fair", fn 4 "🌣") , ("mostly clear", fn 4 "🌤") , ("mostly sunny", fn 4 "🌤") , ("partly sunny", fn 3 "⛅") - , ("fair", fn 4 "🌑") , ("obscured", fn 4 "🌁") -- 🌫 , ("cloudy", fn 3 "☁") , ("overcast", fn 3 "☁") |