rework themes. simplify. add berry vairants

7 files changed, 218 insertions, 194 deletions

diff --git a/README.md b/README.md
index 5812c54..b69361a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
-
 # yo-theme-helix
 
-A [Helix][helix] theme inspired by [Zenbones][zenbones] &
+[Helix][helix] themes inspired by [Zenbones][zenbones] &
 [Alabaster][alabaster]. Uses [Radix Colors][radix].
 
 ### Notes
@@ -31,7 +30,7 @@ A [Helix][helix] theme inspired by [Zenbones][zenbones] &
 - Variants.
   - It should be straightforward to use helix theme inheritance to swap out the
     default color palette with other radix color combinations without losing the
-    principles of the theme.
+    principles of the theme. (see the berry variant)
     
 ### Screenshots
 
diff --git a/yo.toml b/yo.toml
new file mode 100644
index 0000000..0c7d5f1
--- /dev/null
+++ b/yo.toml
@@ -0,0 +1,110 @@
+# yo
+
+# Helix theme inspired by Zenbones & Alabaster.
+# Author: Michael McClintock @mrmcc3
+# License: MIT
+
+# background/text
+"ui.background" = { fg = "p11", bg = "p2" }
+"ui.background.separator" = { fg = "p7" }
+"ui.text" = { fg = "p11" }
+"ui.text.focus" = { fg = "p12", modifiers = ["bold"] }
+
+# popups/menus
+"ui.window" = { fg = "p7" }
+"ui.popup" = { fg = "p12", bg = "p4" }
+"ui.popup.info" = { fg = "p12", bg = "p2" }
+"ui.text.info" = { fg = "p12", bg = "p2" }
+"ui.help" = { fg = "p12", bg = "p2" }
+"ui.menu" = { fg = "p11", bg = "p4" }
+"ui.menu.selected" = { fg = "p12", modifiers = ["bold"] }
+"ui.menu.scroll" = { fg = "p8", bg = "p4" }
+
+# cursor/selection
+"ui.cursor" = { fg = "p2", bg = "p11" }
+"ui.cursor.insert" = { fg = "p2", bg = "keyword" }
+"ui.cursor.select" = { fg = "p2", bg = "p12" }
+"ui.cursor.match" = { fg = "p12", modifiers = ["bold"]  }
+"ui.selection" = { bg = "p5" }
+"ui.selection.primary" = { bg = "p5" }
+"ui.cursorline.primary" = { bg = "p3" }
+
+# line numbers / diff
+"ui.linenr" = { fg = "p7" }
+"ui.linenr.selected" = { fg = "p11" }
+diff = { fg = "p8" }
+
+# statusline
+"ui.statusline" = { fg = "p11", bg = "p4" }
+"ui.statusline.inactive" = { fg = "p11", bg = "p2" }
+"ui.statusline.normal" = { fg = "p2", bg = "p11" }
+"ui.statusline.insert" = { fg = "p2", bg = "keyword" }
+"ui.statusline.select" = { fg = "p2", bg = "p12" }
+"ui.statusline.separator" = { fg = "p7" }
+
+# virtual
+"ui.virtual.ruler" = { bg = "p3" }
+"ui.virtual.whitespace" = { fg = "p6" }
+"ui.virtual.indent-guide" = { fg = "p6" }
+
+# diagnostics
+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 = "info" }
+keyword = { fg = "keyword" }
+operator = { fg = "keyword" }
+string = { fg = "string" }
+constant = { fg = "constant" }
+"string.special.symbol" = { fg = "constant" }
+variable = { fg = "p10" }
+namespace = { fg = "p10" }
+punctuation = { fg = "p11" }
+function = { fg = "p11" }
+attribute = { fg = "p11" }
+tag = { fg = "p12" }
+label = { fg = "p12" }
+constructor = { fg = "p12" }
+type = { fg = "p12" }
+
+# markup
+markup = { fg = "p9" }
+"markup.list" = { fg = "p8" }
+"markup.heading" = { fg = "p12", modifiers = ["bold"] }
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link" = { fg = "keyword" }
+"markup.link.url" = { fg = "keyword" }
+"markup.quote" = { modifiers = ["italic"] }
+"markup.raw" = { fg = "p12" }
+
+[palette] # radix ui colors
+
+# primary - sandDark
+p1 = "#161615"
+p2 = "#1c1c1a"
+p3 = "#232320"
+p4 = "#282826"
+p5 = "#2e2e2b"
+p6 = "#353431"
+p7 = "#3e3e3a"
+p8 = "#51504b"
+p9 = "#717069"
+p10 = "#7f7e77"
+p11 = "#a1a09a"
+p12 = "#ededec"
+
+error = "#f2555a" # redDark-10
+warning = "#ffcb47" # amberDark-10
+info = "#369eff" # blueDark-10
+
+string = "#46a758" # green-9
+constant = "#8e4ec6" # purple-9
+keyword = "#a18072" # bronze-9
diff --git a/yo_berry.toml b/yo_berry.toml
new file mode 100644
index 0000000..4cf05cd
--- /dev/null
+++ b/yo_berry.toml
@@ -0,0 +1,32 @@
+# yo_berry - yo variant with berry colors
+
+# Helix theme inspired by Zenbones & Alabaster.
+# Author: Michael McClintock @mrmcc3
+# License: MIT
+
+inherits = "yo"
+
+[palette] # radix ui colors
+
+# primary - mauveDark
+p1 = "#161618"
+p2 = "#1c1c1f"
+p3 = "#232326"
+p4 = "#28282c"
+p5 = "#2e2e32"
+p6 = "#34343a"
+p7 = "#3e3e44"
+p8 = "#504f57"
+p9 = "#706f78"
+p10 = "#7e7d86"
+p11 = "#a09fa6"
+p12 = "#ededef"
+
+error = "#f04f88" # crimsonDark-10
+warning = "#ffef5c" # yellowDark-10
+info = "#369eff" # blueDark-10
+
+string = "#12a594" # teal-9
+constant = "#bd54c6" # plum-10
+keyword = "#9490e9" # custom
+
diff --git a/yo_berry_dark.toml b/yo_berry_dark.toml
new file mode 100644
index 0000000..166bd3a
--- /dev/null
+++ b/yo_berry_dark.toml
@@ -0,0 +1,18 @@
+# yo_berry_dark - darker yo berry variant
+
+# Helix theme inspired by Zenbones & Alabaster.
+# Author: Michael McClintock @mrmcc3
+# License: MIT
+
+inherits = "yo_berry"
+
+[palette] # radix ui colors
+
+# primary - mauveDark. shift p1-p5 -> p2-p6
+
+p2 = "#161618"
+p3 = "#1c1c1f"
+p4 = "#232326"
+p5 = "#28282c"
+p6 = "#2e2e32"
+
diff --git a/yo_berry_light.toml b/yo_berry_light.toml
new file mode 100644
index 0000000..57682af
--- /dev/null
+++ b/yo_berry_light.toml
@@ -0,0 +1,30 @@
+# yo_berry_light - light yo berry variant
+
+# Helix theme inspired by Zenbones & Alabaster.
+# Author: Michael McClintock @mrmcc3
+# License: MIT
+
+inherits = "yo_berry"
+
+[palette] # radix ui colors
+
+# primary - mauve
+p1 = "#fdfcfd"
+p2 = "#f9f8f9"
+p3 = "#f4f2f4"
+p4 = "#eeedef"
+p5 = "#e9e8ea"
+p6 = "#e4e2e4"
+p7 = "#dcdbdd"
+p8 = "#c8c7cb"
+p9 = "#908e96"
+p10 = "#86848d"
+p11 = "#6f6e77"
+p12 = "#1a1523"
+
+error = "#e03177" # crimson-10
+warning = "#ed5f00" # orange-10
+info = "#0081f1" # blue-10
+
+constant = "#a43cb4" # plum-10
+
diff --git a/yo_dark.toml b/yo_dark.toml
index 6ecaaf2..49502ac 100644
--- a/yo_dark.toml
+++ b/yo_dark.toml
@@ -1,125 +1,17 @@
-# yo_dark
-
-# Helix theme inspired by Zenbones & Alabaster using the
-# radix color system https://www.radix-ui.com/colors
+# yo_dark - darker yo variant
 
+# Helix theme inspired by Zenbones & Alabaster.
 # Author: Michael McClintock @mrmcc3
 # License: MIT
 
-# background/text
-"ui.background" = { fg = "gray11", bg = "gray2" }
-"ui.background.separator" = { fg = "gray7" }
-"ui.text" = { fg = "gray11" }
-"ui.text.focus" = { fg = "alt10", modifiers = ["bold"] }
-
-# popups/menus
-"ui.window" = { fg = "gray7" }
-"ui.popup" = { fg = "gray12", bg = "gray4" }
-"ui.popup.info" = { fg = "gray12", bg = "gray2" }
-"ui.text.info" = { fg = "gray12", bg = "gray2" }
-"ui.help" = { fg = "gray12", bg = "gray2" }
-"ui.menu" = { fg = "gray11", bg = "gray4" }
-"ui.menu.selected" = { fg = "alt10", modifiers = ["bold"] }
-"ui.menu.scroll" = { fg = "gray8", bg = "gray4" }
-
-# cursor/selection
-"ui.cursor" = { fg = "gray2", bg = "gray11" }
-"ui.cursor.insert" = { fg = "alt2", bg = "alt10" }
-"ui.cursor.select" = { fg = "gray2", bg = "gray12" }
-"ui.cursor.match" = { fg = "gray12", modifiers = ["bold"]  }
-"ui.selection" = { fg = "gray12", bg = "gray5" }
-"ui.selection.primary" = { fg = "gray12", bg = "alt5" }
-"ui.cursorline.primary" = { bg = "gray3" }
-
-# line numbers / diff
-"ui.linenr" = { fg = "gray7" }
-"ui.linenr.selected" = { fg = "alt8" }
-diff = { fg = "gray8" }
-
-# statusline
-"ui.statusline" = { fg = "gray11", bg = "gray4" }
-"ui.statusline.inactive" = { fg = "gray11", bg = "gray2" }
-"ui.statusline.normal" = { fg = "gray2", bg = "gray11" }
-"ui.statusline.insert" = { fg = "alt2", bg = "alt10" }
-"ui.statusline.select" = { fg = "alt2", bg = "gray12" }
-"ui.statusline.separator" = { fg = "gray7" }
-
-# virtual
-"ui.virtual.ruler" = { bg = "gray3" }
-"ui.virtual.whitespace" = { fg = "gray6" }
-"ui.virtual.indent-guide" = { fg = "gray6" }
-
-# diagnostics
-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 = "info" }
-keyword = { fg = "alt9" }
-operator = { fg = "alt9" }
-string = { fg = "string" }
-constant = { fg = "constant" }
-"string.special.symbol" = { fg = "constant" }
-variable = { fg = "gray10" }
-namespace = { fg = "gray10" }
-punctuation = { fg = "gray11" }
-function = { fg = "gray11" }
-attribute = { fg = "gray11" }
-tag = { fg = "gray12" }
-label = { fg = "gray12" }
-constructor = { fg = "gray12" }
-type = { fg = "gray12" }
-
-# markup
-markup = { fg = "gray9" }
-"markup.list" = { fg = "gray8" }
-"markup.heading" = { fg = "gray12", modifiers = ["bold"] }
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.link" = { fg = "alt9" }
-"markup.link.url" = { fg = "alt9" }
-"markup.quote" = { modifiers = ["italic"] }
-"markup.raw" = { fg = "gray12" }
-
-[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
+inherits = "yo"
 
-# gray (default/text/ui) - sandDark
-gray1 = "#161615"
-gray2 = "#1c1c1a"
-gray3 = "#232320"
-gray4 = "#282826"
-gray5 = "#2e2e2b"
-gray6 = "#353431"
-gray7 = "#3e3e3a"
-gray8 = "#51504b"
-gray9 = "#717069"
-gray10 = "#7f7e77"
-gray11 = "#a1a09a"
-gray12 = "#ededec"
+[palette]
 
-# alt (active/operators/keywords) - bronzeDark
-alt1 = "#191514"
-alt2 = "#1f1917"
-alt3 = "#2a211f"
-alt4 = "#332824"
-alt5 = "#3b2e29"
-alt6 = "#453530"
-alt7 = "#57433c"
-alt8 = "#74594e"
-alt9 = "#a18072"
-alt10 = "#b08c7d"
-alt11 = "#cba393"
-alt12 = "#f9ede7"
+# in the default theme p1 is unused. shift p1-p5 -> p2-p6
 
+p2 = "#161615"
+p3 = "#1c1c1a"
+p4 = "#232320"
+p5 = "#282826"
+p6 = "#2e2e2b"
diff --git a/yo_light.toml b/yo_light.toml
index 1c1b904..3967bb4 100644
--- a/yo_light.toml
+++ b/yo_light.toml
@@ -1,84 +1,27 @@
 # yo_light
 
-# Helix theme inspired by Zenbones & Alabaster using the
-# radix color system https://www.radix-ui.com/colors
-
+# Helix theme inspired by Zenbones & Alabaster.
 # Author: Michael McClintock @mrmcc3
 # License: MIT
 
-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" }
-
-# popups/menus
-"ui.popup" = { fg = "gray12", bg = "gray5" }
-"ui.popup.info" = { fg = "gray12", bg = "gray3" }
-"ui.text.info" = { fg = "gray12", bg = "gray3" }
-"ui.help" = { fg = "gray12", bg = "gray3" }
-"ui.menu" = { fg = "gray11", bg = "gray5" }
-"ui.menu.scroll" = { fg = "gray8", bg = "gray5" }
-
-# cursor/selection
-"ui.cursor" = { fg = "gray3", bg = "gray11" }
-"ui.cursor.insert" = { fg = "alt3", bg = "alt10" }
-"ui.cursor.select" = { fg = "gray3", bg = "gray12" }
-"ui.selection" = { fg = "gray12", bg = "gray6" }
-"ui.selection.primary" = { fg = "alt12", bg = "alt6" }
-"ui.cursorline.primary" = { bg = "gray4" }
+inherits = "yo"
 
-# line numbers
-"ui.linenr" = { fg = "gray8" }
-"ui.linenr.selected" = { fg = "alt8" }
+[palette] # radix ui colors
 
-# statusline
-"ui.statusline" = { fg = "gray11", bg = "gray5" }
-"ui.statusline.inactive" = { fg = "gray11", bg = "gray3" }
-"ui.statusline.normal" = { fg = "gray3", bg = "gray11" }
-"ui.statusline.insert" = { fg = "alt3", bg = "alt10" }
-"ui.statusline.select" = { fg = "alt3", bg = "gray12" }
-"ui.statusline.separator" = { fg = "gray8" }
-
-# virtual
-"ui.virtual.ruler" = { bg = "gray4" }
-"ui.virtual.whitespace" = { fg = "gray7" }
-"ui.virtual.indent-guide" = { fg = "gray7" }
-
-[palette] # https://www.radix-ui.com/docs/colors/palette-composition/the-scales
+# primary - sand
+p1 = "#fdfdfc"
+p2 = "#f9f9f8"
+p3 = "#f3f3f2"
+p4 = "#eeeeec"
+p5 = "#e9e9e6"
+p6 = "#e3e3e0"
+p7 = "#dbdbd7"
+p8 = "#c8c7c1"
+p9 = "#90908c"
+p10 = "#868682"
+p11 = "#706f6c"
+p12 = "#1b1b18"
 
 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"
-gray3 = "#f3f3f2"
-gray4 = "#eeeeec"
-gray5 = "#e9e9e6"
-gray6 = "#e3e3e0"
-gray7 = "#dbdbd7"
-gray8 = "#c8c7c1"
-gray9 = "#90908c"
-gray10 = "#868682"
-gray11 = "#706f6c"
-gray12 = "#1b1b18"
-
-# alt (active/operators/keywords) - bronze
-alt1 = "#fdfcfc"
-alt2 = "#fdf8f6"
-alt3 = "#f8f1ee"
-alt4 = "#f2e8e4"
-alt5 = "#eaddd7"
-alt6 = "#e0cec7"
-alt7 = "#d1b9b0"
-alt8 = "#bfa094"
-alt9 = "#a18072"
-alt10 = "#977669"
-alt11 = "#846358"
-alt12 = "#43302b"
-