Restructure eldritch.nvim to match tokyonight.nvim architecture

README.md

@@ -38,6 +38,15 @@ Main Theme repo can be found [here](https://github.com/eldritch-theme/eldritch)
 
 </details>
 
+## ✨ Features
+
+- Supports the latest [Neovim](https://github.com/neovim/neovim) features like TreeSitter and LSP Semantic Tokens
+- Terminal colors support
+- **Automatic plugin detection** - When using [lazy.nvim](https://github.com/folke/lazy.nvim), plugins are automatically detected and their highlights are enabled
+- Over 30+ plugin support with modular highlight groups
+- Performance optimized with optional caching
+- Highly configurable with `on_colors` and `on_highlights` callbacks
+
 ### Installation
 
 Using [lazy.nvim](https://github.com/folke/lazy.nvim):
@@ -59,6 +68,18 @@ Using [lazy.nvim](https://github.com/folke/lazy.nvim):
 vim.cmd[[colorscheme eldritch]]
 ```
 
+To switch to the darker variant:
+
+```lua
+vim.cmd[[colorscheme eldritch-dark]]
+```
+
+To switch to the minimal variant:
+
+```lua
+vim.cmd[[colorscheme eldritch-minimal]]
+```
+
 #### [Lualine](https://github.com/nvim-lualine/lualine.nvim)
 
 ```lua
@@ -93,7 +114,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 = "default", -- The theme comes in three styles: "default", "darker" 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,19 +128,33 @@ 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
 
+  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,
+  },
+
   --- You can override specific color groups to use other groups or a hex color
   --- function will be called with a ColorScheme table
   ---@param colors ColorScheme
   on_colors = function(colors) end,
 
   --- You can override specific highlights to use other groups or a hex color
   --- function will be called with a Highlights and ColorScheme table
-  ---@param highlights Highlights
+  ---@param highlights eldritch.Highlights
   ---@param colors ColorScheme
   on_highlights = function(highlights, colors) end,
 })
@@ -143,7 +178,6 @@ require("eldritch").setup({
   styles = {
     functions = {}
   },
-  sidebars = { "qf", "vista_kind", "terminal", "packer" },
   -- Change the "hint" color to the "orange" color, and make the "error" color bright red
   on_colors = function(colors)
     colors.hint = colors.orange

colors/eldritch-dark.lua

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

colors/eldritch-minimal.lua

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

colors/eldritch.lua

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

lua/eldritch/colors/darker.lua

@@ -0,0 +1,46 @@
+---@type Palette
+return {
+  bg = "#171928",
+  bg_dark = "#0f101a",
+  bg_highlight = "#1e2033",
+  fg = "#d8e6e6",
+  fg_dark = "#8e94b8",
+  fg_gutter = "#2d3249",
+  fg_gutter_light = "#4a5584",
+  terminal_black = "#2a2e45",
+  dark3 = "#445084",
+  comment = "#506299",
+  dark5 = "#3d4775",
+  bright_cyan = "#2bafcc",
+  cyan = "#0396b3",
+  dark_cyan = "#0c7a94",
+  magenta = "#8b75d9",
+  magenta2 = "#94407a",
+  magenta3 = "#5c2644",
+  pink = "#d154a1",
+  purple = "#8b75d9",
+  orange = "#d4a666",
+  yellow = "#ccd663",
+  dark_yellow = "#a1a34d",
+  green = "#2dcc82",
+  green1 = "#2dcc82",
+  green2 = "#2dcc82",
+  bright_green = "#00cc68",
+  dark_green = "#299e64",
+  teal = "#299e64",
+  red = "#cc5860",
+  red1 = "#cc5860",
+  bright_red = "#cc2935",
+  blue = "#0396b3",
+  blue0 = "#506299",
+  blue1 = "#2bafcc",
+  blue2 = "#0396b3",
+  blue5 = "#0396b3",
+  blue6 = "#0396b3",
+  blue7 = "#2d3249",
+  git = {
+    change = "#506299",
+    add = "#2dcc82",
+    delete = "#cc5860",
+  },
+}

lua/eldritch/colors/default.lua

@@ -0,0 +1,46 @@
+---@type Palette
+return {
+  bg = "#212337",
+  bg_dark = "#171928",
+  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",
+  cyan = "#04d1f9",
+  dark_cyan = "#10A1BD",
+  magenta = "#a48cf2",
+  magenta2 = "#bf4f8e",
+  magenta3 = "#722f55",
+  pink = "#f265b5",
+  purple = "#a48cf2",
+  orange = "#f7c67f",
+  yellow = "#f1fc79",
+  dark_yellow = "#c0c95f",
+  green = "#37f499",
+  green1 = "#37f499",
+  green2 = "#37f499",
+  bright_green = "#00FA82",
+  dark_green = "#33C57F",
+  teal = "#33C57F",
+  red = "#f16c75",
+  red1 = "#f16c75",
+  bright_red = "#f0313e",
+  blue = "#04d1f9",
+  blue0 = "#7081d0",
+  blue1 = "#39DDFD",
+  blue2 = "#04d1f9",
+  blue5 = "#04d1f9",
+  blue6 = "#04d1f9",
+  blue7 = "#3b4261",
+  git = {
+    change = "#7081d0",
+    add = "#37f499",
+    delete = "#f16c75",
+  },
+}