Add light theme and fix some configurations

Author: sample-usr

lua/rakis/colors.lua

@@ -45,7 +45,7 @@ local M = {}
 M.default = {
   none = "NONE",
   bg = hsl(18, 20, 4),
-  bg_secondary = hsl(18, 20, 6),
+  bg_secondary = hsl(18, 20, 10),
   bg_highlight = hsl(12, 30, 17),
   fg = hsl(20, 30, 55),
   base01 = hsl(14, 20, 41),
@@ -82,37 +82,37 @@ M.default = {
 ---@field light RakisPalette
 M.light = {
   bg = hsl(53, 67, 84),
-  bg_secondary = hsl(18, 20, 6),
-  bg_highlight = hsl(22, 70, 88),
+  bg_secondary = hsl(53, 68, 76),
+  bg_highlight = hsl(47, 77, 83),
   fg = hsl(20, 30, 55),
-  base01 = hsl(14, 20, 41),
-  base02 = hsl(12, 50, 25),
-  base03 = hsl(12, 30, 12),
-  yellow01 = hsl(40, 94, 80),
-  yellow02 = hsl(40, 90, 64),
-  yellow03 = hsl(40, 90, 50),
-  orange01 = hsl(27, 98, 70),
-  orange02 = hsl(27, 95, 55),
-  orange03 = hsl(27, 100, 42),
-  red01 = hsl(4, 95, 78),
-  red02 = hsl(4, 90, 65),
-  red03 = hsl(4, 80, 55),
-  magenta01 = hsl(355, 40, 66),
-  magenta02 = hsl(355, 34, 55),
-  magenta03 = hsl(355, 34, 45),
-  magenta04 = hsl(355, 35, 33),
-  violet01 = hsl(264, 35, 70),
-  violet02 = hsl(264, 33, 58),
-  violet03 = hsl(264, 30, 44),
-  blue01 = hsl(205, 55, 71),
-  blue02 = hsl(205, 56, 60),
-  blue03 = hsl(205, 58, 48),
-  cyan01 = hsl(187, 41, 69),
-  cyan02 = hsl(185, 44, 57),
-  cyan03 = hsl(185, 40, 40),
-  green01 = hsl(118, 22, 70),
-  green02 = hsl(117, 21, 55),
-  green03 = hsl(118, 20, 45),
+  base01 = hsl(46, 48, 62),
+  base02 = hsl(46, 74, 72),
+  base03 = hsl(42, 60, 72),
+  yellow01 = hsl(40, 90, 50),
+  yellow02 = hsl(40, 90, 38),
+  yellow03 = hsl(42, 93, 22),
+  orange01 = hsl(27, 100, 42),
+  orange02 = hsl(27, 95, 35),
+  orange03 = hsl(27, 95, 23),
+  red01 = hsl(4, 80, 55),
+  red02 = hsl(4, 72, 37),
+  red03 = hsl(4, 70, 22),
+  magenta01 = hsl(355, 34, 55),
+  magenta02 = hsl(355, 34, 45),
+  magenta03 = hsl(355, 35, 33),
+  magenta04 = hsl(355, 32, 20),
+  violet01 = hsl(264, 30, 44),
+  violet02 = hsl(264, 28, 33),
+  violet03 = hsl(264, 27, 25),
+  blue01 = hsl(205, 58, 48),
+  blue02 = hsl(205, 60, 37),
+  blue03 = hsl(205, 65, 27),
+  cyan01 = hsl(185, 40, 40),
+  cyan02 = hsl(185, 44, 30),
+  cyan03 = hsl(185, 41, 23),
+  green01 = hsl(118, 20, 45),
+  green02 = hsl(118, 19, 36),
+  green03 = hsl(118, 18, 23),
 }
 
 return M

lua/rakis/config.lua

@@ -1,4 +1,3 @@
-local default_colors = require("rakis.colors").default
 local M = {}
 
 ---@class RakisHighlight
@@ -67,8 +66,8 @@ local default_options = {
   cache = false,
 
   theme = {
-    variant = "default",
-    colors = default_colors,
+    variant = "auto",
+    colors = {},
     highlights = {},
   },
 
@@ -78,7 +77,7 @@ local default_options = {
     -- dashboard = true,
     -- fzflua = true,
     -- gitpad = true,
-    -- gitsigns = true,
+    gitsigns = true,
     -- grapple = true,
     -- grugfar = true,
     -- heirline = true,
@@ -96,7 +95,7 @@ local default_options = {
     -- notify = true,
     -- rainbow_delimiters = true,
     -- telescope = true,
-    -- treesitter = true,
+    treesitter = true,
     -- treesittercontext = true,
     -- trouble = true,
     -- whichkey = true,

lua/rakis/extensions/gitsigns.lua

@@ -1,5 +1,5 @@
-local M = {}
 local util = require("rakis.util")
+local M = {}
 
 --- Get extension configuration
 --- @param opts Config

lua/rakis/extensions/treesitter.lua

@@ -0,0 +1,105 @@
+local util = require("rakis.util")
+local M = {}
+
+--- Get extension configuration
+--- @param opts Config
+--- @param p RakisPalette
+function M.get(opts, p)
+  opts = opts or {}
+  local highlights = {
+    ["@annotation"] = { link = "PreProc" },
+    ["@attribute"] = { link = "PreProc" },
+    ["@boolean"] = { link = "Boolean" },
+    ["@character"] = { link = "Character" },
+    ["@character.special"] = { link = "SpecialChar" },
+    ["@comment"] = { link = "Comment" },
+    ["@conditional"] = { link = "Conditional" },
+    ["@constant"] = { link = "Constant" },
+    ["@constant.builtin"] = { link = "Special" },
+    ["@constant.macro"] = { link = "Define" },
+    ["@constructor"] = { link = "Special" },
+    ["@debug"] = { link = "Debug" },
+    ["@define"] = { link = "Define" },
+    ["@exception"] = { link = "Exception" },
+    ["@field"] = { link = "Identifier" },
+    ["@float"] = { link = "Float" },
+    ["@function"] = { link = "Function" },
+    ["@function.builtin"] = { link = "Special" },
+    ["@function.call"] = { link = "@function" },
+    ["@function.macro"] = { link = "Macro" },
+    ["@include"] = { link = "Include" },
+    ["@keyword"] = { link = "Keyword" },
+    ["@keyword.coroutine"] = { link = "@keyword" },
+    ["@keyword.function"] = { link = "Keyword" },
+    ["@keyword.operator"] = { link = "@operator" },
+    ["@keyword.return"] = { link = "@keyword" },
+    ["@keyword.type"] = { fg = p.orange03, italic = true },
+    ["@label"] = { link = "Label" },
+    ["@markup.heading.1"] = { link = "markdownH1" },
+    ["@markup.heading.2"] = { link = "markdownH2" },
+    ["@markup.heading.3"] = { link = "markdownH3" },
+    ["@markup.heading.4"] = { link = "markdownH4" },
+    ["@markup.heading.5"] = { link = "markdownH5" },
+    ["@markup.heading.6"] = { link = "markdownH6" },
+    ["@markup.italic"] = { fg = p.blue03, italic = true },
+    ["@markup.link.label"] = { link = "Label" },
+    ["@markup.link.label.markdown_inline"] = { fg = p.cyan03 },
+    ["@markup.link.markdown_inline"] = { fg = p.blue03 },
+    ["@markup.link.url"] = { fg = p.blue03, underline = true },
+    ["@markup.list.checked"] = { fg = p.green02, bold = true },
+    ["@markup.list.unchecked"] = { fg = p.magenta03, bold = true },
+    ["@markup.quote"] = { link = "Comment" },
+    ["@markup.strong"] = { fg = p.violet01, bold = true },
+    ["@method"] = { link = "Function" },
+    ["@method.call"] = { link = "@method" },
+    ["@namespace"] = { link = "Include" },
+    ["@none"] = { default = true },
+    ["@number"] = { link = "Number" },
+    ["@operator"] = { link = "Operator" },
+    ["@parameter"] = { link = "Identifier" },
+    ["@preproc"] = { link = "PreProc" },
+    ["@property"] = { link = "Identifier" },
+    ["@punctuation.bracket"] = { link = "Delimiter" },
+    ["@punctuation.delimiter"] = { link = "Delimiter" },
+    ["@punctuation.special"] = { link = "Delimiter" },
+    ["@repeat"] = { link = "Repeat" },
+    ["@storageclass"] = { link = "StorageClass" },
+    ["@string"] = { link = "String" },
+    ["@string.escape"] = { link = "SpecialChar" },
+    ["@string.regex"] = { link = "String" },
+    ["@string.special"] = { link = "SpecialChar" },
+    ["@symbol"] = { link = "Identifier" },
+    ["@tag"] = { link = "Label" },
+    ["@tag.attribute"] = { link = "@property" },
+    ["@tag.delimiter"] = { link = "Delimiter" },
+    ["@text"] = { link = "@none" },
+    ["@text.danger"] = { link = "WarningMsg" },
+    ["@text.emphasis"] = { italic = true },
+    ["@text.environment"] = { link = "Macro" },
+    ["@text.environment.name"] = { link = "Type" },
+    ["@text.literal"] = { link = "String" },
+    ["@text.math"] = { link = "Special" },
+    ["@text.note"] = { link = "SpecialComment" },
+    ["@text.reference"] = { link = "Constant" },
+    ["@text.strike"] = { strikethrough = true },
+    ["@text.strong"] = { bold = true, default = true },
+    ["@text.title"] = { link = "markdownH1" },
+    ["@text.title.2"] = { link = "markdownH2" },
+    ["@text.title.3"] = { link = "markdownH3" },
+    ["@text.title.4"] = { link = "markdownH4" },
+    ["@text.title.5"] = { link = "markdownH5" },
+    ["@text.todo"] = { link = "Todo" },
+    ["@text.underline"] = { underline = true },
+    ["@text.uri"] = { link = "Underlined" },
+    ["@text.warning"] = { link = "Todo" },
+    ["@type"] = { link = "Type" },
+    ["@type.builtin"] = { fg = util.blend(p.violet02, p.magenta03, 0.65) },
+    ["@type.definition"] = { link = "Typedef" },
+    ["@type.qualifier"] = { link = "@keyword" },
+    ["@variable"] = { fg = p.fg },
+    ["@variable.builtin"] = { link = "Special" },
+  }
+  return highlights
+end
+
+return M

lua/rakis/init.lua

@@ -17,7 +17,7 @@ M.colorscheme = M.load
 
 vim.api.nvim_create_user_command("RakisToggleMode", function()
   local new_variant = util.toggle_theme_variant()
-  util.toggle_lualine_theme()
+  -- util.toggle_lualine_theme()
   vim.api.nvim_exec_autocmds("User", { pattern = "RakisToggleMode", data = new_variant })
 end, {})
 
@@ -36,7 +36,7 @@ vim.api.nvim_create_autocmd("OptionSet", {
     if vim.g.rakis_opts.theme.variant ~= "auto" or vim.fn.execute("colorscheme"):find("rakis") == nil then
       return
     end
-    util.toggle_lualine_theme()
+    -- util.toggle_lualine_theme()
   end,
 })
 

lua/rakis/util.lua

@@ -236,4 +236,51 @@ function M.parse_extra_template(template, t)
   return template
 end
 
+--- Override options with a new table of values.
+--- @param new_opts Config
+--- @return Config
+function M.set_options(new_opts)
+  local opts = vim.g.rakis_opts
+  vim.g.rakis_opts = vim.tbl_deep_extend("force", opts, new_opts)
+
+  return vim.g.rakis_opts
+end
+
+--- Apply options to the colorscheme.
+--- @param opts Config
+function M.apply_options(opts)
+  -- Update the colorscheme
+  config.setup(opts)
+  vim.cmd("colorscheme rakis")
+end
+
+--- Used for toggling the theme variant when the variant is set to "auto". Uses the 'set background' command to toggle between 'light' and 'dark'.
+--- @return string new variant
+function M.toggle_theme_auto()
+  local variant = vim.o.background
+  if variant == "dark" then
+    variant = "light"
+  else
+    variant = "dark"
+  end
+  vim.cmd(":set background=" .. variant)
+  return variant == "dark" and "default" or "light"
+end
+
+--- Toggle the theme variant between "default" and "light".
+--- @return string new variant
+function M.toggle_theme_variant()
+  local opts = vim.g.rakis_opts
+  -- Handle the "auto" variant without overwriting the value in opts.
+  if opts.theme.variant == "auto" then
+    return M.toggle_theme_auto()
+  end
+
+  opts.theme.variant = opts.theme.variant == "default" and "light" or "default"
+  M.set_options(opts)
+  M.apply_options(opts)
+
+  return opts.theme.variant
+end
+
 return M