refactor(nvim): clean up colorschemes

4 files changed, 22 insertions, 32 deletions

diff --git a/nvim/.config/nvim/lua/tobyvin.lua b/nvim/.config/nvim/lua/tobyvin.lua
index 8a93bfa..bd755bc 100644
--- a/nvim/.config/nvim/lua/tobyvin.lua
+++ b/nvim/.config/nvim/lua/tobyvin.lua
@@ -2,7 +2,6 @@ require("tobyvin.options")
 require("tobyvin.keymaps")
 require("tobyvin.lazy")
 require("tobyvin.utils.start")
-vim.cmd([[colorscheme gruvbox]])
 
 vim.api.nvim_create_autocmd("User", {
 	pattern = "VeryLazy",
diff --git a/nvim/.config/nvim/lua/tobyvin/lazy.lua b/nvim/.config/nvim/lua/tobyvin/lazy.lua
index 7c97224..a9d2f3c 100644
--- a/nvim/.config/nvim/lua/tobyvin/lazy.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lazy.lua
@@ -24,10 +24,6 @@ require("lazy").setup("tobyvin.plugins", {
 			"tokyonight",
 		},
 	},
-	checker = {
-		enabled = true,
-		notify = false,
-	},
 	ui = {
 		border = "single",
 	},
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua b/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua
index bef1a33..6d69599 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua
@@ -1,14 +1,11 @@
 local M = {
 	"ellisonleao/gruvbox.nvim",
-}
-
-function M.config()
-	local gruvbox = require("gruvbox")
-
-	local colors = require("gruvbox.palette")
-	gruvbox.setup({
+	lazy = false,
+	priority = 1000,
+	opts = {
 		contrast = "hard",
 		transparent_mode = true,
+		inverse = false,
 		overrides = {
 			GruvboxRedSign = { bg = "" },
 			GruvboxGreenSign = { bg = "" },
@@ -23,21 +20,24 @@ function M.config()
 			CursorLine = { bg = "" },
 			CursorLineNr = { bg = "" },
 			SignColumn = { bg = "" },
-			DiffDelete = { reverse = false },
-			DiffAdd = { reverse = false },
-			DiffChange = { reverse = false },
-			DiffText = { reverse = false },
-			StatusLine = { fg = colors.light1, bg = colors.dark2, reverse = false },
-			StatusLineNC = { fg = colors.light4, bg = colors.dark1, reverse = false },
-			WinBar = { link = "StatusLineNC" },
-			WinBarNC = { fg = colors.light4, bg = "" },
 			QuickFixLine = { fg = "", bg = "" },
-
-			-- TODO: workaround for weird highlights in lsp hover/signature
-			-- SEE: https://github.com/neovim/neovim/issues/13746
-			markdownError = { link = "Normal" },
+			StatusLine = { link = "Pmenu" },
+			StatusLineNC = { link = "GruvboxNC" },
+			WinBar = { link = "GruvboxNC" },
+			WinBarNC = { link = "GruvboxFg4" },
 		},
+	},
+}
+
+function M.config(_, opts)
+	vim.api.nvim_set_hl(0, "GruvboxNC", {
+		fg = require("gruvbox.palette").light4,
+		bg = require("gruvbox.palette").dark1,
 	})
+
+	require("gruvbox").setup(opts)
+
+	vim.cmd([[colorscheme gruvbox]])
 end
 
 return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/tokyonight.lua b/nvim/.config/nvim/lua/tobyvin/plugins/tokyonight.lua
index d66ea9d..0304acd 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/tokyonight.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/tokyonight.lua
@@ -1,17 +1,12 @@
 local M = {
 	"folke/tokyonight.nvim",
-}
-
-function M.config()
-	local tokyonight = require("tokyonight")
-
-	tokyonight.setup({
+	opts = {
 		styles = {
 			sidebars = "transparent",
 			floats = "transparent",
 		},
 		transparent = true,
-	})
-end
+	},
+}
 
 return M