From 1f011dc2c562ddd5ea6da47555948418f8910501 Mon Sep 17 00:00:00 2001
From: hylo <hylo@posteo.de>
Date: Tue, 21 Mar 2023 19:14:58 +0100
Subject: [PATCH] feat: add Neogit and fix some related groups

---
 lua/flatwhite/groups.lua | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/lua/flatwhite/groups.lua b/lua/flatwhite/groups.lua
index 31cef08..d3f3eeb 100644
--- a/lua/flatwhite/groups.lua
+++ b/lua/flatwhite/groups.lua
@@ -39,14 +39,14 @@ local function setup(configs)
 		Comment = { fg = colors.comment, italic = configs.italic_comment },
 		Constant = { fg = colors.yellow },
 		String = colors.fw_green,
-		Character = { fg = colors.green },
+		Character = colors.fw_green,
 		Number = { fg = colors.orange },
 		Boolean = { fg = colors.cyan },
 		Float = { fg = colors.orange },
 		FloatBorder = { fg = colors.white },
 		Operator = { fg = colors.purple },
-		Keyword = { fg = colors.cyan },
-		Keywords = { fg = colors.cyan },
+		Keyword = colors.fw_purple,
+		Keywords = colors.fw_purple,
 		Identifier = { fg = colors.cyan },
 		Function = { fg = colors.yellow },
 		Statement = { fg = colors.purple },
@@ -66,18 +66,18 @@ local function setup(configs)
 		TypeDef = { fg = colors.yellow },
 		Special = { fg = colors.green, italic = true },
 		SpecialComment = { fg = colors.comment, italic = true },
-		Error = { fg = colors.bright_red },
-		Todo = { fg = colors.purple, bold = true, italic = true },
+		Error = colors.fw_red,
+		Todo = { fg = colors.blue_text, bg=colors.blue_bg, bold = true, italic = true },
 		Underlined = { fg = colors.cyan, underline = true },
 
 		Cursor = { reverse = true },
-		CursorLineNr = { fg = colors.fg, bold = true },
 
 		SignColumn = { bg = colors.bg },
 
 		Conceal = { fg = colors.comment },
 		CursorColumn = { bg = colors.black },
-		CursorLine = { bg = colors.selection },
+		CursorLine = {bg = colors.base4 },
+		CursorLineNr = {bg = colors.base4 },
 		ColorColumn = { bg = colors.selection },
 
 		StatusLine = { fg = colors.white, bg = colors.black },
@@ -85,18 +85,19 @@ local function setup(configs)
 		StatusLineTerm = { fg = colors.white, bg = colors.black },
 		StatusLineTermNC = { fg = colors.comment },
 
-		Directory = { fg = colors.cyan },
-		DiffAdd = { fg = colors.bg, bg = colors.green },
-		DiffChange = { fg = colors.orange },
-		DiffDelete = { fg = colors.red },
+		Directory = colors.fw_teal,
+		DiffAdd = colors.fw_green,
+		DiffChange = colors.fw_orange,
+		DiffDelete = colors.fw_red,
 		DiffText = { fg = colors.comment },
 
 		ErrorMsg = { fg = colors.bright_red },
 		VertSplit = { fg = colors.black },
 		Folded = { fg = colors.comment },
 		FoldColumn = {},
-		Search = { fg = colors.black, bg = colors.orange },
-		IncSearch = { fg = colors.orange, bg = colors.comment },
+		Search = { fg = colors.bg, bg = colors.purple_text_sec },
+		IncSearch = { fg = colors.bg, bg = colors.purple_text_sec },
+		-- IncSearch = { fg = colors.orange, bg = colors.comment },
 		LineNr = { fg = colors.comment },
 		MatchParen = { fg = colors.bg, bg = colors.blue_text_sec },
 		NonText = { fg = colors.nontext },
@@ -455,6 +456,17 @@ local function setup(configs)
 		LeapMatch = { fg = colors.bg, bg = colors.purple_text_sec },
 		LeapLabelPrimary = { fg = colors.bg, bg = colors.purple_text_sec },
 		LeapLabelSecondary = { fg = colors.bg, bg = colors.green_text_sec },
+
+                -- Neogit
+                -- NeogitHeadRegion = colors.fw_purple,
+                NeogitBranch = colors.fw_purple,
+                -- NeogitPushRegion = colors.fw_green,
+                NeogitRemote = colors.fw_green,
+                NeogitDiffAddHighlight = colors.fw_green,
+                NeogitDiffDeleteHighlight = colors.fw_red,
+                NeogitDiffContextHighlight = {bg = colors.base5}, --{bold = true},
+                NeogitHunkHeader = colors.fw_purple,
+                -- NeogitHunkHeaderHighlight = {reverse = true},
 	}
 end
 
-- 
2.30.2