Adopt tokyonight.nvim architecture with eldritch color palette

README.md

@@ -59,6 +59,21 @@ Using [lazy.nvim](https://github.com/folke/lazy.nvim):
 vim.cmd[[colorscheme eldritch]]
 ```
 
+#### Variants
+
+Eldritch comes in three styles:
+
+```lua
+-- Default style
+vim.cmd[[colorscheme eldritch]]
+
+-- Dark variant (darker background)
+vim.cmd[[colorscheme eldritch-dark]]
+
+-- Minimal variant (less colorful)
+vim.cmd[[colorscheme eldritch-minimal]]
+```
+
 #### [Lualine](https://github.com/nvim-lualine/lualine.nvim)
 
 ```lua
@@ -93,7 +108,7 @@ If you want transparent background for all of fzf-lua you need to pass the follo
 require("eldritch").setup({
   -- your configuration comes here
   -- or leave it empty to use the default settings
-  -- palette = "default", -- This option is deprecated. Use `vim.cmd[[colorscheme eldritch-dark]]` or `vim.cmd[[colorscheme eldritch-minimal]] instead.
+  style = "eldritch", -- The theme comes in three styles: "eldritch" (default), "dark", and "minimal"
   transparent = false, -- Enable this to disable setting the background color
   terminal_colors = true, -- Configure the colors used when opening a `:terminal` in [Neovim](https://github.com/neovim/neovim)
   styles = {
@@ -107,10 +122,8 @@ require("eldritch").setup({
     sidebars = "dark", -- style for sidebars, see below
     floats = "dark", -- style for floating windows
   },
-  sidebars = { "qf", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]`
-  hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**.
-  dim_inactive = false, -- dims inactive windows, transparent must be false for this to work
-  lualine_bold = true, -- When `true`, section headers in the lualine theme will be bold
+  dim_inactive = false, -- dims inactive windows
+  lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold
 
   --- You can override specific color groups to use other groups or a hex color
   --- function will be called with a ColorScheme table
@@ -122,6 +135,22 @@ require("eldritch").setup({
   ---@param highlights Highlights
   ---@param colors ColorScheme
   on_highlights = function(highlights, colors) end,
+
+  cache = true, -- When set to true, the theme will be cached for better performance
+
+  ---@type table<string, boolean|{enabled:boolean}>
+  plugins = {
+    -- enable all plugins when not using lazy.nvim
+    -- set to false to manually enable/disable plugins
+    all = package.loaded.lazy == nil,
+    -- uses your plugin manager to automatically enable needed plugins
+    -- currently only lazy.nvim is supported
+    auto = true,
+    -- add any plugins here that you want to enable
+    -- for all possible plugins, see:
+    --   * https://github.com/eldritch-theme/eldritch.nvim/tree/main/lua/eldritch/groups
+    -- telescope = true,
+  },
 })
 ```
 

colors/eldritch-dark.lua

@@ -1,2 +1 @@
-vim.g.colors_name = "eldritch-dark"
-require("eldritch").load("darker")
+require("eldritch").load({ style = "dark" })

colors/eldritch-minimal.lua

@@ -1,2 +1 @@
-vim.g.colors_name = "eldritch-minimal"
-require("eldritch").load("minimal")
+require("eldritch").load({ style = "minimal" })

colors/eldritch.lua

@@ -1,2 +1 @@
-vim.g.colors_name = "eldritch"
-require("eldritch").load()
+require("eldritch").load({ style = "eldritch" })

lua/eldritch/colors/dark.lua

@@ -0,0 +1,57 @@
+---@type Palette
+return {
+  none = "NONE",
+  bg = "#171928",
+  bg_dark = "#0f101a",
+  bg_dark1 = "#060712",
+  bg_highlight = "#1e2033",
+  fg = "#d8e6e6",
+  fg_dark = "#8e94b8",
+  fg_gutter = "#2d3249",
+  fg_gutter_light = "#4a5584",
+  terminal_black = "#2a2e45",
+  dark3 = "#445084",
+  comment = "#506299",
+  dark5 = "#3d4775",
+  visual = "#554971",
+  bg_visual = "#554971",
+  bright_cyan = "#2bafcc",
+  cyan = "#0396b3",
+  dark_cyan = "#0c7a94",
+  magenta = "#8b75d9",
+  bright_purple = "#8b75d9",  -- same as magenta in darker variant
+  magenta2 = "#94407a",
+  magenta3 = "#5c2644",
+  pink = "#d154a1",
+  purple = "#8b75d9",
+  orange = "#d4a666",
+  yellow = "#ccd663",
+  dark_yellow = "#a1a34d",
+  green = "#2dcc82",
+  bright_green = "#00cc68",
+  dark_green = "#299e64",
+  red = "#cc5860",
+  bright_red = "#cc2935",
+  git = {
+    change = "#506299",
+    add = "#2dcc82",
+    delete = "#cc5860",
+  },
+  gitSigns = {
+    add = "#2dcc82",
+    change = "#506299",
+    delete = "#cc5860",
+  },
+  -- Derived color variants for compatibility
+  blue = "#0396b3",       -- same as cyan
+  blue0 = "#2d3249",      -- same as fg_gutter (darkest blue tone)
+  blue1 = "#2bafcc",      -- same as bright_cyan
+  blue2 = "#0c7a94",      -- same as dark_cyan
+  blue5 = "#0396b3",      -- same as cyan (for operators/delimiters)
+  blue6 = "#2bafcc",      -- same as bright_cyan (for regex)
+  blue7 = "#2d3249",      -- same as fg_gutter (for subtle backgrounds)
+  green1 = "#00cc68",     -- same as bright_green
+  green2 = "#299e64",     -- same as dark_green
+  red1 = "#cc2935",       -- same as bright_red
+  teal = "#00cc68",       -- same as bright_green
+}

lua/eldritch/colors/eldritch.lua

@@ -0,0 +1,57 @@
+---@type Palette
+return {
+  none = "NONE",
+  bg = "#212337",
+  bg_dark = "#171928",
+  bg_dark1 = "#0f101a",
+  bg_highlight = "#292e42",
+  terminal_black = "#414868",
+  fg = "#ebfafa",
+  fg_dark = "#ABB4DA",
+  fg_gutter = "#3b4261",
+  fg_gutter_light = "#7081d0",
+  dark3 = "#6473B7",
+  comment = "#7081d0",
+  dark5 = "#5866A2",
+  bright_cyan = "#39DDFD",
+  visual = "#76639e",
+  bg_visual = "#76639e",
+  cyan = "#04d1f9",
+  dark_cyan = "#10A1BD",
+  magenta = "#a48cf2",
+  bright_purple = "#ad8cff",
+  magenta2 = "#bf4f8e",
+  magenta3 = "#722f55",
+  pink = "#f265b5",
+  purple = "#a48cf2",
+  orange = "#f7c67f",
+  yellow = "#f1fc79",
+  dark_yellow = "#c0c95f",
+  green = "#37f499",
+  bright_green = "#00FA82",
+  dark_green = "#33C57F",
+  red = "#f16c75",
+  bright_red = "#f0313e",
+  git = {
+    change = "#7081d0",
+    add = "#37f499",
+    delete = "#f16c75",
+  },
+  gitSigns = {
+    add = "#37f499",
+    change = "#7081d0",
+    delete = "#f16c75",
+  },
+  -- Derived color variants for compatibility
+  blue = "#04d1f9",       -- same as cyan
+  blue0 = "#3b4261",      -- same as fg_gutter (darkest blue tone)
+  blue1 = "#39DDFD",      -- same as bright_cyan
+  blue2 = "#10A1BD",      -- same as dark_cyan
+  blue5 = "#04d1f9",      -- same as cyan (for operators/delimiters)
+  blue6 = "#39DDFD",      -- same as bright_cyan (for regex)
+  blue7 = "#3b4261",      -- same as fg_gutter (for subtle backgrounds)
+  green1 = "#00FA82",     -- same as bright_green
+  green2 = "#33C57F",     -- same as dark_green
+  red1 = "#f0313e",       -- same as bright_red
+  teal = "#00FA82",       -- same as bright_green
+}