diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Config.hs | 17 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 5 | ||||
| -rw-r--r-- | src/lib/Music.hs | 7 |
3 files changed, 16 insertions, 13 deletions
diff --git a/src/lib/Config.hs b/src/lib/Config.hs index 1840755..7e1b2bb 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -38,7 +38,7 @@ lightPalette = Palette { pNormal = "#000000" , pLow = "#4d4d4d" , pHigh = "#a0522d" , pDim = "#999999" - , pFont = "xft:Source Code Pro Medium-9" + , pFont = "xft:DejaVu Sans Mono-8" , pBorder = "#cccccc" , pForeground = "#000000" , pBackground = "#ffffff" @@ -61,13 +61,8 @@ darkPalette :: Palette darkPalette = Palette { pNormal = zenburnFg , pLow = "darkseagreen4" -- zenburnGreen , pHigh = zenburnRed - , pFont = "xft:DejaVu Sans Mono-9" --- , pFont = "xft:Noto Sans Mono Medium-9" --- , pFont = "xft:PragmataPro-9" --- , pFont = "xft:Source Code Pro Medium-9" --- , pFont = "xft:IosevkaCC-9" + , pFont = "xft:DejaVu Sans Mono-8" , pDim = "#7f7f7f" - -- , pFont = "xft:NotoMono-9,xft:Inconsolata-11" , pBorder = "#000000" -- zenburnBackLight , pForeground = zenburnFg , pBackground = doomBack -- zenburnBack @@ -94,10 +89,10 @@ baseConfig p = defaultConfig { , "xft:Symbola-10" , "xft:Symbola-11" , "xft:Symbola-11" - , "xft:DejaVu Sans Mono-9" --- , "xft:Noto Sans Mono Medium-9" --- , "xft:IosevkaCC-9" - , "xft:FontAwesome-10"] + , "xft:Symbola-12" + , "xft:FontAwesome-10" + , "xft:FontAwesome-9"] + , border = NoBorder , alpha = pAlpha p , overrideRedirect = True diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index 3cede52..f09631b 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -102,13 +102,14 @@ weather' tmp st p = , ("considerable cloudiness", fn 4 "⛈") , ("light rain", fn 4 "🌧") , ("rain", fn 4 "⛆") - , ("ice crystals", fn 3 "❄") + , ("ice crystals", snow) , ("light snow", fn 3 "🌨") - , ("snow", fn 3 "❄") + , ("snow", snow) ] (mkArgs p ["-t", tmp , "-L","10", "-H", "25" , "-T", "25", "-E", ".."] ["-w", ""]) 18000 + where snow = fni "\xf2dc" weather = weather' "<skyConditionS> <tempC>° <rh>% <windKmh> (<hour>)" diff --git a/src/lib/Music.hs b/src/lib/Music.hs index 13a52a2..a2698c9 100644 --- a/src/lib/Music.hs +++ b/src/lib/Music.hs @@ -30,6 +30,13 @@ mpdt light = autoMPD l lgt = AutoMPD [ "-T", l, "-E", "…", "-W", "10", "-t", "<length> " ++ mpdt lgt] +mpdx a p i = + MPDX [ "-W", "12", "-b", "░", "-f", "▒", "-t", "<statei> <remaining>" + , "--", "-p", p, "-P", fni "\xf144", "-Z", fni i, "-S", fni i] 20 a + +mpdMon = mpdx "mpd" "6600" "\xf001" +mopMon = mpdx "mopidy" "6669" "\xf1bc" + mpdConfig p = (Bottom.config [Run mpd, Run (autoMPD "150" (pIsLight p))] "|mpd| |autompd|" p) { |