From 699d99f272fb62876d967690dfc5c7b4ac500b53 Mon Sep 17 00:00:00 2001 From: CPea Date: Wed, 13 Aug 2025 01:51:23 +0700 Subject: [PATCH] feat(highlights): add support for `conflict-marker.nvim` --- lua/one_monokai/highlights/groups.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lua/one_monokai/highlights/groups.lua b/lua/one_monokai/highlights/groups.lua index d081c82..b975dbc 100644 --- a/lua/one_monokai/highlights/groups.lua +++ b/lua/one_monokai/highlights/groups.lua @@ -233,7 +233,7 @@ local defaults = { -- diff DiffAdd = { bg = colors.green:darken(0.3) }, - DiffChange = { fg = colors.white:darken(0.3) }, + DiffChange = { bg = colors.white:darken(0.3) }, DiffDelete = { bg = colors.red:darken(0.3) }, DiffText = { bg = colors.cyan:darken(0.3) }, @@ -474,6 +474,13 @@ local defaults = { GitConflictCurrentLabel = { fg = colors.fg, bg = colors.cyan:darken(0.6) }, GitConflictIncomingLabel = { fg = colors.fg, bg = colors.aqua:darken(0.6) }, + -- conflict-marker + ConflictOurs = { bg = colors.cyan:darken(0.3) }, + ConflictTheirs = { bg = colors.aqua:darken(0.3) }, + ConflictOursMarker = { fg = colors.fg, bg = colors.cyan:darken(0.6) }, + ConflictTheirsMarker = { fg = colors.fg, bg = colors.aqua:darken(0.6) }, + ConflictMid = { fg = colors.white, bg = colors.vulcan }, + -- lazy LazyButton = { fg = colors.white, bg = colors.vulcan }, LazyButtonActive = { fg = colors.black, bg = colors.white },