From 7a33bbaf62783a6c60d4d8cc8f603cfac9c9c364 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Mon, 21 Mar 2022 10:59:51 +1000
Subject: [PATCH] termonad: switched to One Dark Pro

---
 .config/termonad/termonad.hs | 56 +++++++++++++++++++-----------------
 .gitignore.d/rcfiles         |  1 +
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.config/termonad/termonad.hs b/.config/termonad/termonad.hs
index 85782b9..bac2d56 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 Dracula
+-- Currently defaults to One Dark Pro
 
 module Main where
 
@@ -10,6 +10,7 @@ import Termonad
   , Option(Set)
   , ShowScrollbar(ShowScrollbarNever)
   , TMConfig
+  , boldIsBright
   , confirmExit
   , cursorBlinkMode
   , defaultConfigOptions
@@ -52,6 +53,7 @@ myTMConfig =
     { options =
         defaultConfigOptions
           { showScrollbar = ShowScrollbarNever
+          , boldIsBright = True
           , confirmExit = False
           , showMenu = False
           , cursorBlinkMode = CursorBlinkModeOn
@@ -60,38 +62,38 @@ myTMConfig =
     }
 
 -- This is our Dracula 'ColourConfig'.
-dracula :: ColourConfig (AlphaColour Double)
-dracula =
+onedarkpro :: ColourConfig (AlphaColour Double)
+onedarkpro =
   defaultColourConfig
     -- Set the default background & foreground colour of text of the terminal.
-    { backgroundColour = Set (createColour  40  42  54)  -- black.0
-    , foregroundColour = Set (createColour 248 248 242)  -- white.7
+    { backgroundColour = Set (createColour  40  44  52)  -- black.0
+    , foregroundColour = Set (createColour 171 178 191)  -- white.7
     -- Set the extended palette that has 2 Vecs of 8 Dracula palette colours
-    , palette = ExtendedPalette draculaNormal draculaBright
+    , palette = ExtendedPalette onedarkproNormal onedarkproBright
     }
   where
-    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
+    onedarkproNormal :: List8 (AlphaColour Double)
+    onedarkproNormal = fromMaybe defaultStandardColours $ mkList8
+      [ createColour  40  44  52 -- black.0
+      , createColour 244 108 117 -- red.1
+      , createColour 152 195 121 -- green.2
+      , createColour 229 192 123 -- yellow.3
+      , createColour  97 175 239 -- blue.4
+      , createColour 198 120 221 -- magenta.5
+      , createColour  86 182 194 -- cyan.6
+      , createColour 171 178 191 -- white.7
       ]
 
-    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
+    onedarkproBright :: List8 (AlphaColour Double)
+    onedarkproBright = fromMaybe defaultStandardColours $ mkList8
+      [ createColour  63  63  63 -- black.8
+      , createColour 224 108 117 -- red.9
+      , createColour 152 195 121 -- green.10
+      , createColour 229 192 123 -- yellow.11
+      , createColour  97 175 239 -- blue.12
+      , createColour 198 120 221 -- magenta.13
+      , createColour  86 182 194 -- cyan.14
+      , createColour 191 197 206 -- white.15
       ]
 
 -- This defines the font for the terminal.
@@ -107,7 +109,7 @@ fontConf =
 main :: IO ()
 main = do
   -- First, create the colour extension based on either PaperColor modules.
-  myColourExt <- createColourExtension dracula
+  myColourExt <- createColourExtension onedarkpro
 
   -- Update 'myTMConfig' with our colour extension.
   let newTMConfig = addColourExtension myTMConfig myColourExt
diff --git a/.gitignore.d/rcfiles b/.gitignore.d/rcfiles
index 5596b6d..6ca7202 100644
--- a/.gitignore.d/rcfiles
+++ b/.gitignore.d/rcfiles
@@ -8,6 +8,7 @@
 !/.config/radiotray-ng/bookmarks.json
 !/.config/sway
 !/.config/sway/config
+!/.config/termonad
 !/.direnvrc
 !/.gertty.yaml
 !/.ghc/