diff options
| -rw-r--r-- | src/TopC.hs | 9 | ||||
| -rw-r--r-- | src/lib/Config.hs | 5 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 18 |
3 files changed, 23 insertions, 9 deletions
diff --git a/src/TopC.hs b/src/TopC.hs index b24355e..5c87702 100644 --- a/src/TopC.hs +++ b/src/TopC.hs @@ -21,7 +21,8 @@ autoMPD light = AutoMPD [ "-T", "110", "-E", "…", "-W", "10", "-t" , pollMPD light = MPD [ "-T", "120", "-W", "10", "-E", "…", "-t", tm, "--", "-p", "6600"] 20 - where tm = fc "grey40" (fni "\xf001") ++ " <remaining> " ++ "<ppos>/<plength>" + where tm = fc "grey40" (fni "\xf001") ++ " <remaining> <length> " + -- ++ "<ppos>/<plength>" -- ++ mpdt light -- mprisName = "MellowPlayer3" @@ -46,7 +47,7 @@ config p = (baseConfig p) { , commands = [ Run (topProcL p) , Run m , Run (thinkTemp p) --- , Run (mail p) + , Run (mail p) , Run (cpuBars p) , Run memory , Run (diskU p) @@ -73,8 +74,8 @@ config p = (baseConfig p) { ++ ma ++ " |EGPH| " ++ " {} " --- ++ "|mail|" - ++ " |kbd| " + ++ "|kbd| " + ++ "|mail| " ++ "|multicpu| " ++ "|multicoretemp| " ++ " |top| " diff --git a/src/lib/Config.hs b/src/lib/Config.hs index 0cc4f8b..6f2ee37 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -13,6 +13,7 @@ defaultHeight = 24 data Palette = Palette { pNormal :: String , pLow :: String , pHigh :: String + , pDim :: String , pFont :: String , pBorder :: String , pForeground :: String @@ -35,6 +36,7 @@ lightPalette :: Palette lightPalette = Palette { pNormal = "black" , pLow = "#4d4d4d" , pHigh = "#a0522d" + , pDim = "grey60" , pFont = "xft:Source Code Pro Medium-9" , pBorder = "grey80" , pForeground = "#000000" @@ -55,9 +57,10 @@ doomBack = "#22242b" darkPalette :: Palette darkPalette = Palette { pNormal = zenburnFg - , pLow = zenburnGreen + , pLow = "darkseagreen4" -- zenburnGreen , pHigh = zenburnRed , pFont = "xft:Source Code Pro Medium-9" + , pDim = "grey50" -- , pFont = "xft:NotoMono-9,xft:Inconsolata-11" , pBorder = "black" -- zenburnBackLight , pForeground = zenburnFg diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index b1b5efe..35601cd 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -161,14 +161,24 @@ diskIO p = ] (diskArgs p) 10 -- <fn=1>📨 🖅 🖃 📩 ✉ </fn> +-- (fni "\xf01c \xf03a \xf1fa \xf0e0 \xf1d8 ") mail p = MailX [ ("I", "jao/inbox", pHigh p) - , ("G", "jao/geiser", "") - , ("X", "jao/xmobar", "") - , ("b", "bigml/bugs", pHigh p) , ("B", "bigml/inbox", pHigh p) + , ("b", "bigml/bugs", pHigh p) , ("S", "bigml/support", "") + , ("G", "jao/geiser", "") + , ("X", "jao/xmobar", "") + , ("e", "feeds/emacs", pDim p) + , ("p", "feeds/papers", pDim p) + , ("l", "feeds/lobsters", pDim p) + , ("c", "feeds/computers", pDim p) + , ("n", "feeds/news", pDim p) + , ("L", "bigml/lists", pDim p) + ] + [ "-d", "~/var/mail" + , "-p", fc (pLow p) (fni "\xf01c" ++ " ") + , "-s", " " ] - ["-d", "~/var/mail", "-p", " ", "-s", " "] "mail" masterVol p = |