Refacto palette and theme, added more colors

lua/astrobox/highlights/modules/core.lua

@@ -1,120 +1,96 @@
-return function(palette)
+---@param theme Theme
+---@param palette Palette
+return function(theme, palette)
     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 },
+        Conceal = theme.conceal,
+        Directory = theme.files.directory,
+        EndOfBuffer = { link = "Normal" },
         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 },
+        NonText = { fg = theme.conceal.fg },
+        Normal = theme.normal,
         NormalNC = { link = "Normal" },
-        QuickFixLine = palette.ui.selection,
+        QuickFixLine = theme.selection,
         SpecialKey = { fg = palette.none, bg = palette.colored_backgrounds.yellow },
         Underlined = { fg = palette.aqua, bg = palette.none, underline = true },
 
         -- Popup
-
-        FloatTitle = {
-            fg = palette.ui.float.title,
-            bg = palette.ui.bg,
-            bold = true,
-        },
-        FloatBorder = {
-            fg = palette.ui.float.border,
-            bg = palette.ui.bg,
-        },
-        NormalFloat = {
-            fg = palette.ui.float.text,
-            bg = palette.ui.bg,
-        },
-        Title = {
-            fg = palette.ui.float.title2,
-            bg = palette.bg,
-            bold = true,
-        },
+        FloatTitle = theme.popup.title,
+        FloatBorder = theme.popup.border,
+        NormalFloat = theme.popup.normal,
+        Title = theme.popup.title2,
 
         -- Bars
-
-        TabLine = { fg = palette.ui.fg_inactive, 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 },
-        WinBar = { fg = palette.ui.winbar.fg, bg = palette.ui.winbar.bg },
-        WinBarNC = {
-            fg = palette.ui.winbar.fg_inactive,
-            bg = palette.ui.winbar.bg_inactive,
-        },
-
-        StatusCommand = { fg = palette.ui.statusbar.bg, bg = palette.yellow },
-        StatusInsert = { fg = palette.ui.statusbar.bg, bg = palette.green },
-        StatusLine = { fg = palette.ui.statusbar.fg, bg = palette.ui.statusbar.bg },
-        StatusLineNC = { fg = palette.ui.statusbar.fg_inactive, bg = palette.ui.statusbar.bg },
-        StatusNormal = { fg = palette.ui.statusbar.bg, bg = palette.blue },
-        StatusReplace = { fg = palette.ui.statusbar.bg, bg = palette.red },
+        StatusCommand = { fg = theme.statusbar.normal.bg, bg = palette.yellow },
+        StatusInsert = { fg = theme.statusbar.normal.bg, bg = palette.green },
+        StatusLine = theme.statusbar.normal,
+        StatusLineNC = theme.statusbar.inactive,
+        StatusNormal = { fg = theme.statusbar.normal.bg, bg = palette.blue },
+        StatusReplace = { fg = theme.statusbar.normal.bg, bg = palette.red },
         StatusTerminal = { link = "StatusInsert" },
-        StatusVisual = { fg = palette.ui.statusbar.bg, bg = palette.purple },
+        StatusVisual = { fg = theme.statusbar.normal.bg, bg = palette.purple },
+        TabLine = theme.statusbar.normal,
+        TabLineFill = { link = "TabLine" },
+        TabLineSel = vim.tbl_extend("error", theme.statusbar.inactive, { bold = true, italic = true }),
+        WinBar = theme.winbar.normal,
+        WinBarNC = theme.winbar.inactive,
 
         -- Cursor
 
-        Cursor = { fg = palette.fg, bg = palette.bg },
+        Cursor = { link = "Normal" },
         CursorColumn = { link = "CursorLine" },
         CursorIM = { link = "Cursor" },
-        CursorLine = { fg = palette.none, bg = palette.other.bg_active },
-        CursorLineNr = { fg = palette.ui.fg, bg = palette.none },
-        LineNr = { fg = palette.ui.fg_inactive, bg = palette.none },
+        CursorLine = theme.active,
+        CursorLineNr = { fg = theme.normal.fg },
+        LineNr = theme.inactive,
         lCursor = { link = "Cursor" },
 
         -- Columns
-        ColorColumn = { fg = palette.none, bg = palette.other.bg_active },
-        FoldColumn = { fg = palette.ui.fg_inactive, bg = palette.none },
-        Folded = { fg = palette.ui.fg_inactive, bg = palette.none },
-        SignColumn = { fg = palette.none, bg = palette.none }, -- TODO Test
+        ColorColumn = theme.active,
+        FoldColumn = theme.active,
+        Folded = theme.conceal,
+        SignColumn = theme.none,
 
         -- Splits
 
-        WinSeparator = {
-            fg = palette.ui.win.separator,
-            bg = palette.bg,
-            -- bold = false,
-        },
+        WinSeparator = theme.windows.separator,
 
         -- Diff
 
-        DiffAdd = { fg = palette.none, bg = palette.colored_backgrounds.green },
-        DiffChange = { fg = palette.none, bg = palette.colored_backgrounds.blue },
-        DiffDelete = { fg = palette.none, bg = palette.colored_backgrounds.red },
-        DiffText = { fg = palette.none, bg = palette.colored_backgrounds.yellow },
+        DiffAdd = theme.diff.bg.add,
+        DiffChange = theme.diff.bg.change,
+        DiffDelete = theme.diff.bg.del,
+        DiffText = theme.diff.bg.text,
         DiffAdded = { link = "DiffAdd" },
         DiffRemoved = { link = "DiffDelete" },
         DiffChanged = { link = "DiffText" }, -- TODO Switch to DiffChange?
-        DiffOldFile = { fg = palette.red, bg = palette.bg },
-        DiffNewFile = { fg = palette.green, bg = palette.bg },
-        DiffFile = 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?
+        DiffOldFile = theme.diff.normal.del,
+        DiffNewFile = theme.diff.normal.add,
+        DiffFile = theme.error, -- TODO What's this?
+        DiffLine = theme.error, -- TODO What's this?
+        DiffIndexLine = theme.error,
 
         -- Cmd
 
-        ErrorMsg = { fg = palette.red, bg = palette.none },
-        WarningMsg = { fg = palette.yellow, bg = palette.none },
-        Question = { fg = palette.blue, bg = palette.none },
-        WildMenu = { fg = palette.ui.selection.fg, bg = palette.ui.selection.bg },
+        ErrorMsg = theme.msg.error,
+        WarningMsg = theme.msg.warning,
+        Question = theme.msg.info,
+        WildMenu = theme.selection,
 
         -- PMenu
 
-        Pmenu = { fg = palette.ui.fg, bg = palette.ui.bg_hard },
-        PmenuSel = { fg = palette.ui.selection.fg, bg = palette.ui.selection.bg },
-        PmenuSbar = { fg = palette.none, bg = palette.ui.float.scroll },
+        Pmenu = theme.menu.normal,
+        PmenuSel = theme.menu.selection,
+        PmenuSbar = theme.scrollbar,
         PmenuThumb = { link = "PmenuSbar" },
 
         -- Search
 
-        Search = { fg = palette.fg, bg = palette.other.bg_active },
-        IncSearch = { fg = palette.none, bg = palette.colored_backgrounds.blue },
-        Substitute = { fg = palette.none, bg = palette.colored_backgrounds.yellow },
-        CurSearch = { link = "IncSearch" },
-        Visual = { fg = palette.none, bg = palette.other.bg_active },
-        VisualNOS = { fg = palette.other.bg_active, bg = palette.fg }, -- Meh
+        Search = theme.backgrounds.blue,
+        IncSearch = theme.backgrounds.green,
+        Substitute = theme.backgrounds.yellow,
+        CurSearch = theme.backgrounds.purple,
+        Visual = theme.backgrounds.aqua,
+        VisualNOS = theme.backgrounds.red,
 
         -- Spelling