From 294ea0a31a26c4b3c0842eea2290613073daf93b Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Wed, 17 Apr 2024 06:02:54 +0200
Subject: [PATCH] Finally updated gruvbox to latest version, fixes
 compatibility with treesitter

---
 nvim/dot-config/nvim/lazy-lock.json         |  2 +-
 nvim/dot-config/nvim/lua/themes/gruvbox.lua | 30 ++++++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json
index e0a62a6..7685c71 100644
--- a/nvim/dot-config/nvim/lazy-lock.json
+++ b/nvim/dot-config/nvim/lazy-lock.json
@@ -9,7 +9,7 @@
   "document-color.nvim": { "branch": "main", "commit": "74c487f0e5accfaae033755451b9e367220693fd" },
   "fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
   "gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" },
-  "gruvbox.nvim": { "branch": "main", "commit": "487598d979868224aff92cf8818195c1a60e5dfe" },
+  "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
   "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" },
   "inc-rename.nvim": { "branch": "main", "commit": "5e03e986625961d1fac296d1bf332a6510c3add6" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
diff --git a/nvim/dot-config/nvim/lua/themes/gruvbox.lua b/nvim/dot-config/nvim/lua/themes/gruvbox.lua
index f4668cb..912fa67 100644
--- a/nvim/dot-config/nvim/lua/themes/gruvbox.lua
+++ b/nvim/dot-config/nvim/lua/themes/gruvbox.lua
@@ -1,11 +1,9 @@
 -- https://github.com/ellisonleao/gruvbox.nvim
 return {
 	"ellisonleao/gruvbox.nvim",
-	commit = "487598d979868224aff92cf8818195c1a60e5dfe", -- Commit before things start breaking
 	priority = 1000,
 	config = function()
-		local config = require("gruvbox").config
-		local colors = require("gruvbox.palette").get_base_colors(vim.o.background, config.contrast)
+		local palette = require("gruvbox").palette
 
 		require("gruvbox").setup({
 			background = "dark",
@@ -13,27 +11,27 @@ return {
 				strings = false,
 			},
 			overrides = {
-				YankHighlight = { fg = colors.blue, bg = colors.bg0, reverse = config.inverse },
-				Search = { fg = colors.aqua },
+				YankHighlight = { fg = palette.bright_blue, bg = palette.dark0, reverse = true },
+				Search = { fg = palette.bright_aqua },
 				IncSearch = { link = "Search" },
-				NormalFloat = { bg = colors.bg0 },
-				FloatBorder = { fg = colors.bg4 },
-				TelescopePromptTitle = { fg = colors.fg4 },
+				NormalFloat = { bg = palette.dark0 },
+				FloatBorder = { fg = palette.dark4 },
+				TelescopePromptTitle = { fg = palette.light4 },
 				TelescopePromptBorder = { link = "FloatBorder" },
-				TelescopePromptPrefix = { fg = colors.red },
+				TelescopePromptPrefix = { fg = palette.bright_red },
 				TelescopePreviewTitle = { link = "TelescopePreviewTitle" },
 				TelescopePreviewBorder = { link = "FloatBorder" },
 				TelescopeResultsTitle = { link = "TelescopePreviewTitle" },
 				TelescopeResultsBorder = { link = "FloatBorder" },
-				TelescopeMatching = { fg = colors.aqua, bold = true },
-				TelescopeSelection = { fg = colors.blue },
+				TelescopeMatching = { fg = palette.bright_aqua, bold = true },
+				TelescopeSelection = { fg = palette.bright_blue },
 				TelescopeSelectionCaret = { link = "TelescopeSelection" },
-				CmpItemAbbrMatch = { fg = colors.aqua, bold = true },
+				CmpItemAbbrMatch = { fg = palette.bright_aqua, bold = true },
 				CmpItemAbbrMatchFuzzy = { link = "CmpItemAbbrMatch" },
-				CmpItemMenu = { fg = colors.bg2 },
-				CmpItemKindFunction = { fg = colors.red },
-				CmpSelection = { fg = colors.bg0, bg = colors.blue },
-				LspReferenceText = { fg = colors.bg0, bg = colors.neutral_purple },
+				CmpItemMenu = { fg = palette.dark2 },
+				CmpItemKindFunction = { fg = palette.bright_red },
+				CmpSelection = { fg = palette.dark0, bg = palette.bright_blue },
+				LspReferenceText = { fg = palette.dark0, bg = palette.neutral_purple },
 				LspReferenceRead = { link = "LspReferenceText" },
 				LspReferenceWrite = { link = "LspReferenceText" },
 			},