lazyvim: absorb colorscheme config

diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua
index b88ded792028797144efd3f99717f75117af767e..68de635ef3d263c773976b442beae97e17577e4c 100644 (file)
--- a/nvim/lua/config/lazy.lua
+++ b/nvim/lua/config/lazy.lua
@@ -27,7 +27,7 @@ require("lazy").setup({
     version = false, -- always use the latest git commit
     -- version = "*", -- try installing the latest stable version for plugins that support semver
   },
-  install = { colorscheme = { "tokyonight", "habamax" } },
+  install = { colorscheme = { "onenord", "habamax" } },
   checker = {
     -- automatically check for plugin updates
     enabled = true,

diff --git a/nvim/lua/plugins/colorscheme.lua b/nvim/lua/plugins/colorscheme.lua
index 8e1ae25dd2ba222b4a7290f274135b6a866315b7..501246e93bd99b68bb7eb26930c1004cd2ed7108 100644 (file)
--- a/nvim/lua/plugins/colorscheme.lua
+++ b/nvim/lua/plugins/colorscheme.lua
@@ -1,33 +1,26 @@
----@type LazyPluginSpec
+---@type LazySpec
 return {
-  {
-    "LazyVim",
-    opts = { colorscheme = "onenord" },
-    dependencies = { "onenord.nvim" },
+  { "rmehri01/onenord.nvim",
+    lazy = false,
+    priority = 1000,
+    opts = function(_, opts)
+      local colors = require("onenord.colors").load()
+      opts = vim.tbl_extend("force", opts, {
+        custom_highlights = {
+          ["@parameter"] = { fg = colors.fg },
+          ["@namespace"] = { fg = colors.fg },
+          ["@type"] = { fg = colors.fg },
+          ["@variable.builtin"] = { fg = colors.fg },
+        },
+      })
+      return opts
+    end,
   },
-  {
+  { name = "colorschemes",
     -- this meta plugin can be used to install all colorschemes to test with telescope
-    name = "colorschemes",
     dir = "",
     lazy = true,
     dependencies = {
-      {
-        -- requires too much configuration to make look good
-        "rmehri01/onenord.nvim",
-        opts = function(_, opts)
-          local colors = require("onenord.colors").load()
-          opts = vim.tbl_extend("force", opts, {
-            custom_highlights = {
-              ["@parameter"] = { fg = colors.fg },
-              ["@namespace"] = { fg = colors.fg },
-              ["@type"] = { fg = colors.fg },
-              ["@variable.builtin"] = { fg = colors.fg },
-            },
-          })
-          return opts
-        end,
-      },
-      { "folke/tokyonight.nvim" },
       {
         "catppuccin/nvim",
         name = "catppuccin",
@@ -67,7 +60,6 @@ return {
       },
       {
         "shaunsingh/nord.nvim",
-        dev = true,
         init = function()
           vim.g.nord_contrats = true
           vim.g.nord_borders = true