lazyvim: absorb colorscheme config

[dotfiles.git] / nvim / lua / plugins / colorscheme.lua

diff --git a/nvim/lua/plugins/colorscheme.lua b/nvim/lua/plugins/colorscheme.lua
index b742b4bbe046faeacb4bca31e54465965833f36c..501246e93bd99b68bb7eb26930c1004cd2ed7108 100644 (file)
--- a/nvim/lua/plugins/colorscheme.lua
+++ b/nvim/lua/plugins/colorscheme.lua
@@ -1,30 +1,73 @@
----@type LazyPluginSpec
+---@type LazySpec

 return {
 return {

-  { "LazyVim", opts = { colorscheme = "onenord" } },
-  {
+  { "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
     -- this meta plugin can be used to install all colorschemes to test with telescope

-    name = "colorschemes",

     dir = "",
     lazy = true,
     dependencies = {
       {
     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 },
+        "catppuccin/nvim",
+        name = "catppuccin",
+        opts = {
+          color_overrides = {
+            -- https://github.com/catppuccin/nvim/discussions/323#discussioncomment-5760383
+            mocha = {
+              rosewater = "#BF616A",
+              flamingo = "#BF616A",
+              pink = "#B48EAD",
+              mauve = "#B48EAD",
+              red = "#BF616A",
+              maroon = "#BF616A",
+              peach = "#D08770",
+              yellow = "#EBCB8B",
+              green = "#A3BE8C",
+              teal = "#88c0d0",
+              sky = "#88c0d0",
+              sapphire = "#88c0d0",
+              blue = "#81a1c1",
+              lavender = "#81a1c1",
+              text = "#ECEFF4",
+              subtext1 = "#E5E9F0",
+              subtext0 = "#D8DEE9",
+              overlay2 = "#8d9196",
+              overlay1 = "#81858b",
+              overlay0 = "#4C566A",
+              surface2 = "#434C5E",
+              surface1 = "#3B4252",
+              surface0 = "#292e39",
+              base = "#242933",
+              mantle = "#20242d",
+              crust = "#1c2028",

             },
             },

-          })
-          return opts
+          },
+        },
+      },
+      {
+        "shaunsingh/nord.nvim",
+        init = function()
+          vim.g.nord_contrats = true
+          vim.g.nord_borders = true
+          vim.g.nord_bold = false
+          vim.g.nord_uniform_diff_background = false
+          vim.g.nord_disable_background = false

         end,
       },
         end,
       },

-      { "folke/tokyonight.nvim" },
-      { "shaunsingh/nord.nvim"},

       -- conflicts with above
       -- { "gbprod/nord.nvim"},
     },
       -- conflicts with above
       -- { "gbprod/nord.nvim"},
     },