From c3c81cf5e642b0ad80b56458b8c1cd4eea10ddd8 Mon Sep 17 00:00:00 2001 From: jao Date: Sat, 20 Jun 2020 15:55:25 +0100 Subject: misc --- src/lib/Config.hs | 4 ++-- src/lib/Monitors.hs | 28 +++++++--------------------- src/lib/Music.hs | 6 +++--- 3 files changed, 12 insertions(+), 26 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Config.hs b/src/lib/Config.hs index c2a7720..b4db0b9 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -38,7 +38,7 @@ lightPalette = Palette { pNormal = "black" , pBorder = "grey80" , pForeground = "#000000" , pBackground = "white" - , pAlpha = 255 + , pAlpha = 0 , pIconRoot = icons "light" , pIsLight = True } @@ -61,7 +61,7 @@ darkPalette = Palette { pNormal = zenburnFg , pBorder = "black" -- zenburnBackLight , pForeground = zenburnFg , pBackground = doomBack -- zenburnBack - , pAlpha = 255 + , pAlpha = 100 , pIconRoot = icons "dark" , pIsLight = False } diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index ff27dd8..26183c5 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -91,8 +91,7 @@ weather' tmp st p = , ("partly cloudy", fn 3 "⛅") , ("mostly cloudy", fn 3 "☁") , ("considerable cloudiness", fn 4 "⛈")] - (mkArgs p ["-t", tmp , "-L","10", "-H", "25"] - ["-w", "", "-m", "False"]) + (mkArgs p ["-t", tmp , "-L","10", "-H", "25"] ["-w", ""]) 18000 weather = weather' " ° % ()" @@ -113,6 +112,11 @@ batt p = , "-H", "10", "-L", "7" , "-h", pHigh p, "-l", pLow p] 50 "batt0" +thinkTemp p = + MultiCoreTemp (mkArgs p + ["-t", "°C", "-L", "40", "-H", "70", "-d", "0"] + []) 50 + avgCoretemp p = MultiCoreTemp (p <~> ["-t", "°" , "-L", "50", "-H", "75", "-d", "0"]) 50 @@ -138,28 +142,10 @@ diskIO p = ] (diskArgs p) 10 -- 📨 🖅 🖃 📩 ✉ --- mbox = MBox [ ("L", "/var/mail/jao", "grey60") --- -- , ("B", "bigml.spool", "sienna4") --- -- , ("S", "bigsup.spool", "sienna4") --- -- , ("G", "geiser.spool", "darkseagreen4") --- -- , ("X", "xmobar.spool", "darkseagreen4") --- -- , ("g", "gnu.spool", "") --- -- , ("k", "books.spool", "") --- ] [] -- ["-p", "📩 ", "-s", ""] --- "mbox" - --- mail = Mail [ ("I", "~/var/maildir/jao/inbox") --- , ("G", "~/var/maildir/jao/geiser") --- , ("X", "~/var/maildir/jao/xmobar") --- , ("B", "~/var/maildir/bigml/inbox") --- , ("S", "~/var/maildir/bigml/support") --- ] --- "mail" - mail p = MailX [ ("I", "jao/inbox", pHigh p) , ("G", "jao/geiser", "") , ("X", "jao/xmobar", "") - , ("g", "jao/gnu", pLow p) + , ("b", "bigml/bugs", pHigh p) , ("B", "bigml/inbox", pHigh p) , ("S", "bigml/support", "") ] diff --git a/src/lib/Music.hs b/src/lib/Music.hs index 5544d50..db12519 100644 --- a/src/lib/Music.hs +++ b/src/lib/Music.hs @@ -8,9 +8,9 @@ import GMPDP (GMPDP(..)) mpris client width = Mpris2 client -- "clementine" -- - ["-t", " " ++ fc "sienna4" "<artist>" - ++ " <album> <length>" - , "-T", show width, "-E", "…", "-M", "100", "-x", ""] 10 + ["-t", "<tracknumber> <title> " ++ fc "sienna3" "<artist>" + ++ " <album> <length> <composer>" + , "-T", show width, "-E", "…", "-M", "100", "-x", ""] 40 mprisConfig client p = Bottom.config [Run (mpris client 165)] "|mpris2|" p -- cgit v1.2.3