rework themes. simplify. add berry vairants

1 files changed, 10 insertions, 118 deletions

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"