simplify palettes

2 files changed, 26 insertions, 151 deletions

diff --git a/yo_dark.toml b/yo_dark.toml
index 193cc47..6ecaaf2 100644
--- a/yo_dark.toml
+++ b/yo_dark.toml
@@ -28,7 +28,7 @@
 "ui.cursor.select" = { fg = "gray2", bg = "gray12" }
 "ui.cursor.match" = { fg = "gray12", modifiers = ["bold"]  }
 "ui.selection" = { fg = "gray12", bg = "gray5" }
-"ui.selection.primary" = { fg = "alt12", bg = "alt5" }
+"ui.selection.primary" = { fg = "gray12", bg = "alt5" }
 "ui.cursorline.primary" = { bg = "gray3" }
 
 # line numbers / diff
@@ -50,22 +50,22 @@ diff = { fg = "gray8" }
 "ui.virtual.indent-guide" = { fg = "gray6" }
 
 # diagnostics
-warning = { fg = "warn10" }
-error = { fg = "err10", modifiers = ["bold"] }
-info = { fg = "info10", modifiers = ["bold"] }
-hint = { fg = "info10", modifiers = ["bold"] }
-"diagnostic.hint" = { fg = "info10", modifiers = ["bold"] }
-"diagnostic.info" = { fg = "info10", modifiers = ["bold"] }
-"diagnostic.warning" = { fg = "warn10", modifiers = ["bold"]  }
-"diagnostic.error" = { fg = "err10", modifiers = ["bold"] }
+warning = { fg = "warning", modifiers = ["bold"] }
+error = { fg = "error", modifiers = ["bold"] }
+info = { fg = "info", modifiers = ["bold"] }
+hint = { fg = "info", modifiers = ["bold"] }
+"diagnostic.hint" = { fg = "info", modifiers = ["bold"] }
+"diagnostic.info" = { fg = "info", modifiers = ["bold"] }
+"diagnostic.warning" = { fg = "warning", modifiers = ["bold"]  }
+"diagnostic.error" = { fg = "error", modifiers = ["bold"] }
 
 # code
-comment = { fg = "info10" }
+comment = { fg = "info" }
 keyword = { fg = "alt9" }
 operator = { fg = "alt9" }
-string = { fg = "str9" }
-constant = { fg = "const9" }
-"string.special.symbol" = { fg = "const9" }
+string = { fg = "string" }
+constant = { fg = "constant" }
+"string.special.symbol" = { fg = "constant" }
 variable = { fg = "gray10" }
 namespace = { fg = "gray10" }
 punctuation = { fg = "gray11" }
@@ -89,6 +89,12 @@ markup = { fg = "gray9" }
 
 [palette] # https://www.radix-ui.com/docs/colors/palette-composition/the-scales
 
+error = "#f2555a" # redDark-10
+warning = "#ffcb47" # amberDark-10
+info = "#369eff" # blueDark-10
+string = "#46a758" # greenDark-9
+constant = "#8e4ec6" # purpleDark-9
+
 # gray (default/text/ui) - sandDark
 gray1 = "#161615"
 gray2 = "#1c1c1a"
@@ -117,72 +123,3 @@ alt10 = "#b08c7d"
 alt11 = "#cba393"
 alt12 = "#f9ede7"
 
-# error (diagnostics) - redDark
-err1 = "#1f1315"
-err2 = "#291415"
-err3 = "#3c181a"
-err4 = "#481a1d"
-err5 = "#541b1f"
-err6 = "#671e22"
-err7 = "#822025"
-err8 = "#aa2429"
-err9 = "#e5484d"
-err10 = "#f2555a"
-err11 = "#ff6369"
-err12 = "#feecee"
-
-# warning (diagnostics) - amberDark
-warn1 = "#1f1300"
-warn2 = "#271700"
-warn3 = "#341c00"
-warn4 = "#3f2200"
-warn5 = "#4a2900"
-warn6 = "#573300"
-warn7 = "#693f05"
-warn8 = "#824e00"
-warn9 = "#ffb224"
-warn10 = "#ffcb47"
-warn11 = "#f1a10d"
-warn12 = "#fef3dd"
-
-# info (diagnostics/comments) - blueDark
-info1 = "#0f1720"
-info2 = "#0f1b2d"
-info3 = "#10243e"
-info4 = "#102a4c"
-info5 = "#0f3058"
-info6 = "#0d3868"
-info7 = "#0a4481"
-info8 = "#0954a5"
-info9 = "#0091ff"
-info10 = "#369eff"
-info11 = "#52a9ff"
-info12 = "#eaf6ff"
-
-# str (strings) - grassDark
-str1 = "#0d1912"
-str2 = "#0f1e13"
-str3 = "#132819"
-str4 = "#16301d"
-str5 = "#193921"
-str6 = "#1d4427"
-str7 = "#245530"
-str8 = "#2f6e3b"
-str9 = "#46a758"
-str10 = "#55b467"
-str11 = "#63c174"
-str12 = "#e5fbeb"
-
-# const (constants/literals) - purpleDark
-const1 = "#1b141d"
-const2 = "#221527"
-const3 = "#301a3a"
-const4 = "#3a1e48"
-const5 = "#432155"
-const6 = "#4e2667"
-const7 = "#5f2d84"
-const8 = "#7938b2"
-const9 = "#8e4ec6"
-const10 = "#9d5bd2"
-const11 = "#bf7af0"
-const12 = "#f7ecfc"
diff --git a/yo_light.toml b/yo_light.toml
index 6af5a6f..1c1b904 100644
--- a/yo_light.toml
+++ b/yo_light.toml
@@ -8,6 +8,7 @@
 
 inherits = "yo_dark"
 
+# TODO bump up the palette instead
 # bump up backgrounds by 1 so it's not too bright.
 
 "ui.background" = { fg = "gray11", bg = "gray3" }
@@ -47,6 +48,12 @@ inherits = "yo_dark"
 
 [palette] # https://www.radix-ui.com/docs/colors/palette-composition/the-scales
 
+error = "#dc3d43" # red-10
+warning = "#ed5f00" # orange-10
+info = "#0081f1" # blue-10
+string = "#46a758" # grass-9
+constant = "#8e4ec6" # purple-9
+
 # gray (default/text/ui) - sand
 gray1 = "#fdfdfc"
 gray2 = "#f9f9f8"
@@ -75,72 +82,3 @@ alt10 = "#977669"
 alt11 = "#846358"
 alt12 = "#43302b"
 
-# error (diagnostics) - red
-err1 = "#fffcfc"
-err2 = "#fff8f8"
-err3 = "#ffefef"
-err4 = "#ffe5e5"
-err5 = "#fdd8d8"
-err6 = "#f9c6c6"
-err7 = "#f3aeaf"
-err8 = "#eb9091"
-err9 = "#e5484d"
-err10 = "#dc3d43"
-err11 = "#cd2b31"
-err12 = "#381316"
-
-# warn (diagnostics) - orange
-warn1 = "#fefcfb"
-warn2 = "#fef8f4"
-warn3 = "#fff1e7"
-warn4 = "#ffe8d7"
-warn5 = "#ffdcc3"
-warn6 = "#ffcca7"
-warn7 = "#ffb381"
-warn8 = "#fa934e"
-warn9 = "#f76808"
-warn10 = "#ed5f00"
-warn11 = "#bd4b00"
-warn12 = "#451e11"
-
-# info (diagnostics/comments) - blue
-info1 = "#fbfdff"
-info2 = "#f5faff"
-info3 = "#edf6ff"
-info4 = "#e1f0ff"
-info5 = "#cee7fe"
-info6 = "#b7d9f8"
-info7 = "#96c7f2"
-info8 = "#5eb0ef"
-info9 = "#0091ff"
-info10 = "#0081f1"
-info11 = "#006adc"
-info12 = "#00254d"
-
-# str (strings) - grass
-str1 = "#fbfefb"
-str2 = "#f3fcf3"
-str3 = "#ebf9eb"
-str4 = "#dff3df"
-str5 = "#ceebcf"
-str6 = "#b7dfba"
-str7 = "#97cf9c"
-str8 = "#65ba75"
-str9 = "#46a758"
-str10 = "#3d9a50"
-str11 = "#297c3b"
-str12 = "#1b311e"
-
-# const (constants/literals) - purple
-const1 = "#fefcfe"
-const2 = "#fdfaff"
-const3 = "#f9f1fe"
-const4 = "#f3e7fc"
-const5 = "#eddbf9"
-const6 = "#e3ccf4"
-const7 = "#d3b4ed"
-const8 = "#be93e4"
-const9 = "#8e4ec6"
-const10 = "#8445bc"
-const11 = "#793aaf"
-const12 = "#2b0e44"