niverton/Astrobox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Statusbar background fixes

Browse Source
This commit is contained in:
Niverton
2024-02-14 18:39:41 +01:00
parent d034a533e4
commit 701b34906e
2 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lua/astrobox/highlights/modules/core.lua
View File

@@ -1,17 +1,16 @@
return function(palette) return function(palette)
return { return {
-- Bold = { bold = true },
-- Italic = { italic = true },
Conceal = { fg = palette.other.conceal, bg = palette.other.harder_bg },
Directory = { fg = palette.blue, bg = palette.none },
EndOfBuffer = { fg = palette.bg, bg = palette.bg },
MatchParen = { fg = palette.none, bg = palette.none, bold = true, underline = true },
NonText = { fg = palette.ui.fg_inactive, bg = palette.none },
Normal = { fg = palette.fg, bg = palette.bg }, Normal = { fg = palette.fg, bg = palette.bg },
NormalNC = { link = "Normal" }, NormalNC = { link = "Normal" },
-- Italic = { italic = true },
-- Bold = { bold = true },
Conceal = { fg = palette.other.conceal, bg = palette.other.harder_bg },
SpecialKey = { fg = palette.none, bg = palette.colored_backgrounds.yellow },
NonText = { fg = palette.ui.fg_inactive, bg = palette.none },
EndOfBuffer = { fg = palette.bg, bg = palette.bg },
Directory = { fg = palette.blue, bg = palette.none },
QuickFixLine = palette.ui.selection, QuickFixLine = palette.ui.selection,
MatchParen = { fg = palette.none, bg = palette.none, bold = true, underline = true }, SpecialKey = { fg = palette.none, bg = palette.colored_backgrounds.yellow },
Underlined = { fg = palette.aqua, bg = palette.none, underline = true }, Underlined = { fg = palette.aqua, bg = palette.none, underline = true },
-- Popup -- Popup
@@ -40,38 +39,36 @@ return function(palette)
TabLine = { fg = palette.ui.fg_inactive, bg = palette.ui.bg_inactive }, TabLine = { fg = palette.ui.fg_inactive, bg = palette.ui.bg_inactive },
TabLineFill = { fg = palette.none, bg = palette.ui.bg_inactive }, TabLineFill = { fg = palette.none, bg = palette.ui.bg_inactive },
TabLineSel = { fg = palette.ui.fg, bg = palette.ui.bg, bold = true, italic = true }, TabLineSel = { fg = palette.ui.fg, bg = palette.ui.bg, bold = true, italic = true },
WinBar = { fg = palette.ui.winbar.fg, bg = palette.ui.winbar.bg }, WinBar = { fg = palette.ui.winbar.fg, bg = palette.ui.winbar.bg },
WinBarNC = { WinBarNC = {
fg = palette.ui.winbar.fg_inactive, fg = palette.ui.winbar.fg_inactive,
bg = palette.ui.winbar.bg_inactive, bg = palette.ui.winbar.bg_inactive,
}, },
StatusLine = { fg = palette.ui.fg, bg = palette.ui.bg }, StatusCommand = { fg = palette.ui.status.bg, bg = palette.yellow },
StatusLineNC = { fg = palette.ui.fg_inactive, bg = palette.ui.bg }, StatusInsert = { fg = palette.ui.status.bg, bg = palette.green },
StatusNormal = { fg = palette.ui.bg, bg = palette.blue }, StatusLine = { fg = palette.ui.status.fg, bg = palette.ui.status.bg },
StatusInsert = { fg = palette.ui.bg, bg = palette.green }, StatusLineNC = { fg = palette.ui.status.fg_inactive, bg = palette.ui.status.bg },
StatusVisual = { fg = palette.ui.bg, bg = palette.purple }, StatusNormal = { fg = palette.ui.status.bg, bg = palette.blue },
StatusReplace = { fg = palette.ui.bg, bg = palette.red }, StatusReplace = { fg = palette.ui.status.bg, bg = palette.red },
StatusCommand = { fg = palette.ui.bg, bg = palette.yellow },
StatusTerminal = { link = "StatusInsert" }, StatusTerminal = { link = "StatusInsert" },
StatusVisual = { fg = palette.ui.status.bg, bg = palette.purple },
-- Cursor -- Cursor
Cursor = { fg = palette.fg, bg = palette.bg }, Cursor = { fg = palette.fg, bg = palette.bg },
CursorColumn = { link = "CursorLine" },
CursorIM = { link = "Cursor" }, CursorIM = { link = "Cursor" },
lCursor = { link = "Cursor" }, CursorLine = { fg = palette.none, bg = palette.other.bg_active },
CursorLineNr = { fg = palette.ui.fg, bg = palette.none }, CursorLineNr = { fg = palette.ui.fg, bg = palette.none },
LineNr = { fg = palette.ui.fg_inactive, bg = palette.none }, LineNr = { fg = palette.ui.fg_inactive, bg = palette.none },
lCursor = { link = "Cursor" },
-- Columns -- Columns
Folded = { fg = palette.ui.fg_inactive, bg = palette.none },
FoldColumn = { fg = palette.ui.fg_inactive, bg = palette.none },
SignColumn = { fg = palette.none, bg = palette.none }, -- TODO Test
ColorColumn = { fg = palette.none, bg = palette.other.bg_active }, ColorColumn = { fg = palette.none, bg = palette.other.bg_active },
CursorLine = { fg = palette.none, bg = palette.other.bg_active }, FoldColumn = { fg = palette.ui.fg_inactive, bg = palette.none },
CursorColumn = { link = "CursorLine" }, Folded = { fg = palette.ui.fg_inactive, bg = palette.none },
SignColumn = { fg = palette.none, bg = palette.none }, -- TODO Test
-- Splits -- Splits
@@ -80,10 +77,6 @@ return function(palette)
bg = palette.bg, bg = palette.bg,
-- bold = false, -- bold = false,
}, },
VertSplit = {
fg = palette.ui.win.separator,
bg = palette.bg,
},
-- Diff -- Diff
@@ -96,8 +89,8 @@ return function(palette)
DiffChanged = { link = "DiffText" }, -- TODO Switch to DiffChange? DiffChanged = { link = "DiffText" }, -- TODO Switch to DiffChange?
DiffOldFile = { fg = palette.red, bg = palette.bg }, DiffOldFile = { fg = palette.red, bg = palette.bg },
DiffNewFile = { fg = palette.green, bg = palette.bg }, DiffNewFile = { fg = palette.green, bg = palette.bg },
DiffFile = palette.other.error_hl, -- TODO What's this? DiffFile = palette.other.error_hl, -- TODO What's this?
DiffLine = palette.other.error_hl, -- TODO What's this? DiffLine = palette.other.error_hl, -- TODO What's this?
DiffIndexLine = palette.other.error_hl, -- TODO What's this? DiffIndexLine = palette.other.error_hl, -- TODO What's this?
-- Cmd -- Cmd

10
lua/astrobox/palette.lua
View File

@@ -7,7 +7,7 @@ return function(config)
-- Build base colors -- Build base colors
local base = { local base = {
none = "", none = "NONE",
fg = colors.grayscale[vimbg_reversed][1], fg = colors.grayscale[vimbg_reversed][1],
bg = colors.bg[vimbg][config.contrast], bg = colors.bg[vimbg][config.contrast],
@@ -19,14 +19,14 @@ return function(config)
colored_backgrounds = colors.colored_backgrounds[vimbg][config.contrast], colored_backgrounds = colors.colored_backgrounds[vimbg][config.contrast],
gray = colors.gray, -- TODO Rémy Only for comments? Won't look good in light mode gray = colors.gray,
} }
-- Append colors -- Append colors
local palette = vim.tbl_extend("error", base, colors.colors[vimbg]) local palette = vim.tbl_extend("error", base, colors.colors[vimbg])
palette.ui = { palette.ui = {
fg = palette.fg, fg = palette.fg,
bg = palette.bg_gradiant[1], bg = palette.none,
bg_hard = palette.harder_bg, bg_hard = palette.harder_bg,
fg_inactive = palette.fg_gradiant[4], fg_inactive = palette.fg_gradiant[4],
bg_inactive = palette.bg_gradiant[2], bg_inactive = palette.bg_gradiant[2],
@@ -37,6 +37,10 @@ return function(config)
text = palette.fg_gradiant[2], text = palette.fg_gradiant[2],
scroll = palette.blue, scroll = palette.blue,
}, },
statusbar = {
fg = palette.fg,
bg = palette.bg_gradiant[1],
},
winbar = { winbar = {
fg = palette.fg_gradiant[1], fg = palette.fg_gradiant[1],
bg = palette.harder_bg, bg = palette.harder_bg,