From 987d373e940a1c19ab672af1e73841d5c546f49f Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 28 May 2021 16:18:47 +1000 Subject: [PATCH] termonad: switched to paperColor --- .config/termonad/termonad.hs | 192 ++++++++++++----------------------- 1 file changed, 63 insertions(+), 129 deletions(-) diff --git a/.config/termonad/termonad.hs b/.config/termonad/termonad.hs index d62105d..91f7ae9 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 Gruvbox +-- Currently defaults to PaperColor module Main where @@ -59,158 +59,92 @@ myTMConfig = } } --- This is our Gruvbox dark 'ColourConfig'. It holds all of our dark-related settings. -gruvboxDark :: ColourConfig (AlphaColour Double) -gruvboxDark = +-- This is our PaperColor dark 'ColourConfig'. It holds all of our dark-related settings. +paperColorDark :: ColourConfig (AlphaColour Double) +paperColorDark = defaultColourConfig - -- Set the default foreground colour of text of the terminal. - { foregroundColour = Set (createColour 213 196 161) -- fg2 - , backgroundColour = Set (createColour 40 40 40) -- bg0 - -- Set the extended palette that has 2 Vecs of 8 Gruvbox palette colours - , palette = ExtendedPalette gruvboxDark1 gruvboxDark2 + -- 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 } where - gruvboxDark1 :: List8 (AlphaColour Double) - gruvboxDark1 = fromMaybe defaultStandardColours $ mkList8 - [ createColour 40 40 40 -- bg0 - , createColour 204 36 29 -- red.1 - , createColour 152 151 26 -- green.2 - , createColour 215 153 33 -- yellow.3 - , createColour 69 133 136 -- blue.4 - , createColour 177 98 134 -- purple.5 - , createColour 104 157 106 -- aqua.6 - , createColour 189 174 147 -- fg3 + 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 ] - gruvboxDark2 :: List8 (AlphaColour Double) - gruvboxDark2 = fromMaybe defaultStandardColours $ mkList8 - [ createColour 124 111 100 -- bg4 - , createColour 251 71 52 -- red.9 - , createColour 184 187 38 -- green.10 - , createColour 250 189 47 -- yellow.11 - , createColour 131 165 152 -- blue.12 - , createColour 211 134 155 -- purple.13 - , createColour 142 192 124 -- aqua.14 - , createColour 235 219 178 -- fg1 + 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 ] --- This is our Gruvbox light 'ColourConfig'. It holds all of our dark-related settings. -gruvboxLight :: ColourConfig (AlphaColour Double) -gruvboxLight = +-- This is our PaperColor light 'ColourConfig'. It holds all of our light-related settings +paperColorLight :: ColourConfig (AlphaColour Double) +paperColorLight = defaultColourConfig - -- Set the default foreground colour of text of the terminal. - { foregroundColour = Set (createColour 60 56 54) -- fg1 - , backgroundColour = Set (createColour 251 241 199) -- bg0 - -- Set the extended palette that has 2 Vecs of 8 Gruvbox palette colours - , palette = ExtendedPalette gruvboxLight1 gruvboxLight2 + -- 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 - gruvboxLight1 :: List8 (AlphaColour Double) - gruvboxLight1 = fromMaybe defaultStandardColours $ mkList8 - [ createColour 251 241 199 -- bg0 - , createColour 204 36 29 -- red.1 - , createColour 152 151 26 -- green.2 - , createColour 215 153 33 -- yellow.3 - , createColour 69 133 136 -- blue.4 - , createColour 177 98 134 -- purple.5 - , createColour 104 157 106 -- aqua.6 - , createColour 102 82 84 -- fg3 + 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 ] - gruvboxLight2 :: List8 (AlphaColour Double) - gruvboxLight2 = fromMaybe defaultStandardColours $ mkList8 - [ createColour 168 153 132 -- bg4 - , createColour 157 0 6 -- red.9 - , createColour 121 116 14 -- green.10 - , createColour 181 118 20 -- yellow.11 - , createColour 7 102 120 -- blue.12 - , createColour 143 63 113 -- purple.13 - , createColour 66 123 88 -- aqua.14 - , createColour 60 56 54 -- fg1 + 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 is our Solarized dark 'ColourConfig'. It holds all of our dark-related settings. -solarizedDark :: ColourConfig (AlphaColour Double) -solarizedDark = - defaultColourConfig - -- Set the default foreground colour of text of the terminal. - { foregroundColour = Set (createColour 131 148 150) -- base0 - , backgroundColour = Set (createColour 0 43 54) -- base03 - -- Set the extended palette that has 2 Vecs of 8 Solarized palette colours - , palette = ExtendedPalette solarizedDark1 solarizedDark2 - } - where - solarizedDark1 :: List8 (AlphaColour Double) - solarizedDark1 = fromMaybe defaultStandardColours $ mkList8 - [ createColour 7 54 66 -- base02 - , createColour 220 50 47 -- red - , createColour 133 153 0 -- green - , createColour 181 137 0 -- yellow - , createColour 38 139 210 -- blue - , createColour 211 54 130 -- magenta - , createColour 42 161 152 -- cyan - , createColour 238 232 213 -- base2 - ] - - solarizedDark2 :: List8 (AlphaColour Double) - solarizedDark2 = fromMaybe defaultStandardColours $ mkList8 - [ createColour 0 43 54 -- base03 - , createColour 203 75 22 -- orange - , createColour 88 110 117 -- base01 - , createColour 101 123 131 -- base00 - , createColour 131 148 150 -- base0 - , createColour 108 113 196 -- violet - , createColour 147 161 161 -- base1 - , createColour 253 246 227 -- base3 - ] - --- This is our Solarized light 'ColourConfig'. It holds all of our light-related settings. -solarizedLight :: ColourConfig (AlphaColour Double) -solarizedLight = - defaultColourConfig - -- Set the default foreground colour of text of the terminal. - { foregroundColour = Set (createColour 101 123 131) -- base00 - , backgroundColour = Set (createColour 253 246 227) -- base3 - -- Set the extended palette that has 2 Vecs of 8 Solarized palette colours - , palette = ExtendedPalette solarizedLight1 solarizedLight2 - } - where - solarizedLight1 :: List8 (AlphaColour Double) - solarizedLight1 = fromMaybe defaultStandardColours $ mkList8 - [ createColour 7 54 66 -- base02 - , createColour 220 50 47 -- red - , createColour 133 153 0 -- green - , createColour 181 137 0 -- yellow - , createColour 38 139 210 -- blue - , createColour 211 54 130 -- magenta - , createColour 42 161 152 -- cyan - , createColour 238 232 213 -- base2 - ] - - solarizedLight2 :: List8 (AlphaColour Double) - solarizedLight2 = fromMaybe defaultStandardColours $ mkList8 - [ createColour 0 43 54 -- base03 - , createColour 203 75 22 -- orange - , createColour 88 110 117 -- base01 - , createColour 101 123 131 -- base00 - , createColour 131 148 150 -- base0 - , createColour 108 113 196 -- violet - , createColour 147 161 161 -- base1 - , createColour 253 246 227 -- base3 - ] -- This defines the font for the terminal. fontConf :: FontConfig fontConf = defaultFontConfig - { fontFamily = "Droid Sans Mono Dotted for Powerline" + -- { fontFamily = "Droid Sans Mono Dotted for Powerline" + -- { fontFamily = "Inconsolata for Powerline" + { fontFamily = "Inconsolata-g for Powerline" , fontSize = FontSizePoints 6 } main :: IO () main = do - -- First, create the colour extension based on either Solarized modules. - myColourExt <- createColourExtension gruvboxDark + -- First, create the colour extension based on either PaperColor modules. + --myColourExt <- createColourExtension paperColorDark + myColourExt <- createColourExtension paperColorLight -- Update 'myTMConfig' with our colour extension. let newTMConfig = addColourExtension myTMConfig myColourExt