From 52d697dc2b52f1a3d9b7a2cae4e28986e279314e Mon Sep 17 00:00:00 2001
From: xStormy <90779060+xStormyy@users.noreply.github.com>
Date: Sat, 19 Oct 2024 18:46:17 +0200
Subject: Add Oxocarbon Light theme (& small enhancements to Oxocarbon Dark)
 (#46)

* Add bracketmatch coloring to oxocarbon-dark

* add light version of oxocarbon

* Add oxocarbon light to manifest.json

* added drag_overlay, nagbar and whitespace coloring to oxocarbon-light.lua

* added drag_overlay, nagbar and whitespace coloring to oxocarbon-dark.lua

* darkend background when nagbar in oxocarbon-light.lua

* darkend background when nagbar in oxocarbon-dark.lua
---
 colors/oxocarbon-dark.lua  |  20 +++++-
 colors/oxocarbon-light.lua | 148 +++++++++++++++++++++++++++++++++++++++++++++
 manifest.json              |  11 ++++
 3 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 colors/oxocarbon-light.lua

diff --git a/colors/oxocarbon-dark.lua b/colors/oxocarbon-dark.lua
index 12376c2..3571f39 100644
--- a/colors/oxocarbon-dark.lua
+++ b/colors/oxocarbon-dark.lua
@@ -34,14 +34,13 @@ style.syntax["literal"] = base04 -- literals
 style.syntax["string"] = base15 -- strings
 style.syntax["operator"] = base08 -- operators
 style.syntax["function"] = base08  -- functions
+style.syntax["whitespace"] = base02 -- whitespace
 
 style.caret = base06 -- caret
 
 style.line_highlight = base01 -- editor line highlighting
 style.selection = base02 -- editor selection
 
-style.bracketmatch_color = base02
-
 style.guide = base02 -- indentation guide
 style.guide_highlighting = base02 -- indentation guide
 
@@ -56,6 +55,17 @@ style.divider = base00 -- borders
 style.line_number = base03 -- inactive
 style.line_number2 = base04 -- active
 
+style.drag_overlay = { common.color "rgba(255, 255, 255, 0.30)" }
+style.drag_overlay_tab = base03
+
+style.scrollbar = base01 -- scrollbar button when not interacted
+style.scrollbar2 = base03 -- button when you hover over
+style.scrollbar_track = base01 -- scrollbar track
+
+style.nagbar = base10
+style.nagbar_text = base01
+style.nagbar_dim = { common.color "rgba(0, 0, 0, 0.30)" }
+
 -- Evergreen
 style.syntax["attribute"] = base14
 style.syntax["boolean"] = base09
@@ -130,3 +140,9 @@ style.gitstatus_deletion = base10
 style.gitdiff_addition = base13
 style.gitdiff_modification = base09
 style.gitdiff_deletion = base10
+
+-- bracketmatch
+style.bracketmatch_color = base06
+style.bracketmatch_char_color = base09
+style.bracketmatch_block_color = base03
+style.bracketmatch_frame_color = base06
diff --git a/colors/oxocarbon-light.lua b/colors/oxocarbon-light.lua
new file mode 100644
index 0000000..6a88448
--- /dev/null
+++ b/colors/oxocarbon-light.lua
@@ -0,0 +1,148 @@
+-- Theme by @xStormyy on github
+-- Original Color Scheme: https://github.com/nyoom-engineering/oxocarbon
+
+local style = require "core.style"
+local common = require "core.common"
+
+local base00 = { common.color "#ffffff" }
+local base01 = { common.color "#f2f2f2" }
+local base02 = { common.color "#d0d0d0" }
+local base03 = { common.color "#161616" }
+local base04 = { common.color "#37474F" }
+local base05 = { common.color "#90A4AE" }
+local base06 = { common.color "#525252" }
+local base07 = { common.color "#08bdba" }
+local base08 = { common.color "#ff7eb6" }
+local base09 = { common.color "#ee5396" }
+local base10 = { common.color "#FF6F00" }
+local base11 = { common.color "#0f62fe" }
+local base12 = { common.color "#673AB7" }
+local base13 = { common.color "#42be65" }
+local base14 = { common.color "#be95ff" }
+local base15 = { common.color "#FFAB91" }
+
+style.background = base00 -- editor
+style.syntax["normal"] = base06 -- editor text
+
+style.syntax["symbol"] = base15  -- symbols
+style.syntax["comment"] = base03 -- comments
+style.syntax["keyword"] = base09  -- keywords like function, local, if, end, in lua
+style.syntax["keyword2"] = base09 -- types
+-- style.syntax["keyword3"] = { common.color "#FF000FF" } -- absolutely no idea
+style.syntax["number"] = base09 -- numbers
+style.syntax["literal"] = base04 -- literals
+style.syntax["string"] = base14 -- strings
+style.syntax["operator"] = base08 -- operators
+style.syntax["function"] = base08  -- functions
+style.syntax["whitespace"] = base02 -- whitespace
+
+style.caret = base06 -- caret
+
+style.line_highlight = base01 -- editor line highlighting
+style.selection = base02 -- editor selection
+
+style.guide = base02 -- indentation guide
+style.guide_highlighting = base02 -- indentation guide
+
+-- User Interface
+style.background2 = base00 -- sidebar
+style.background3 = base00 -- status bar
+style.text = base04 -- user interface text
+
+style.accent = style.caret -- accent color
+style.divider = base00 -- borders
+
+style.line_number = base03 -- inactive
+style.line_number2 = base04 -- active
+
+style.drag_overlay = { common.color "rgba(0, 0, 0, 0.30)" }
+style.drag_overlay_tab = base03
+
+style.scrollbar = base02 -- scrollbar button when not interacted
+style.scrollbar2 = base02 -- button when you hover over
+style.scrollbar_track = base01 -- scrollbar track
+
+style.nagbar = base09
+style.nagbar_text = base01
+style.nagbar_dim = { common.color "rgba(0, 0, 0, 0.30)" }
+
+-- Evergreen
+style.syntax["attribute"] = base14
+style.syntax["boolean"] = base09
+style.syntax["character"] = base13
+style.syntax["comment"] = base03
+style.syntax["comment.documentation"] = base04
+style.syntax["conditional"] = base09
+style.syntax["conditional.ternary"] = base09
+style.syntax["constant"] = base04
+style.syntax["constant.builtin"] = base07
+style.syntax["constructor"] = base09
+style.syntax["define"] = base09
+style.syntax["exception"] = base09
+style.syntax["field"] = base04
+style.syntax["float"] = base09
+style.syntax["function"] = base12
+style.syntax["function.call"] = base08
+style.syntax["function.macro"] = base07
+style.syntax["include"] = base09
+style.syntax["keyword.function"] = base12
+style.syntax["keyword.operator"] = base09
+style.syntax["keyword.return"] = base09
+style.syntax["label"] = base09
+style.syntax["method"] = base07
+style.syntax["method.call"] = base06
+style.syntax["namespace"] = base07
+style.syntax["number"] = base09
+style.syntax["operator"] = base09
+style.syntax["parameter"] = base04
+style.syntax["preproc"] = base09
+style.syntax["punctuation.delimiter"] = base08
+style.syntax["punctuation.brackets"] = base08
+style.syntax["punctuation.special"] = base08
+style.syntax["repeat"] = base09
+style.syntax["storageclass"] = base09
+style.syntax["storageclass.lifetime"] = base09
+style.syntax["string"] = base14
+style.syntax["tag"] = base04
+style.syntax["tag.attribute"] = base14
+style.syntax["tag.delimiter"] = base14
+style.syntax["text.diff.add"] = base07
+style.syntax["text.diff.delete"] = base10
+style.syntax["type"] = base09
+style.syntax["type.builtin"] = base09
+style.syntax["type.definition"] = base09 -- unsure
+style.syntax["type.qualifier"] = base09 -- unsure
+style.syntax["variable"] = base04
+style.syntax["variable.builtin"] = base04
+style.syntax["error"] = base08
+
+-- lint+
+style.lint = {} -- Lint+
+style.lint.info = base13 -- Lint+ info
+style.lint.hint = base14 -- Lint+ hint
+style.lint.warning = base07 -- Lint+ warning
+style.lint.error = base10 -- Lint+ error
+
+-- rainbowparen
+style.syntax.paren_unbalanced = base10
+style.syntax.paren1  =  base12
+style.syntax.paren2  =  base13
+style.syntax.paren3  =  base09
+style.syntax.paren4  =  base15
+style.syntax.paren5  =  base14
+
+-- gitstatus
+style.gitstatus_addition = base13
+style.gitstatus_modification = base09
+style.gitstatus_deletion = base10
+
+-- gitdiff_highlight
+style.gitdiff_addition = base13
+style.gitdiff_modification = base09
+style.gitdiff_deletion = base10
+
+-- bracketmatch
+style.bracketmatch_color = base03
+style.bracketmatch_char_color = base09
+style.bracketmatch_block_color = base05
+style.bracketmatch_frame_color = base06
diff --git a/manifest.json b/manifest.json
index 536c709..7e20b70 100644
--- a/manifest.json
+++ b/manifest.json
@@ -442,6 +442,17 @@
             "dark"
          ],
          "type" : "color",
+         "version" : "0.2"
+      },
+      {
+         "id" : "oxocarbon-light",
+         "mod_version" : "3.0.0",
+         "name" : "Oxocarbon Light",
+         "path" : "colors/oxocarbon-light.lua",
+         "tags" : [
+            "light"
+         ],
+         "type" : "color",
          "version" : "0.1"
       },
       {
-- 
cgit v1.2.3