From 4181e8c47883dc456db4310f42212262d5a8ad1a Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 20 Nov 2020 23:13:14 +0300 Subject: bump dependencies + brittany/cabal-fmt --- src/XMonad/Custom/Theme.hs | 142 +++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 77 deletions(-) (limited to 'src/XMonad/Custom/Theme.hs') diff --git a/src/XMonad/Custom/Theme.hs b/src/XMonad/Custom/Theme.hs index 72d89fa..64b52a8 100644 --- a/src/XMonad/Custom/Theme.hs +++ b/src/XMonad/Custom/Theme.hs @@ -8,32 +8,32 @@ -- module XMonad.Custom.Theme - ( font - , black1 - , black2 - , red1 - , red2 - , green1 - , green2 - , yellow1 - , yellow2 - , blue1 - , blue2 - , magenta1 - , magenta2 - , cyan1 - , cyan2 - , white1 - , white2 - , colorN - , colorF - , gapBase - , gapFull - , border - , tabTheme - , promptTheme - , hotPromptTheme - ) where + ( font + , black1 + , black2 + , red1 + , red2 + , green1 + , green2 + , yellow1 + , yellow2 + , blue1 + , blue2 + , magenta1 + , magenta2 + , cyan1 + , cyan2 + , white1 + , white2 + , colorN + , colorF + , gapBase + , gapFull + , border + , tabTheme + , promptTheme + , hotPromptTheme + ) where import Data.Char import Data.Function @@ -41,49 +41,41 @@ import Data.List import Data.Ratio import Graphics.X11.Xlib.Types import XMonad.Layout.Decoration -import qualified XMonad.Prompt as P +import qualified XMonad.Prompt as P font :: String font = "xft:tewi:style=Regular:size=8" -- TODO CJKのフォールバックフォントを追加する black1, black2 :: String -- TODO get variables from Xresources -(black1, black2) = - ("#0b0806", "#2f2b2a") +(black1, black2) = ("#0b0806", "#2f2b2a") -- | Red red1, red2 :: String -(red1, red2) = - ("#844d2c", "#a64848") +(red1, red2) = ("#844d2c", "#a64848") -- | Green green1, green2 :: String -(green1, green2) = - ("#57553a", "#897f5a") +(green1, green2) = ("#57553a", "#897f5a") -- | Yellow yellow1, yellow2 :: String -(yellow1, yellow2) = - ("#a17c38", "#c8b38d") +(yellow1, yellow2) = ("#a17c38", "#c8b38d") -- | Blue blue1, blue2 :: String -(blue1, blue2) = - ("#41434f", "#526274") +(blue1, blue2) = ("#41434f", "#526274") -- | Magenta magenta1, magenta2 :: String -(magenta1, magenta2) = - ("#6b4444", "#755c47") +(magenta1, magenta2) = ("#6b4444", "#755c47") -- | Cyan cyan1, cyan2 :: String -(cyan1, cyan2) = - ("#59664c", "#718062") +(cyan1, cyan2) = ("#59664c", "#718062") -- | White white1, white2 :: String -(white1, white2) = - ("#a19782", "#c1ab83") +(white1, white2) = ("#a19782", "#c1ab83") colorN, colorF :: String colorN = black2 @@ -98,40 +90,36 @@ height = 12 * 2 border = 1 tabTheme :: Theme -tabTheme = def - { activeColor = black1 - , inactiveColor = black2 - , urgentColor = red1 - , activeBorderColor = white1 - , inactiveBorderColor = white2 - , urgentBorderColor = red2 - , activeTextColor = white1 - , inactiveTextColor = white2 - , urgentTextColor = red2 - , fontName = font - , decoHeight = height - } +tabTheme = def { activeColor = black1 + , inactiveColor = black2 + , urgentColor = red1 + , activeBorderColor = white1 + , inactiveBorderColor = white2 + , urgentBorderColor = red2 + , activeTextColor = white1 + , inactiveTextColor = white2 + , urgentTextColor = red2 + , fontName = font + , decoHeight = height + } promptTheme, hotPromptTheme :: P.XPConfig promptTheme = def - { P.font = font - , P.bgColor = black1 - , P.fgColor = white1 - , P.fgHLight = white2 - , P.bgHLight = black2 - , P.borderColor = white2 - , P.promptBorderWidth = border - , P.position = P.CenteredAt { P.xpCenterY = 3 % 10 - , P.xpWidth = 9 % 10 - } - , P.height = height - , P.maxComplRows = Just 5 - , P.searchPredicate = isInfixOf `on` map toLower - , P.alwaysHighlight = True - } -hotPromptTheme = promptTheme - { P.bgColor = black2 - , P.fgColor = white2 - , P.fgHLight = white1 - , P.bgHLight = black1 - } + { P.font = font + , P.bgColor = black1 + , P.fgColor = white1 + , P.fgHLight = white2 + , P.bgHLight = black2 + , P.borderColor = white2 + , P.promptBorderWidth = border + , P.position = P.CenteredAt { P.xpCenterY = 3 % 10, P.xpWidth = 9 % 10 } + , P.height = height + , P.maxComplRows = Just 5 + , P.searchPredicate = isInfixOf `on` map toLower + , P.alwaysHighlight = True + } +hotPromptTheme = promptTheme { P.bgColor = black2 + , P.fgColor = white2 + , P.fgHLight = white1 + , P.bgHLight = black1 + } -- cgit 1.4.1