Fix highlights in git diff -v

muchzill4 · Sep 16, 2024 · 4e24331 · 4e24331
1 parent 0bced5d
commit 4e24331
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/colors/doubletrouble.vim b/colors/doubletrouble.vim
@@ -7,6 +7,8 @@ set background=dark
 highlight Normal guifg=#CDCFE4 guibg=#1D1D30 guisp=NONE blend=NONE gui=NONE
 highlight! link FzfLuaHeaderText Normal
 highlight! link @variable Normal
+highlight Added guifg=#7FC79B guibg=NONE guisp=NONE blend=NONE gui=NONE
+highlight Changed guifg=#BB781B guibg=NONE guisp=NONE blend=NONE gui=NONE
 highlight Character guifg=#D1AF9F guibg=NONE guisp=NONE blend=NONE gui=italic
 highlight CmpItemAbbr guifg=#CDCFE4 guibg=NONE guisp=NONE blend=NONE gui=NONE
 highlight CmpItemAbbrDeprecated guifg=#6CA9EF guibg=NONE guisp=NONE blend=NONE gui=NONE
@@ -28,12 +30,9 @@ highlight DiagnosticUnderlineInfo guifg=NONE guibg=NONE guisp=#9C9FC9 blend=NONE
 highlight DiagnosticUnderlineWarn guifg=NONE guibg=NONE guisp=#E6A64C blend=NONE gui=undercurl
 highlight DiagnosticWarn guifg=#E6A64C guibg=NONE guisp=NONE blend=NONE gui=NONE
 highlight DiffAdd guifg=NONE guibg=#1C3129 guisp=NONE blend=NONE gui=NONE
-highlight! link diffAdded DiffAdd
 highlight DiffChange guifg=NONE guibg=#3F2C17 guisp=NONE blend=NONE gui=NONE
-highlight! link diffChanged DiffChange
-highlight DiffDelete guifg=NONE guibg=#471A26 guisp=NONE blend=NONE gui=NONE
-highlight! link diffRemoved DiffDelete
-highlight DiffText guifg=NONE guibg=#2D1F11 guisp=NONE blend=NONE gui=NONE
+highlight DiffDelete guifg=#E25A6A guibg=#471A26 guisp=NONE blend=NONE gui=NONE
+highlight DiffText guifg=NONE guibg=#6C4B28 guisp=NONE blend=NONE gui=NONE
 highlight Directory guifg=#6CA9EF guibg=NONE guisp=NONE blend=NONE gui=NONE
 highlight EndOfBuffer guifg=#393D6A guibg=NONE guisp=NONE blend=NONE gui=NONE
 highlight! link NonText EndOfBuffer
@@ -87,6 +86,7 @@ highlight! link WildMenu PmenuSel
 highlight PmenuThumb guifg=NONE guibg=#393D6A guisp=NONE blend=NONE gui=NONE
 highlight PreProc guifg=#9C9FC9 guibg=NONE guisp=NONE blend=NONE gui=NONE
 highlight QuickFixLine guifg=NONE guibg=#4E361D guisp=NONE blend=NONE gui=NONE
+highlight Removed guifg=#E25A6A guibg=NONE guisp=NONE blend=NONE gui=NONE
 highlight Search guifg=NONE guibg=#4E361D guisp=NONE blend=NONE gui=NONE
 highlight! link FzfLuaCursorLine Search
 highlight SignColumn guifg=NONE guibg=NONE guisp=NONE blend=NONE gui=NONE

diff --git a/lua/doubletrouble/lush_theme.lua b/lua/doubletrouble/lush_theme.lua
@@ -69,10 +69,13 @@ local theme = lush(function(injected_functions)
     CursorColumn { ColorColumn }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
     CursorLine { ColorColumn }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set.
     Directory { fg = c.blue }, -- Directory names (and other special names in listings)
+    Added { fg = c.green },
+    Changed { fg = c.brown },
+    Removed { fg = c.red },
     DiffAdd { bg = c.bg_green }, -- Diff mode: Added line |diff.txt|
     DiffChange { bg = c.bg_brown }, -- Diff mode: Changed line |diff.txt|
-    DiffDelete { bg = c.bg_red }, -- Diff mode: Deleted line |diff.txt|
-    DiffText { bg = c.bg_brown.da(30) }, -- Diff mode: Changed text within a changed line |diff.txt|
+    DiffText { bg = c.bg_brown.li(15) }, -- Diff mode: Changed text within a changed line |diff.txt|
+    DiffDelete { bg = c.bg_red, fg = c.red }, -- Diff mode: Deleted line |diff.txt|
     EndOfBuffer { fg = c.bg_white }, -- Filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|.
     -- TermCursor   { }, -- Cursor in a focused terminal
     -- TermCursorNC { }, -- Cursor in an unfocused terminal
@@ -280,11 +283,6 @@ local theme = lush(function(injected_functions)
     -- sym"@debug"             { }, -- Debug
     -- sym"@tag"               { }, -- Tag
 
-    -- highlights in "git commit -v"
-    diffAdded { DiffAdd },
-    diffChanged { DiffChange },
-    diffRemoved { DiffDelete },
-
     -- nvim-telescope/telescope.nvim
     TelescopeMatching { Function },
     TelescopeCounter { LineNr },