diff options
Diffstat (limited to 'lib/Monitors.hs')
| -rw-r--r-- | lib/Monitors.hs | 102 |
1 files changed, 36 insertions, 66 deletions
diff --git a/lib/Monitors.hs b/lib/Monitors.hs index d154ec3..ddff5b4 100644 --- a/lib/Monitors.hs +++ b/lib/Monitors.hs @@ -8,40 +8,6 @@ import Control.Concurrent.STM import qualified Data.Char as Char import qualified Text.Printf as Printf -data CombinedMonitor a b = CombinedMonitor a b (String -> String -> String) - -instance (Show a, Show b) => Show (CombinedMonitor a b) where - show (CombinedMonitor a b _) = "Alt (" ++ show a ++ ") (" ++ show b ++ ")" - -instance (Read a, Read b) => Read (CombinedMonitor a b) where - readsPrec _ = undefined - -instance (Exec a, Exec b) => Exec (CombinedMonitor a b) where - alias (CombinedMonitor a b _) = alias a ++ "_" ++ alias b - rate (CombinedMonitor a b _) = min (rate a) (rate b) - start (CombinedMonitor a b comb) cb - = startMonitors a b (\s t -> cb $ comb s t) - -startMonitors a b cmb = do - sta <- atomically $ newTVar "" - stb <- atomically $ newTVar "" - _ <- async $ start a (atomically . writeTVar sta) - _ <- async $ start b (atomically . writeTVar stb) - go sta stb - where go sta' stb' = do - s <- readTVarIO sta' - t <- readTVarIO stb' - cmb s t - tenthSeconds $ min (rate b) (rate a) - go sta' stb' - -guardedMonitor a p = CombinedMonitor (PipeReader p (alias a ++ "_g")) a f - where f s t = if null s || head s == '0' then "" else t - -altMonitor a b = CombinedMonitor a b (\s t -> if null s then t else s) -concatMonitor sep a b = CombinedMonitor a b (\s t -> s ++ sep ++ t) -toggleMonitor path a = altMonitor (guardedMonitor a path) - topProc p = TopProc (p <~> ["-t" , "<mboth3> <mboth2> <mboth1> \ \ยท <both3> <both2> <both1>" , "-w", "10", "-L" , "10", "-H", "80"]) 15 @@ -80,32 +46,32 @@ uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S" weather' tmp st p = WeatherX st - [ ("", fc (pDim p) (fn 4 "๐ก")) - , ("clear", fn 4 "๐ฃ") - , ("sunny", fc (pHigh p) $ fn 4 "๐ฃ") - , ("fair", fn 4 "๐ฃ") - , ("mostly clear", fn 4 "๐ค") - , ("mostly sunny", fn 4 "๐ค") - , ("partly sunny", fn 3 "โ
") - , ("obscured", fn 4 "๐") -- ๐ซ - , ("mist", fn 4 "๐") - , ("cloudy", fn 3 "โ") - , ("overcast", fn 3 "โ๏ธ") - , ("partly cloudy", fn 3 "โ
") - , ("mostly cloudy", fn 3 "โ๏ธ") - , ("considerable cloudiness", fn 3 "โ๏ธ") - , ("light rain", fn 4 "๐ง") - , ("rain", fn 4 "โ") - , ("ice crystals", snow) - , ("light snow", fn 3 "๐จ") - , ("snow", snow) + [ ("", "\129695") + , ("clear", "๐") + , ("sunny", "๐") + , ("fair", "๐") + , ("mostly clear", "๐ค๏ธ") + , ("mostly sunny", "๐ค๏ธ") + , ("partly sunny", "โ
") + , ("obscured", "๐") + , ("fog", "๐ซ๏ธ") + , ("foggy", "๐ซ๏ธ") + , ("cloudy", "โ๏ธ") + , ("overcast", "โ๏ธ") + , ("partly cloudy", "โ
") + , ("mostly cloudy", "โ๏ธ") + , ("considerable cloudiness", "๐") + , ("light rain", "๐ฆ๏ธ") + , ("rain", "๐จ๏ธ") + , ("ice crystals", "โ๏ธ") + , ("light snow", "๐จ๏ธ") + , ("snow", "โ๏ธ") ] - (mkArgs p ["-t", tmp , "-L","10", "-H", "25" , "-T", "25", "-E", ".."] + (mkArgs p ["-t", tmp , "-L", "10", "-H", "25" , "-T", "25", "-E", "โฆ"] ["-w", ""]) 18000 - where snow = fni "\xf2dc" -weather = weather' "<skyConditionS> <tempC>ยฐ <rh>% <windKmh> (<hour>)" +weather = weather' "<skyConditionS> <tempC>ยฐ <windKmh> <weather>" -- "https://wttr.in?format=" ++ fnn 3 "%c" ++ "+%t+%C+%w++" ++ fnn 1 "%m" -- , Run (ComX "curl" [wttrURL "Edinburgh"] "" "wttr" 18000) @@ -128,9 +94,9 @@ batt p = , "-P" , "-a", "notify-send -u critical 'Battery running out!!!!!!'" , "-A", "7" - , "-i", fn 2 "\9211" - , "-O", fn 2 " \9211" ++ " <timeleft> <watts>" - , "-o", fn 2 " ๐" ++ " <timeleft> <watts>" + , "-i", fn 1 "\9211" + , "-O", fn 1 " \9211" ++ " <timeleft> <watts>" + , "-o", fn 1 " ๐" ++ " <timeleft> <watts>" , "-H", "10", "-L", "7" , "-h", pHigh p, "-l", pLow p] 50 "batt0" @@ -140,15 +106,15 @@ iconBatt p = , "-S", "Off", "-d", "0", "-m", "2" , "-L", "10", "-H", "90", "-p", "2" , "-W", "0", "-f", - "\xf244\xf243\xf243\xf243\xf242\xf242\xf242\xf241\xf241\xf240" + "\xf244\xf243\xf243\xf242\xf242\xf242\xf241\xf241\xf241\xf240" , "--low", pHigh p, "--normal", pNormal p, "--high", pLow p , "--" , "-P" , "-a", "notify-send -u critical 'Battery running out!!!!!!'" , "-A", "5" - , "-i", fni "\xf011" - , "-O", fni "\xf1e6 <leftbar>" ++ " <left> <watts> <timeleft>" - , "-o", fni "<leftbar>" ++ " <left> <watts> <timeleft>" + , "-i", fn 1 "\xf011" + , "-O", fn 1 "\xf1e6 <leftbar>" ++ " <left> <watts> <timeleft>" + , "-o", fn 1 "<leftbar>" ++ " <left> <watts> <timeleft>" , "-H", "10", "-L", "7" , "-h", pHigh p, "-l", pLow p] 50 "batt0" @@ -202,18 +168,22 @@ mail p = MailX [ ("I", "jao/inbox", pHigh p) [ "-d", "~/var/mail", "-s", " "] "mail" +nmmail = NotmuchMail "mail" [MailItem "J" "" qj, MailItem "B" "" qb] 100 + where qb = "(tag:bigml or tag:alba) and tag:new" + qj = "(tag:jao or tag:hacking or tag:bills) and tag:new" + masterVol p = Volume "default" "Master" ["-t", "<status> <volume>" , "--", "-C", pForeground p, "-c", "#8b4726" - , "-O", fni "\xf025" -- "\xf130" fn 4 "๐ง" - , "-o", fn 4 "๐" + , "-O", fn 1 "\xf025" + , "-o", fn 1 "\xf131" ] 10 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10 kbd p = Kbd [("us", ""), ("us(intl)", kbi pHigh)] -- kbi pDim - where kbi a = fc (a p) (fni " \xf11c") + where kbi a = fc (a p) (fn 1 " \xf11c") brightness = Brightness ["--", "-D", "intel_backlight"] 10 brightness' = Brightness ["--", "-D", "amdgpu_bl0", "-C", "brightness"] 10 |