You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
How do I display colors when resolving conflicts? Currently, when I switch to other color schemes, the background color is shown when resolving conflicts, but when I switch back to onedark, the background disappears
This is example using gruvbox:
This is example using onedark:
This is my config:
return {
"navarasu/onedark.nvim",
opts= {
style="warm", -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light'transparent=true, -- Show/hide backgroundterm_colors=true, -- Change terminal color as per the selected theme styleending_tildes=false, -- Show the end-of-buffer tildes. By default they are hiddencmp_itemkind_reverse=false, -- reverse item kind highlights in cmp menu-- toggle theme style ---toggle_style_key=nil, -- keybind to toggle theme style. Leave it nil to disable it, or set it to a string, for example "<leader>ts"toggle_style_list= { "dark", "darker", "cool", "deep", "warm", "warmer", "light" }, -- List of styles to toggle between-- Change code style ----- Options are italic, bold, underline, none-- You can configure multiple style with comma separated, For e.g., keywords = 'italic,bold'code_style= {
comments="italic",
keywords="none",
functions="none",
strings="none",
variables="none",
},
-- Lualine options --lualine= {
transparent=true, -- lualine center bar transparency
},
-- Custom Highlights --colors= {}, -- Override default colorshighlights= {
-- make floating windows transparent-- NormalFloat = { bg = "none" },-- FloatBorder = { bg = "none" },-- -- but keep background for Lazy and Mason-- LazyNormal = { fg = '$fg', bg = '$bg1' },-- MasonNormal = { fg = '$fg', bg = '$bg1' },-- reverse colors for visual selectionVisual= { fmt='reverse' },
},
-- Plugins Config --diagnostics= {
darker=true, -- darker colors for diagnosticundercurl=true, -- use undercurl instead of underline for diagnosticsbackground=true, -- use background color for virtual text
},
},
}
The text was updated successfully, but these errors were encountered:
How do I display colors when resolving conflicts? Currently, when I switch to other color schemes, the background color is shown when resolving conflicts, but when I switch back to onedark, the background disappears
This is example using gruvbox:
This is example using onedark:
This is my config:
The text was updated successfully, but these errors were encountered: