wires/nvim
1
0
Fork 0
Code Pull requests Projects Releases Packages Wiki Activity Actions

fix(highlights): remove highlight link

Browse source
This commit is contained in:
Matt Leong 2021-11-12 13:07:04 -08:00
parent ef020a469e
commit 292ffbb2ea
7 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lua/cosmic/core/statusline/init.lua
View file

@ -161,10 +161,10 @@ gls.left = {
local label, mode_color, mode_nested = unpack(m) local label, mode_color, mode_nested = unpack(m)
highlight('GalaxyViMode', mode_color, mode_nested) highlight('GalaxyViMode', mode_color, mode_nested)
highlight('GalaxyViModeInv', mode_nested, mode_color) highlight('GalaxyViModeInv', mode_nested, mode_color)
highlight('GalaxyViModeNested', mode_nested, colors.bg_dark) highlight('GalaxyViModeNested', mode_nested, colors.statusline_bg)
highlight('GalaxyViModeNestedInv', colors.bg_dark, mode_nested) highlight('GalaxyViModeNestedInv', colors.statusline_bg, mode_nested)
highlight('GalaxyPercentBracket', colors.bg_dark, mode_color) highlight('GalaxyPercentBracket', colors.statusline_bg, mode_color)
highlight('GalaxyText', colors.bg_dark, mode_color) highlight('GalaxyText', colors.statusline_bg, mode_color)
highlight('GalaxyGitLCBracket', mode_nested, mode_color) highlight('GalaxyGitLCBracket', mode_nested, mode_color)
@ -172,9 +172,9 @@ gls.left = {
highlight('GalaxyViModeBracket', mode_nested, mode_color) highlight('GalaxyViModeBracket', mode_nested, mode_color)
else else
if condition.check_git_workspace() then if condition.check_git_workspace() then
highlight('GalaxyGitLCBracket', colors.bg_dark, mode_color) highlight('GalaxyGitLCBracket', colors.statusline_bg, mode_color)
end end
highlight('GalaxyViModeBracket', colors.bg_dark, mode_color) highlight('GalaxyViModeBracket', colors.statusline_bg, mode_color)
end end
return ' ' .. label .. ' ' return ' ' .. label .. ' '
end, end,
@ -247,7 +247,7 @@ gls.left = {
provider = 'DiffAdd', provider = 'DiffAdd',
icon = '', icon = '',
condition = check_width_and_git_and_buffer, condition = check_width_and_git_and_buffer,
highlight = { colors.diffAdd, colors.bg_dark }, highlight = { colors.diffAdd, colors.statusline_bg },
}, },
}, },
{ {
@ -255,7 +255,7 @@ gls.left = {
provider = 'DiffModified', provider = 'DiffModified',
condition = check_width_and_git_and_buffer, condition = check_width_and_git_and_buffer,
icon = '', icon = '',
highlight = { colors.diffModified, colors.bg_dark }, highlight = { colors.diffModified, colors.statusline_bg },
}, },
}, },
{ {
@ -263,13 +263,13 @@ gls.left = {
provider = 'DiffRemove', provider = 'DiffRemove',
condition = check_width_and_git_and_buffer, condition = check_width_and_git_and_buffer,
icon = '', icon = '',
highlight = { colors.diffDeleted, colors.bg_dark }, highlight = { colors.diffDeleted, colors.statusline_bg },
}, },
}, },
{ {
WSpace = { WSpace = {
provider = 'WhiteSpace', provider = 'WhiteSpace',
highlight = { colors.bg_dark, colors.bg_dark }, highlight = { colors.statusline_bg, colors.statusline_bg },
}, },
}, },
} }
@ -286,8 +286,8 @@ gls.right = {
DiagnosticError = { DiagnosticError = {
provider = function() provider = function()
local error_result = diag.get_diagnostic_error() local error_result = diag.get_diagnostic_error()
highlight('GalaxyDiagnosticError', colors.error, colors.bg_dark) highlight('GalaxyDiagnosticError', colors.error, colors.statusline_bg)
highlight('GalaxyDiagnosticErrorInv', colors.bg_dark, colors.error) highlight('GalaxyDiagnosticErrorInv', colors.statusline_bg, colors.error)
if error_result ~= '' and error_result ~= nil then if error_result ~= '' and error_result ~= nil then
return error_result return error_result
@ -319,8 +319,8 @@ gls.right = {
DiagnosticWarn = { DiagnosticWarn = {
provider = function() provider = function()
local warn_result = diag.get_diagnostic_warn() local warn_result = diag.get_diagnostic_warn()
highlight('GalaxyDiagnosticWarn', colors.warn, colors.bg_dark) highlight('GalaxyDiagnosticWarn', colors.warn, colors.statusline_bg)
highlight('GalaxyDiagnosticWarnInv', colors.bg_dark, colors.warn) highlight('GalaxyDiagnosticWarnInv', colors.statusline_bg, colors.warn)
if warn_result ~= '' and warn_result ~= nil then if warn_result ~= '' and warn_result ~= nil then
return warn_result return warn_result
@ -351,8 +351,8 @@ gls.right = {
DiagnosticInfo = { DiagnosticInfo = {
provider = function() provider = function()
local info_result = diag.get_diagnostic_info() local info_result = diag.get_diagnostic_info()
highlight('GalaxyDiagnosticInfo', colors.info, colors.bg_dark) highlight('GalaxyDiagnosticInfo', colors.info, colors.statusline_bg)
highlight('GalaxyDiagnosticInfoInv', colors.bg_dark, colors.info) highlight('GalaxyDiagnosticInfoInv', colors.statusline_bg, colors.info)
if info_result ~= '' and info_result ~= nil then if info_result ~= '' and info_result ~= nil then
return info_result return info_result
@ -423,19 +423,19 @@ gls.short_line_left = {
{ {
GhostLeftBracketShort = { GhostLeftBracketShort = {
provider = BracketProvider(icons.rounded_left_filled, true), provider = BracketProvider(icons.rounded_left_filled, true),
highlight = { colors.white, colors.bg_dark }, highlight = { colors.white, colors.statusline_bg },
}, },
}, },
{ {
GhostShort = { GhostShort = {
provider = BracketProvider(main_icon, true), provider = BracketProvider(main_icon, true),
highlight = { colors.bg_dark, colors.white }, highlight = { colors.statusline_bg, colors.white },
}, },
}, },
{ {
GhostRightBracketShort = { GhostRightBracketShort = {
provider = BracketProvider(icons.rounded_right_filled, true), provider = BracketProvider(icons.rounded_right_filled, true),
highlight = { colors.white, colors.bg_dark }, highlight = { colors.white, colors.statusline_bg },
}, },
}, },
{ {
@ -451,7 +451,7 @@ gls.short_line_left = {
end, end,
highlight = { highlight = {
require('galaxyline.providers.fileinfo').get_file_icon, require('galaxyline.providers.fileinfo').get_file_icon,
colors.bg_dark, colors.statusline_bg,
}, },
}, },
}, },
@ -461,7 +461,7 @@ gls.short_line_left = {
condition = function() condition = function()
return condition.buffer_not_empty() and vim.bo.filetype ~= 'NvimTree' return condition.buffer_not_empty() and vim.bo.filetype ~= 'NvimTree'
end, end,
highlight = { colors.white, colors.bg_dark }, highlight = { colors.white, colors.statusline_bg },
}, },
}, },
{ {
@ -470,7 +470,7 @@ gls.short_line_left = {
condition = function() condition = function()
return condition.buffer_not_empty() and vim.bo.filetype ~= 'NvimTree' return condition.buffer_not_empty() and vim.bo.filetype ~= 'NvimTree'
end, end,
highlight = { colors.white, colors.bg_dark }, highlight = { colors.white, colors.statusline_bg },
}, },
}, },
} }
@ -480,7 +480,7 @@ gls.short_line_right = {
GitRootShortLeftBracket = { GitRootShortLeftBracket = {
provider = BracketProvider(icons.arrow_left_filled, true), provider = BracketProvider(icons.arrow_left_filled, true),
condition = condition.buffer_not_empty, condition = condition.buffer_not_empty,
highlight = { colors.white, colors.bg_dark }, highlight = { colors.white, colors.statusline_bg },
}, },
}, },
{ {
@ -488,14 +488,14 @@ gls.short_line_right = {
provider = get_git_root, provider = get_git_root,
condition = condition.buffer_not_empty, condition = condition.buffer_not_empty,
icon = ' ' .. icons.file .. ' ', icon = ' ' .. icons.file .. ' ',
highlight = { colors.bg_dark, colors.white }, highlight = { colors.statusline_bg, colors.white },
}, },
}, },
{ {
GitRootShortRightBracket = { GitRootShortRightBracket = {
provider = BracketProvider(icons.rounded_right_filled, true), provider = BracketProvider(icons.rounded_right_filled, true),
condition = condition.buffer_not_empty, condition = condition.buffer_not_empty,
highlight = { colors.white, colors.bg_dark }, highlight = { colors.white, colors.statusline_bg },
}, },
}, },
} }

8
lua/cosmic/core/theme/highlights.lua
View file

@ -56,13 +56,9 @@ highlight('NotifyTRACEIcon', nil, colors.trace)
highlight('TelescopeBorder', 'None', colors.floatBorder) highlight('TelescopeBorder', 'None', colors.floatBorder)
highlight('FloatermBorder', 'None', colors.floatBorder) highlight('FloatermBorder', 'None', colors.floatBorder)
highlight('StatusLine', colors.statusline_bg, 'StatusLine')
highlight('FloatBorder', 'None', colors.floatBorder) highlight('FloatBorder', 'None', colors.floatBorder)
highlight('StatusLine', colors.bg_dark, 'StatusLine') highlight('NormalFloat', 'Normal', 'Normal')
vim.cmd([[
highlight clear NormalFloat
highlight link NormalFloat Normal
]])
local config = require('cosmic.config') local config = require('cosmic.config')
if config.theme == 'gruvbox.nvim' then if config.theme == 'gruvbox.nvim' then

2
lua/cosmic/core/theme/integrated/catppuccin.lua
View file

@ -4,7 +4,7 @@ local colors = {
white = theme.catppuccin0, white = theme.catppuccin0,
bg = theme.catppuccin12, bg = theme.catppuccin12,
bg_highlight = theme.catppuccin15, bg_highlight = theme.catppuccin15,
bg_dark = theme.catppuccin14, statusline_bg = theme.catppuccin14,
normal = theme.catppuccin3, normal = theme.catppuccin3,
insert = theme.catppuccin4, insert = theme.catppuccin4,
command = theme.catppuccin5, command = theme.catppuccin5,

2
lua/cosmic/core/theme/integrated/gruvbox.lua
View file

@ -5,7 +5,7 @@ local colors = {
white = convert.hsl_to_hex(theme.light0_hard), white = convert.hsl_to_hex(theme.light0_hard),
bg = convert.hsl_to_hex(theme.dark0), bg = convert.hsl_to_hex(theme.dark0),
bg_highlight = convert.hsl_to_hex(theme.dark1), bg_highlight = convert.hsl_to_hex(theme.dark1),
bg_dark = convert.hsl_to_hex(theme.dark2), statusline_bg = convert.hsl_to_hex(theme.dark2),
normal = convert.hsl_to_hex(theme.neutral_yellow), normal = convert.hsl_to_hex(theme.neutral_yellow),
insert = convert.hsl_to_hex(theme.neutral_green), insert = convert.hsl_to_hex(theme.neutral_green),
command = convert.hsl_to_hex(theme.neutral_orange), command = convert.hsl_to_hex(theme.neutral_orange),

2
lua/cosmic/core/theme/integrated/nord.lua
View file

@ -3,7 +3,7 @@ local colors = {
white = theme.nord4_gui, white = theme.nord4_gui,
bg = theme.nord2_gui, bg = theme.nord2_gui,
bg_highlight = theme.nord2_gui, bg_highlight = theme.nord2_gui,
bg_dark = theme.nord0_gui, statusline_bg = theme.nord0_gui,
normal = theme.nord9_gui, normal = theme.nord9_gui,
insert = theme.nord14_gui, insert = theme.nord14_gui,
command = theme.nord13_gui, command = theme.nord13_gui,

2
lua/cosmic/core/theme/integrated/rosepine.lua
View file

@ -3,7 +3,7 @@ local colors = {
white = theme.text, white = theme.text,
bg = theme.surface, bg = theme.surface,
bg_highlight = theme.surface, bg_highlight = theme.surface,
bg_dark = theme.base, statusline_bg = theme.base,
normal = theme.pine, normal = theme.pine,
insert = theme.foam, insert = theme.foam,
command = theme.gold, command = theme.gold,

2
lua/cosmic/core/theme/integrated/tokyonight.lua
View file

@ -5,7 +5,7 @@ local colors = {
white = themeColors.fg_dark, white = themeColors.fg_dark,
bg = themeColors.bg, bg = themeColors.bg,
bg_highlight = themeColors.bg_highlight, bg_highlight = themeColors.bg_highlight,
bg_dark = themeColors.bg_dark, statusline_bg = themeColors.bg_dark,
normal = themeColors.blue, normal = themeColors.blue,
insert = themeColors.teal, insert = themeColors.teal,
command = themeColors.orange, command = themeColors.orange,