From 58f15bfaeab5fa76138914643dff73732f2bbe51 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Tue, 22 Feb 2022 11:45:49 +1000 Subject: [PATCH] termonad: switched to dracula --- .config/termonad/termonad.hs | 97 +++++++++++------------------------- 1 file changed, 30 insertions(+), 67 deletions(-) diff --git a/.config/termonad/termonad.hs b/.config/termonad/termonad.hs index 91f7ae9..85782b9 100644 --- a/.config/termonad/termonad.hs +++ b/.config/termonad/termonad.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} -- | This is my Termonad configuration. --- Currently defaults to PaperColor +-- Currently defaults to Dracula module Main where @@ -59,77 +59,41 @@ myTMConfig = } } --- This is our PaperColor dark 'ColourConfig'. It holds all of our dark-related settings. -paperColorDark :: ColourConfig (AlphaColour Double) -paperColorDark = +-- This is our Dracula 'ColourConfig'. +dracula :: ColourConfig (AlphaColour Double) +dracula = defaultColourConfig -- Set the default background & foreground colour of text of the terminal. - { backgroundColour = Set (createColour 28 28 28) -- black.0 - , foregroundColour = Set (createColour 208 208 208) -- white.7 - -- Set the extended palette that has 2 Vecs of 8 PaperColor palette colours - , palette = ExtendedPalette paperColorNormal paperColorBright + { backgroundColour = Set (createColour 40 42 54) -- black.0 + , foregroundColour = Set (createColour 248 248 242) -- white.7 + -- Set the extended palette that has 2 Vecs of 8 Dracula palette colours + , palette = ExtendedPalette draculaNormal draculaBright } where - paperColorNormal :: List8 (AlphaColour Double) - paperColorNormal = fromMaybe defaultStandardColours $ mkList8 - [ createColour 28 28 28 -- black.0 - , createColour 175 0 95 -- red.1 - , createColour 95 175 0 -- green.2 - , createColour 215 175 95 -- yellow.3 - , createColour 95 175 215 -- blue.4 - , createColour 128 128 128 -- purple.5 - , createColour 215 135 95 -- aqua.6 - , createColour 208 208 208 -- white.7 + draculaNormal :: List8 (AlphaColour Double) + draculaNormal = fromMaybe defaultStandardColours $ mkList8 + [ createColour 40 42 54 -- black.0 + , createColour 255 85 85 -- red.1 + , createColour 80 250 123 -- green.2 + , createColour 241 250 140 -- yellow.3 + , createColour 189 147 249 -- blue.4 + , createColour 255 121 198 -- magenta.5 + , createColour 139 233 253 -- cyan.6 + , createColour 248 248 242 -- white.7 ] - paperColorBright :: List8 (AlphaColour Double) - paperColorBright = fromMaybe defaultStandardColours $ mkList8 - [ createColour 88 88 88 -- black.8 - , createColour 95 175 95 -- red.9 - , createColour 175 215 0 -- green.10 - , createColour 175 135 215 -- yellow.11 - , createColour 255 175 0 -- blue.12 - , createColour 255 95 175 -- purple.13 - , createColour 0 175 175 -- aqua.14 - , createColour 95 135 135 -- white.15 + draculaBright :: List8 (AlphaColour Double) + draculaBright = fromMaybe defaultStandardColours $ mkList8 + [ createColour 77 77 77 -- black.8 + , createColour 255 110 103 -- red.9 + , createColour 90 247 142 -- green.10 + , createColour 244 249 157 -- yellow.11 + , createColour 202 169 250 -- blue.12 + , createColour 255 146 208 -- magenta.13 + , createColour 154 237 254 -- cyan.14 + , createColour 230 230 230 -- white.15 ] --- This is our PaperColor light 'ColourConfig'. It holds all of our light-related settings -paperColorLight :: ColourConfig (AlphaColour Double) -paperColorLight = - defaultColourConfig - -- Set the default background & foreground colour of text of the terminal. - { backgroundColour = Set (createColour 238 238 238) -- black.0 - , foregroundColour = Set (createColour 68 68 68) -- white.7 - -- Set the extended palette that has 2 Vecs of 8 PaperColor palette colours - , palette = ExtendedPalette paperColorNormal paperColorBright - } - where - paperColorNormal :: List8 (AlphaColour Double) - paperColorNormal = fromMaybe defaultLightColours $ mkList8 - [ createColour 238 238 238 -- black.0 - , createColour 175 0 0 -- red.1 - , createColour 0 135 0 -- green.2 - , createColour 95 135 0 -- yellow.3 - , createColour 0 135 175 -- blue.4 - , createColour 135 135 135 -- purple.5 - , createColour 0 95 135 -- aqua.6 - , createColour 68 68 68 -- white.7 - ] - - paperColorBright :: List8 (AlphaColour Double) - paperColorBright = fromMaybe defaultLightColours $ mkList8 - [ createColour 188 188 188 -- black.8 - , createColour 215 0 0 -- red.9 - , createColour 215 0 135 -- green.10 - , createColour 135 0 175 -- yellow.11 - , createColour 215 95 0 -- blue.12 - , createColour 215 95 0 -- purple.13 - , createColour 0 95 175 -- aqua.14 - , createColour 0 95 135 -- white.15 - ] - - -- This defines the font for the terminal. fontConf :: FontConfig fontConf = @@ -137,14 +101,13 @@ fontConf = -- { fontFamily = "Droid Sans Mono Dotted for Powerline" -- { fontFamily = "Inconsolata for Powerline" { fontFamily = "Inconsolata-g for Powerline" - , fontSize = FontSizePoints 6 + , fontSize = FontSizePoints 8 } main :: IO () main = do -- First, create the colour extension based on either PaperColor modules. - --myColourExt <- createColourExtension paperColorDark - myColourExt <- createColourExtension paperColorLight + myColourExt <- createColourExtension dracula -- Update 'myTMConfig' with our colour extension. let newTMConfig = addColourExtension myTMConfig myColourExt