diff options
| -rw-r--r-- | src/lib/Bottom.hs | 2 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 37 |
2 files changed, 27 insertions, 12 deletions
diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs index 8fb7fe6..00cc868 100644 --- a/src/lib/Bottom.hs +++ b/src/lib/Bottom.hs @@ -16,7 +16,7 @@ config cs tpl p = (baseConfig p) { \ <action=`toggle-pasystray.sh `><fn=2>🎧</fn>|default:Master|\ \ |default:Capture|</action> <fn=2>🎵</fn>" ++ tpl - ++ " {} |mbox| <fn=2>🌤</fn> |EGPH| \ + ++ " {} |mbox| |EGPH| \ \ <fn=2>⏰ </fn>|uptime| <fn=2>🕓 </fn>|datetime| |laTime| " , commands = [ Run (uptime p) , Run (wireless p) diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index 1ad3c89..f3e76f1 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -61,20 +61,35 @@ uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S" , "On" , "-L", "10", "-H", "100"]) 600 weather st = - Weather st ["-t", "<tempC>° <rh>% <windKmh> <skyCondition> (<hour>)" - , "-L","10", "-H", "25", "--normal", "black", - "--high", "lightgoldenrod4", "--low", "darkseagreen4"] 18000 + WeatherX st + [ ("clear", "🌣") + , ("sunny", "🌣") + , ("mostly clear", "🌤") + , ("mostly sunny", "🌤") + , ("partly sunny", "⛅") + , ("fair", "🌑") + , ("cloudy","☁") + , ("overcast","☁") + , ("partly cloudy", "⛅") + , ("mostly cloudy", "🌧") + , ("considerable cloudiness", "⛈")] + ["-t", "<fn=2><skyConditionS></fn> <tempC>° <rh>% <windKmh> (<hour>)" + , "-L","10", "-H", "25", "--normal", "black" + , "--high", "lightgoldenrod4", "--low", "darkseagreen4"] + 18000 batt p = BatteryN ["BAT0"] - ((p <~> ["-t", "<acstatus> <left>%" - , "-S", "Off", "-d", "0", "-m", "3" - , "-L", "10", "-H", "80", "-p", "3"]) - ++ [ "--" - , "-i", "<fn=2>🔌</fn>", "-O", " <fn=2>🔌</fn> <timeleft> <watts>" - , "-o", " <fn=2>🔋</fn> <timeleft> <watts>" - , "-H", "16", "-L", "10" - , "-h", "sienna4", "-l", "gray20"]) 50 "batt0" + ["-t", "<acstatus> <left>%" + , "-S", "Off", "-d", "0", "-m", "3" + , "-L", "10", "-H", "90", "-p", "3" + , "--low", (pHigh p), "--normal", (pNormal p), "--high", (pLow p) + , "--" + , "-i", "<fn=2>🔌</fn>" + , "-O", " <fn=2>🔌</fn> <timeleft> <watts>" + , "-o", " <fn=2>🔋</fn> <timeleft> <watts>" + , "-H", "16", "-L", "10" + , "-h", "sienna4", "-l", "gray20"] 50 "batt0" coreTemp p = CoreTemp (p <~> ["-t", "<core1>° <core2>°" |