gitconfig

@@ -112,17 +112,13 @@
 [credential "https://github.com"]
 	helper = !gh auth git-credential
 [diff]
-	colorWords = true
 	tool = vimdiff
 	ignoreSubmodules = dirty
 [merge]
 	tool = vimdiff
-	conflictstyle = zdiff3
 [interactive]
 	diffFilter = delta --color-only
 [delta]
-	navigate = true
-	dark = true
 	side-by-side = true
 	plus-style = 'syntax "#142e20"'
 	zero-style = 'syntax "#1d1f21" dim'
@@ -130,6 +126,3 @@
 	commit-decoration-style = bold yellow box ul
 	file-style = bold yellow ul
 	file-decoration-style = none
-	wrap-max-lines=unlimited
-	wrap-right-percent=1
-	wrap-left-symbol=" "

vim/lua/lightline_config.lua

@@ -48,7 +48,7 @@ local diagnostics = {
 require("lualine").setup({
 	options = {
 		icons_enabled = false,
-    theme = "gruvbox_dark",
+		theme = "gruxbox_dark",
 		component_separators = "",
 		section_separators = { left = "", right = "" },
 	},