From 2b32dda9f9b7ea9a2f87ca0a4d6ee5fab06fc491 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Tue, 3 Feb 2026 01:18:32 -0500 Subject: [PATCH] misc cleanups for diffing --- lua/midnight/palette.lua | 6 +++--- lua/midnight/theme.lua | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lua/midnight/palette.lua b/lua/midnight/palette.lua index a701c6a..c531133 100644 --- a/lua/midnight/palette.lua +++ b/lua/midnight/palette.lua @@ -84,10 +84,10 @@ M.midnight = { -- Generated via: M.blend(base_color, '#121212', 0.4) -- diff_add = M.blend('#98c379', '#121212', 0.4) -- green -- diff_delete = M.blend('#ff6b6b', '#121212', 0.4) -- red - -- diff_change = M.blend('#e5c07b', '#121212', 0.4) -- yellow + -- diff_change = M.blend('#7aa2f7', '#121212', 0.4) -- blue diff_add = '#0c2f1e', diff_delete = '#291f27', - diff_change = '#66583c', + diff_change = '#3a4a6d', } ---@type Palette @@ -122,7 +122,7 @@ M.daylight = { -- Generated via: M.blend(base_color, '#f5f5f5', 0.4) diff_add = '#a5c5ab', diff_delete = '#e2a1b2', - diff_change = '#d0bc93', + diff_change = '#a9b7e5', } ---@return Palette diff --git a/lua/midnight/theme.lua b/lua/midnight/theme.lua index 3a76ebf..1239f47 100644 --- a/lua/midnight/theme.lua +++ b/lua/midnight/theme.lua @@ -148,8 +148,13 @@ function M.apply() hi('@attribute.diff', { fg = cs.background }) hi('DiffAdd', { bg = cs.diff_add, fg = cs.green }, { '@text.diff.add', 'diffAdded' }) hi('DiffDelete', { bg = cs.diff_delete, fg = cs.red }, { '@text.diff.delete', 'diffRemoved' }) - hi('DiffChange', { bg = cs.diff_change, fg = cs.yellow }) - hi('DiffText', { fg = cs.foreground, bg = cs.blue }) + hi('DiffChange', { bg = cs.diff_change, fg = cs.blue }) + hi('DiffText', { bg = cs.blue, fg = cs.foreground }) + + hi('DiffsDiffAdd', { bg = cs.diff_add }) + hi('DiffsDiffDelete', { bg = cs.diff_delete }) + hi('DiffsDiffChange', { bg = cs.diff_change }) + hi('DiffsDiffText', { bg = cs.blue }) hi('@constructor.lua', { fg = cs.background }) hi('@markup.heading.gitcommit', { none = true })