From c8eaf7495e74b55f125455f58cd4872ae5022af4 Mon Sep 17 00:00:00 2001 From: jao Date: Wed, 6 Nov 2019 17:07:33 +0000 Subject: Playing with colors --- src/lib/Config.hs | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'src/lib/Config.hs') diff --git a/src/lib/Config.hs b/src/lib/Config.hs index 59d9f3d..119a4e5 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -1,4 +1,5 @@ -module Config (Palette(..), baseConfig, palette, (<~>), mkArgs, defaultHeight) +module Config ( + Palette(..), baseConfig, palette, (<~>), (>~<), mkArgs, defaultHeight) where import System.Environment (lookupEnv) @@ -23,6 +24,8 @@ data Palette = Palette { pNormal :: String lightTheme :: IO Bool lightTheme = fmap (== (Just "light")) (lookupEnv "JAO_COLOR_SCHEME") +icons k = "/home/jao/.config/xmobar/icons/" ++ k + lightPalette :: Palette lightPalette = Palette { pNormal = "black" , pLow = "#4d4d4d" @@ -32,21 +35,28 @@ lightPalette = Palette { pNormal = "black" , pForeground = "#000000" , pBackground = "white" , pAlpha = 255 - , pIconRoot = "/home/jao/.xmobar/icons/light" + , pIconRoot = icons "light" , pIsLight = True } +zenburnRed = "#CC9393" +zenburnBack = "#2B2B2B" +zenburnBackLight = "#383838" +zenburnFg = "#DCDCCC" +zenburnYl = "#F0DFAF" +zenburnGreen = "#7F9F7F" + darkPalette :: Palette -darkPalette = Palette { pNormal = "gray77" - , pLow = "gray60" - , pHigh = "#a0522d" +darkPalette = Palette { pNormal = zenburnFg + , pLow = zenburnGreen + , pHigh = zenburnRed , pFont = "xft:Source Code Pro Medium-9" -- , pFont = "xft:NotoMono-9,xft:Inconsolata-11" - , pBorder = "grey30" - , pForeground = "grey77" -- "grey60" - , pBackground = "#2B2B2B" -- "black" + , pBorder = zenburnBackLight + , pForeground = zenburnFg + , pBackground = zenburnBack , pAlpha = 255 - , pIconRoot = "/home/jao/.xmobar/icons/dark" + , pIconRoot = icons "dark" , pIsLight = False } @@ -86,5 +96,13 @@ baseConfig p = defaultConfig { ] ] +(>~<) :: Palette -> [String] -> [String] +(>~<) p args = concat [ args + , [ "--low", (pHigh p) + , "--normal", (pNormal p) + , "--high", (pLow p) + ] + ] + mkArgs :: Palette -> [String] -> [String] -> [String] mkArgs p args extra = concat [(p <~> args), ["--"], extra] -- cgit v1.2.3