tiyn/tccs.nvim
1
0
Fork 0
mirror of https://github.com/tiyn/tccs.nvim.git synced 2026-03-26 13:54:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

added support for resolve.nvim

Browse Source
This commit is contained in:
Marten B. Kante
2026-03-17 05:15:23 +01:00
parent 06df433026
commit 181bc2d41e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -36,8 +36,9 @@ Other plugins may work as well, but don't are explicitly configured.
- [NVIM Tree](https://github.com/nvim-tree/nvim-tree.lua)
- [NVIM Treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
- [NVIM Ufo](https://github.com/kevinhwang91/nvim-ufo)
- [VIM Illuminate](https://github.com/RRethy/vim-illuminate)
- [resolve.nvim](https://github.com/spacedentist/resolve.nvim)
- [Todo Comments](https://github.com/folke/todo-comments.nvim)
- [VIM Illuminate](https://github.com/RRethy/vim-illuminate)
- [Wilder](https://github.com/gelguy/wilder.nvim)
## Setup

9
lua/tccs/theme.lua
View File

@@ -314,6 +314,15 @@ theme.set_highlights = function(opts)
hl(0, "YankHighlight", { bg = c.yank_fg })
hl(0, "TextYankPost", { bg = c.yank_fg })
-- resolve.nvim
hl(0, "ResolveOursMarker", { bg = c.added_fg, bold = true })
hl(0, "ResolveTheirsMarker", { bg = c.modified_fg, bold = true })
hl(0, "ResolveSeparatorMarker", { bg = c.border, bold = true })
hl(0, "ResolveAncestorMarker", { bg = c.removed_fg, bold = true })
hl(0, "ResolveOursSection", { bg = c.added_bg })
hl(0, "ResolveTheirsSection", { bg = c.modified_bg })
hl(0, "ResolveAncestorSection", { bg = c.removed_bg })
end
return theme