From 7c38e3da574d486311925c57917c69bc153b1b28 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Sat, 10 Sep 2022 10:08:04 +0600
Subject: [PATCH 01/18] feat(gruvbox_material): new theme

---
 lua/base46/themes/gruvbox_material.lua | 59 ++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 lua/base46/themes/gruvbox_material.lua

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
new file mode 100644
index 0000000..50eaf3d
--- /dev/null
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -0,0 +1,59 @@
+local M = {}
+
+M.base_30 = {
+  white = "#ebdbb2",
+  darker_black = "#222222",
+  black = "#282828", --  nvim bg
+  black2 = "#2e2e2e",
+  one_bg = "#323232",
+  one_bg2 = "#3b3b3b",
+  one_bg3 = "#434343",
+  grey = "#505050",
+  grey_fg = "#5a5a5a",
+  grey_fg2 = "#646464",
+  light_grey = "#6c6c6c",
+  red = "#ea6962",
+  baby_pink = "#ce8196",
+  pink = "#ff75a0",
+  line = "#373737", -- for lines like vertsplit
+  green = "#89b482",
+  vibrant_green = "#a9b665",
+  nord_blue = "#6f8faf",
+  blue = "#6d8dad",
+  yellow = "#d8a657",
+  sun = "#eab869",
+  purple = "#d3869b",
+  dark_purple = "#d3869b",
+  teal = "#749689",
+  orange = "#e78a4e",
+  cyan = "#89b482",
+  statusline_bg = "#2c2c2c",
+  lightbg = "#393939",
+  pmenu_bg = "#89b482",
+  folder_bg = "#6d8dad",
+}
+
+M.base_16 = {
+  base0A = "#e0c080",
+  base04 = "#d4be98",
+  base07 = "#c7b89d",
+  base05 = "#c0b196",
+  base0E = "#d3869b",
+  base0D = "#7daea3",
+  base0C = "#86b17f",
+  base0B = "#a9b665",
+  base02 = "#323232",
+  base0F = "#d65d0e",
+  base03 = "#434343",
+  base08 = "#ec6b64",
+  base01 = "#2e2e2e",
+  base00 = "#282828",
+  base09 = "#e78a4e",
+  base06 = "#c3b499",
+}
+
+vim.opt.bg = "dark"
+
+M = require("base46").override_theme(M, "gruvbox_material")
+
+return M

From 37dd415d581bd132f52b4461edf6225367fc3196 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Sat, 10 Sep 2022 10:18:19 +0600
Subject: [PATCH 02/18] feat(gruvbox_material): base16 updates

---
 lua/base46/themes/gruvbox_material.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 50eaf3d..7db5719 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -34,22 +34,22 @@ M.base_30 = {
 }
 
 M.base_16 = {
-  base0A = "#e0c080",
+  base0A = "#d8a657",
   base04 = "#d4be98",
   base07 = "#c7b89d",
   base05 = "#c0b196",
   base0E = "#d3869b",
-  base0D = "#7daea3",
-  base0C = "#86b17f",
+  base0D = "#749689",
+  base0C = "#89b482",
   base0B = "#a9b665",
   base02 = "#323232",
-  base0F = "#d65d0e",
+  base0F = "#dd8044",
   base03 = "#434343",
-  base08 = "#ec6b64",
+  base08 = "#ea6962",
   base01 = "#2e2e2e",
   base00 = "#282828",
   base09 = "#e78a4e",
-  base06 = "#c3b499",
+  base06 = "#d4be98",
 }
 
 vim.opt.bg = "dark"

From c40b2f7d9e0bca9c39d981ba15c395e6d96b00c2 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Sat, 10 Sep 2022 19:21:22 +0600
Subject: [PATCH 03/18] feat(gruvbox_material): variables will use blue

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 7db5719..67adaa6 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -45,7 +45,7 @@ M.base_16 = {
   base02 = "#323232",
   base0F = "#dd8044",
   base03 = "#434343",
-  base08 = "#ea6962",
+  base08 = "#7daea3",
   base01 = "#2e2e2e",
   base00 = "#282828",
   base09 = "#e78a4e",

From fa37bdd64041f3babc5c5024e956759b4f484bb7 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Sat, 10 Sep 2022 19:32:09 +0600
Subject: [PATCH 04/18] feat(gruvbox_material): fucntion names will use green
 now

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 67adaa6..c73a4fe 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -39,7 +39,7 @@ M.base_16 = {
   base07 = "#c7b89d",
   base05 = "#c0b196",
   base0E = "#d3869b",
-  base0D = "#749689",
+  base0D = "#a9b665",
   base0C = "#89b482",
   base0B = "#a9b665",
   base02 = "#323232",

From 34b3e2452726d41b161e1c71cb638ce32717c856 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Sat, 10 Sep 2022 20:06:05 +0600
Subject: [PATCH 05/18] feat(gruvbox_material): some problems with variables

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index c73a4fe..dc80077 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -49,7 +49,7 @@ M.base_16 = {
   base01 = "#2e2e2e",
   base00 = "#282828",
   base09 = "#e78a4e",
-  base06 = "#d4be98",
+  base06 = "#7daea3",
 }
 
 vim.opt.bg = "dark"

From b632d4f3fe208ff85a3dccd21364eedb79fd41cc Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Sat, 10 Sep 2022 20:08:03 +0600
Subject: [PATCH 06/18] fix(gruvbox_material): revert last commit

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index dc80077..c73a4fe 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -49,7 +49,7 @@ M.base_16 = {
   base01 = "#2e2e2e",
   base00 = "#282828",
   base09 = "#e78a4e",
-  base06 = "#7daea3",
+  base06 = "#d4be98",
 }
 
 vim.opt.bg = "dark"

From c025b6db432a3c9e904f07acc082eddd859555c5 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Sun, 11 Sep 2022 21:31:26 +0600
Subject: [PATCH 07/18] feat(gruvbox_material): keyword color changed to red

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index c73a4fe..f3cb07a 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -38,7 +38,7 @@ M.base_16 = {
   base04 = "#d4be98",
   base07 = "#c7b89d",
   base05 = "#c0b196",
-  base0E = "#d3869b",
+  base0E = "#ea6962",
   base0D = "#a9b665",
   base0C = "#89b482",
   base0B = "#a9b665",

From 171f1458b5cf2eb6d1ad67beac0c0f5094a40827 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:49:25 +0600
Subject: [PATCH 08/18] feat(gruvbox_material): polishing highlight groups

---
 lua/base46/themes/gruvbox_material.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index f3cb07a..2d9a4e6 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -52,6 +52,10 @@ M.base_16 = {
   base06 = "#d4be98",
 }
 
+M.polish_hl = {
+  TSVariable = { fg = M.base_16.base08 },
+}
+
 vim.opt.bg = "dark"
 
 M = require("base46").override_theme(M, "gruvbox_material")

From 31c1a5ba43e1bb90e565e025cb42b5353e5909ae Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 13:06:23 +0600
Subject: [PATCH 09/18] feat(gruvbox_material): include property uses red now

---
 lua/base46/themes/gruvbox_material.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 2d9a4e6..62878eb 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -54,6 +54,7 @@ M.base_16 = {
 
 M.polish_hl = {
   TSVariable = { fg = M.base_16.base08 },
+  TSInclude = { fg = M.base_30.red },
 }
 
 vim.opt.bg = "dark"

From ef2208ca42abf15a2ebe541c34450540b6b0d464 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 13:15:20 +0600
Subject: [PATCH 10/18] feat(gruvbox_material): include property color doesn't
 change

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 62878eb..f8f3dda 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -54,7 +54,7 @@ M.base_16 = {
 
 M.polish_hl = {
   TSVariable = { fg = M.base_16.base08 },
-  TSInclude = { fg = M.base_30.red },
+  TSInclude = { fg = M.base_16.base0E },
 }
 
 vim.opt.bg = "dark"

From 2b0c13cb3be1c874942983a9aa58e600d091364c Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 13:24:38 +0600
Subject: [PATCH 11/18] fix(gruvbox_material): `TSInclude` should be 1st

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index f8f3dda..7b5753c 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -53,8 +53,8 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSVariable = { fg = M.base_16.base08 },
   TSInclude = { fg = M.base_16.base0E },
+  TSVariable = { fg = M.base_16.base08 },
 }
 
 vim.opt.bg = "dark"

From 6dcc14829fef3aa213618074e355cf174cf97d34 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 13:34:03 +0600
Subject: [PATCH 12/18] fix(gruvbox_material): trying to change `TSInclude`
 property's color

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 7b5753c..3b3c7f3 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -53,7 +53,7 @@ M.base_16 = {
 }
 
 M.polish_hl = {
-  TSInclude = { fg = M.base_16.base0E },
+  Include = { fg = M.base_16.base0E },
   TSVariable = { fg = M.base_16.base08 },
 }
 

From eb1d3dbaa06859fa4173004fe7fb52efad202418 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 13:48:59 +0600
Subject: [PATCH 13/18] fix(gruvbox_material): `TSProperty` doesn't use the
 same color as `TSVariable`

---
 lua/base46/themes/gruvbox_material.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 3b3c7f3..f2d8191 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -55,6 +55,7 @@ M.base_16 = {
 M.polish_hl = {
   Include = { fg = M.base_16.base0E },
   TSVariable = { fg = M.base_16.base08 },
+  TSProperty = { fg = M.base_16.base0C },
 }
 
 vim.opt.bg = "dark"

From efd42658402fe70b3790128eff6a8d6dd20e0cf5 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:01:32 +0600
Subject: [PATCH 14/18] feat(gruvbox_material): strings now use Teal

---
 lua/base46/themes/gruvbox_material.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index f2d8191..3e447ad 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -56,6 +56,7 @@ M.polish_hl = {
   Include = { fg = M.base_16.base0E },
   TSVariable = { fg = M.base_16.base08 },
   TSProperty = { fg = M.base_16.base0C },
+  TSString = { fg = M.base_16.base0C },
 }
 
 vim.opt.bg = "dark"

From b4b472a535bde5fc7efec6fef315529dff5b0dcb Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:11:59 +0600
Subject: [PATCH 15/18] fix(gruvbox_material): updated base_16 table

---
 lua/base46/themes/gruvbox_material.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 3e447ad..3413cc4 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -41,7 +41,7 @@ M.base_16 = {
   base0E = "#ea6962",
   base0D = "#a9b665",
   base0C = "#89b482",
-  base0B = "#a9b665",
+  base0B = "#89b482",
   base02 = "#323232",
   base0F = "#dd8044",
   base03 = "#434343",
@@ -56,7 +56,6 @@ M.polish_hl = {
   Include = { fg = M.base_16.base0E },
   TSVariable = { fg = M.base_16.base08 },
   TSProperty = { fg = M.base_16.base0C },
-  TSString = { fg = M.base_16.base0C },
 }
 
 vim.opt.bg = "dark"

From a1cb8ad92928084c4d253f5c6840414d534d31b6 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:17:09 +0600
Subject: [PATCH 16/18] fix(gruvbox_material): changed to color red for `for`
 keyword

---
 lua/base46/themes/gruvbox_material.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 3413cc4..217d872 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -56,6 +56,7 @@ M.polish_hl = {
   Include = { fg = M.base_16.base0E },
   TSVariable = { fg = M.base_16.base08 },
   TSProperty = { fg = M.base_16.base0C },
+  TSRepeat = { fg = M.base_16.base0 },
 }
 
 vim.opt.bg = "dark"

From b2b154c253fd73ecdbce4c6aed8c2d29df7d66cd Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:29:06 +0600
Subject: [PATCH 17/18] fix(gruvbox_material): `TSRepeat` links to `Repeat`

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index 217d872..a8126b2 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -56,7 +56,7 @@ M.polish_hl = {
   Include = { fg = M.base_16.base0E },
   TSVariable = { fg = M.base_16.base08 },
   TSProperty = { fg = M.base_16.base0C },
-  TSRepeat = { fg = M.base_16.base0 },
+  Repeat = { fg = M.base_16.base0 },
 }
 
 vim.opt.bg = "dark"

From 5d8164facc2fc5f7b6275015d55003a34ce9d6b2 Mon Sep 17 00:00:00 2001
From: RitchielRez <52417892+ritchielrez@users.noreply.github.com>
Date: Mon, 12 Sep 2022 16:31:03 +0600
Subject: [PATCH 18/18] fix(gruvbox_material): not `base0` but `base0E`

---
 lua/base46/themes/gruvbox_material.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/base46/themes/gruvbox_material.lua b/lua/base46/themes/gruvbox_material.lua
index a8126b2..39599a1 100644
--- a/lua/base46/themes/gruvbox_material.lua
+++ b/lua/base46/themes/gruvbox_material.lua
@@ -56,7 +56,7 @@ M.polish_hl = {
   Include = { fg = M.base_16.base0E },
   TSVariable = { fg = M.base_16.base08 },
   TSProperty = { fg = M.base_16.base0C },
-  Repeat = { fg = M.base_16.base0 },
+  Repeat = { fg = M.base_16.base0E  },
 }
 
 vim.opt.bg = "dark"