linting and doom background

1 files changed, 15 insertions, 21 deletions

diff --git a/src/lib/Config.hs b/src/lib/Config.hs
index a8a8dc1..905773e 100644
--- a/src/lib/Config.hs
+++ b/src/lib/Config.hs
@@ -22,7 +22,7 @@ data Palette = Palette { pNormal :: String
                        }
 
 lightTheme :: IO Bool
-lightTheme = fmap (== (Just "light")) (lookupEnv "JAO_COLOR_SCHEME")
+lightTheme = fmap (== Just "light") (lookupEnv "JAO_COLOR_SCHEME")
 
 icons k = "/home/jao/.config/xmobar/icons/" ++ k
 
@@ -40,11 +40,13 @@ lightPalette = Palette { pNormal = "black"
                        }
 
 zenburnRed = "#CC9393"
-zenburnBack = "#2B2B2B"
+-- zenburnBack = "#2B2B2B"
+zenburnBack = "#1f1f1f"
 zenburnBackLight = "#383838"
 zenburnFg = "#989890" -- "#DCDCCC"
 zenburnYl = "#F0DFAF"
 zenburnGreen = "#7F9F7F"
+doomBack = "#22242b"
 
 darkPalette :: Palette
 darkPalette = Palette { pNormal = zenburnFg
@@ -52,9 +54,9 @@ darkPalette = Palette { pNormal = zenburnFg
                       , pHigh = zenburnRed
                       , pFont = "xft:Source Code Pro Medium-9"
                       -- , pFont = "xft:NotoMono-9,xft:Inconsolata-11"
-                      , pBorder = zenburnBackLight
+                      , pBorder = "black" -- zenburnBackLight
                       , pForeground = zenburnFg
-                      , pBackground = zenburnBack
+                      , pBackground = doomBack -- zenburnBack
                       , pAlpha = 255
                       , pIconRoot = icons "dark"
                       , pIsLight = False
@@ -69,15 +71,15 @@ baseConfig :: Palette -> Config
 baseConfig p = defaultConfig {
   font = pFont p
   , borderColor = pBorder p
-  , fgColor = (pForeground p)
-  , bgColor = (pBackground p)
+  , fgColor = pForeground p
+  , bgColor = pBackground p
   , additionalFonts = [ "xft:Symbola-9"
                       , "xft:Symbola-10"
                       , "xft:Symbola-11"
                       , "xft:Symbola-11"
                       , "xft:Hack-7"]
   , border = NoBorder
-  , alpha = (pAlpha p)
+  , alpha = pAlpha p
   , overrideRedirect = True
   , lowerOnStart = True
   , hideOnStart = False
@@ -85,24 +87,16 @@ baseConfig p = defaultConfig {
   , persistent = True
   , sepChar = "|"
   , alignSep = "{}"
-  , iconRoot = (pIconRoot p)
+  , iconRoot = pIconRoot p
   }
 
 (<~>) :: Palette -> [String] -> [String]
-(<~>) p args = concat [ args
-                      , [ "--low", (pLow p)
-                        , "--normal", (pNormal p)
-                        , "--high", (pHigh p)
-                        ]
-                      ]
+(<~>) p args =
+  args ++ [ "--low", pLow p , "--normal", pNormal p , "--high", pHigh p]
 
 (>~<) :: Palette -> [String] -> [String]
-(>~<) p args = concat [ args
-                      , [ "--low", (pHigh p)
-                        , "--normal", (pNormal p)
-                        , "--high", (pLow p)
-                        ]
-                      ]
+(>~<) p args =
+  args ++ [ "--low", pHigh p , "--normal", pNormal p , "--high", pLow p]
 
 mkArgs :: Palette -> [String] -> [String] -> [String]
-mkArgs p args extra = concat [(p <~> args), ["--"], extra]
+mkArgs p args extra = concat [p <~> args, ["--"], extra]