diff --git a/private_dot_config/alacritty/alacritty.toml b/private_dot_config/alacritty/alacritty.toml index 5f5cf07..22e8c30 100644 --- a/private_dot_config/alacritty/alacritty.toml +++ b/private_dot_config/alacritty/alacritty.toml @@ -11,19 +11,47 @@ bold = { family = "JetBrainsMonoNL Nerd Font" } italic = { family = "JetBrainsMonoNL Nerd Font" } size = 9 +# [colors.primary] +# foreground = "#eeeeee" +# background = "#3b224c" +# +# [colors.normal] +# black = "#181818" +# red = "#ac4242" +# green = "#90a959" +# yellow = "#f4bf75" +# blue = "#6a9fb5" +# magenta = "#aa759f" +# cyan = "#75b5aa" +# white = "#d8d8d8" + [colors.primary] -foreground = "#eeeeee" +foreground = "#ebeafa" background = "#3b224c" +[colors.selection] +foreground = "#eaeaea" +background = "#404040" + [colors.normal] -black = "#181818" -red = "#ac4242" -green = "#90a959" -yellow = "#f4bf75" -blue = "#6a9fb5" -magenta = "#aa759f" -cyan = "#75b5aa" -white = "#d8d8d8" +black = "#3b224c" +red = "#f47868" +green = "#9ff28f" +yellow = "#efba5d" +blue = "#a4a0e8" +magenta = "#dbbfef" +cyan = "#6acdca" +white = "#ebeafa" + +[colors.bright] +black = "#697c81" +red = "#ff3334" +green = "#9ec400" +yellow = "#e7c547" +blue = "#7aa6da" +magenta = "#b77ee0" +cyan = "#54ced6" +white = "#ffffff" [window] padding.x = 4 diff --git a/private_dot_config/nvim/colors/helix.lua b/private_dot_config/nvim/colors/helix.lua index 5667e2f..825aa42 100644 --- a/private_dot_config/nvim/colors/helix.lua +++ b/private_dot_config/nvim/colors/helix.lua @@ -5,24 +5,22 @@ local palette = { fg = "#a4a0e8", white = "#ffffff", lilac = "#dbbfef", - lavender = "#a4a0e8", - comet = "#5a5977", bossanova = "#452859", midnight = "#3b224c", revolver = "#281733", silver = "#cccccc", sirocco = "#697C81", + comet = "#5a5977", mint = "#9ff28f", almond = "#eccdba", chamois = "#E8DCA0", honey = "#efba5d", - apricot = "#f47868", lightning = "#ffcd1c", + apricot = "#f47868", delta = "#6F44F0", blue = "#61afef", diff_plus = "#35bf86", diff_minus = "#f22c86", - diff_delta = "#6f44f0", selection = "#540099", } @@ -32,7 +30,7 @@ local function apply_highlights(highlights) end end -local function load(opts) +local function load() if vim.fn.exists("syntax_on") == 1 then vim.cmd("hi clear") vim.cmd.syntax("reset") @@ -42,24 +40,20 @@ local function load(opts) vim.o.termguicolors = true vim.g.colors_name = "me" - local transparent = opts and opts.transparent - local normal_bg = transparent and palette.none or palette.bg - local float_bg = transparent and palette.none or palette.revolver - -- stylua: ignore local highlights = { - Normal = { fg = palette.fg, bg = normal_bg }, - NormalNC = { fg = palette.fg, bg = normal_bg }, - NormalFloat = { fg = palette.fg, bg = float_bg }, + Normal = { fg = palette.fg, bg = palette.bg }, + NormalNC = { link = "Normal" }, + NormalFloat = { fg = palette.fg, bg = palette.revolver }, Title = { fg = palette.white, bg = palette.none }, Cursor = { fg = palette.bg, bg = palette.white }, CursorIM = { link = "Cursor" }, lCursor = { link = "Cursor" }, - ColorColumn = { fg = palette.none, bg = palette.bossanova }, + CursorLine = { fg = palette.none, bg = palette.bossanova }, + ColorColumn = { link = "CursorLine" }, CursorLineNr = { fg = palette.white, bg = palette.none }, Conceal = { fg = palette.sirocco, bg = palette.none }, - CursorColumn = { fg = palette.none, bg = palette.bossanova }, - CursorLine = { fg = palette.none, bg = palette.bossanova }, + CursorColumn = { link = "CursorLine" }, Directory = { fg = palette.blue, bg = palette.none }, DiffAdd = { fg = palette.revolver, bg = palette.mint }, DiffChange = { fg = palette.lightning, bg = palette.none }, @@ -69,8 +63,8 @@ local function load(opts) DiffRemoved = { fg = palette.apricot }, DiffChanged = { fg = palette.blue }, DiffOldFile = { fg = palette.lightning }, - DiffNewFile = { fg = palette.mint }, - DiffFile = { fg = palette.blue }, + DiffNewFile = { link = "DiffAdded" }, + DiffFile = { link = "DiffChanged" }, DiffLine = { fg = palette.bossanova }, DiffIndexLine = { fg = palette.diff_plus }, ErrorMsg = { fg = palette.apricot, bg = palette.none }, @@ -80,44 +74,44 @@ local function load(opts) IncSearch = { fg = palette.lightning, bg = palette.sirocco }, CurSearch = { link = "IncSearch" }, LineNr = { fg = palette.sirocco, bg = palette.none }, - NonText = { fg = palette.sirocco, bg = palette.none }, - Pmenu = { fg = palette.white, bg = float_bg }, + NonText = { link = "LineNr" }, + Pmenu = { fg = palette.white, bg = palette.revolver }, PmenuSel = { fg = palette.none, bg = palette.bossanova }, PmenuSbar = { fg = palette.none, bg = palette.revolver }, PmenuThumb = { fg = palette.none, bg = palette.white }, - Question = { fg = palette.diff_delta, bg = palette.none }, + Question = { fg = palette.delta, bg = palette.none }, QuickFixLine = { fg = palette.revolver, bg = palette.lightning }, Search = { fg = palette.revolver, bg = palette.lightning }, - SignColumn = { fg = palette.none, bg = palette.none }, - SpecialKey = { fg = palette.sirocco, bg = palette.none }, + SignColumn = { link = "FoldColumn" }, + SpecialKey = { link = "LineNr" }, SpellBad = { undercurl = true }, - SpellCap = { undercurl = true }, - SpellLocal = { undercurl = true }, - SpellRare = { undercurl = true }, + SpellCap = { link = "SpellBad" }, + SpellLocal = { link = "SpellBad" }, + SpellRare = { link = "SpellBad" }, StatusLine = { fg = palette.white, bg = palette.bossanova }, StatusLineNC = { fg = palette.sirocco, bg = palette.none }, - StatusLineTerm = { fg = palette.white, bg = palette.bossanova }, + StatusLineTerm = { link = "StatusLine" }, StatusLineTermNC = { fg = palette.bossanova, bg = palette.none }, StatusInactive = { fg = palette.bossanova, bg = palette.bg }, StatusNormal = { fg = palette.bossanova, bg = palette.blue }, StatusInsert = { fg = palette.bossanova, bg = palette.mint }, - StatusVisual = { fg = palette.bossanova, bg = palette.diff_delta }, + StatusVisual = { fg = palette.bossanova, bg = palette.delta }, StatusReplace = { fg = palette.bossanova, bg = palette.diff_minus }, StatusCommand = { fg = palette.bossanova, bg = palette.honey }, StatusTerminal = { link = "StatusInsert" }, - WinBar = { fg = palette.lavender, bg = palette.bg }, + WinBar = { fg = palette.fg, bg = palette.bg }, WinBarNC = { fg = palette.sirocco, bg = palette.bg }, - TabLine = { fg = palette.sirocco, bg = palette.none }, + TabLine = { link = "LineNr" }, TabLineSel = { fg = palette.white, bg = palette.none }, TabLineFill = { fg = palette.none, bg = palette.revolver }, - Terminal = { fg = palette.white, bg = palette.revolver }, + Terminal = { link = "Pmenu" }, Visual = { fg = palette.none, bg = palette.selection }, VisualNOS = { fg = palette.fg, bg = palette.none }, WarningMsg = { fg = palette.lightning, bg = palette.none }, WildMenu = { fg = palette.revolver, bg = palette.blue }, EndOfBuffer = { fg = palette.bg, bg = palette.none }, FloatBorder = { fg = palette.fg, bg = palette.bg }, - MatchParen = { fg = palette.none, bg = palette.fg }, + MatchParen = { fg = palette.none, bg = palette.comet }, -- Syntax Comment = { fg = palette.sirocco, bg = palette.none }, Constant = { fg = palette.white, bg = palette.none }, @@ -125,35 +119,35 @@ local function load(opts) Character = { fg = palette.honey, bg = palette.none }, Number = { fg = palette.chamois, bg = palette.none }, Boolean = { fg = palette.almond, bg = palette.none }, - Float = { fg = palette.chamois, bg = palette.none }, - Identifier = { fg = palette.lavender, bg = palette.none }, + Float = { link = "Number" }, + Identifier = { fg = palette.fg, bg = palette.none }, Function = { fg = palette.white, bg = palette.none }, Statement = { fg = palette.almond, bg = palette.none }, - Conditional = { fg = palette.almond, bg = palette.none }, - Repeat = { fg = palette.almond, bg = palette.none }, - Label = { fg = palette.almond, bg = palette.none }, - Operator = { fg = palette.lilac, bg = palette.none }, + Conditional = { link = "Statement" }, + Repeat = { link = "Statement" }, + Label = { link = "Statement" }, + Operator = { fg = palette.white, bg = palette.none }, Keyword = { fg = palette.almond, bg = palette.none, bold = true }, - Exception = { fg = palette.almond, bg = palette.none }, + Exception = { link = "Statement" }, PreProc = { fg = palette.lilac, bg = palette.none }, - Include = { fg = palette.almond, bg = palette.none }, - Define = { fg = palette.almond, bg = palette.none }, - Macro = { fg = palette.lilac, bg = palette.none }, - PreCondit = { fg = palette.lilac, bg = palette.none }, + Include = { link = "Statement" }, + Define = { link = "Statement" }, + Macro = { link = "PreProc" }, + PreCondit = { link = "PreProc" }, Type = { fg = palette.white, bg = palette.none }, - StorageClass = { fg = palette.white, bg = palette.none }, - Structure = { fg = palette.white, bg = palette.none }, - Typedef = { fg = palette.white, bg = palette.none }, - Special = { fg = palette.honey, bg = palette.none }, - SpecialChar = { fg = palette.honey, bg = palette.none }, - Tag = { fg = palette.almond, bg = palette.none }, - Delimiter = { fg = palette.lavender, bg = palette.none }, - SpecialComment = { fg = palette.sirocco, bg = palette.none }, + StorageClass = { link = "Type" }, + Structure = { link = "Type" }, + Typedef = { link = "Type" }, + Special = { fg = palette.lilac, bg = palette.none }, + SpecialChar = { link = "Special" }, + Tag = { link = "Statement" }, + Delimiter = { link = "Identifier" }, + SpecialComment = { link = "Comment" }, Debug = { fg = "#634450", bg = palette.none }, Error = { fg = palette.apricot, bg = palette.none }, - Ignore = { fg = palette.sirocco, bg = palette.none }, + Ignore = { link = "Comment" }, Underlined = { fg = palette.white, bg = palette.none }, - Todo = { fg = palette.sirocco, bg = palette.none }, + Todo = { link = "Comment" }, -- LSP/Diagnostics DiagnosticError = { fg = palette.apricot }, DiagnosticHint = { fg = palette.silver }, @@ -162,38 +156,38 @@ local function load(opts) DiagnosticInformation = { fg = palette.delta, bold = true }, DiagnosticTruncateLine = { fg = palette.fg, bold = true }, DiagnosticUnderlineError = { sp = palette.apricot, undercurl = true }, - DiagnosticUnderlineHint = { sp = palette.apricot, undercurl = true }, - DiagnosticUnderlineInfo = { sp = palette.apricot, undercurl = true }, - DiagnosticUnderlineWarn = { sp = palette.apricot, undercurl = true }, + DiagnosticUnderlineHint = { link = "DiagnosticUnderlineError" }, + DiagnosticUnderlineInfo = { link = "DiagnosticUnderlineError" }, + DiagnosticUnderlineWarn = { link = "DiagnosticUnderlineError" }, LspCodeLens = { fg = palette.comet }, - LspCodeLensSeparator = { fg = palette.comet }, - LspDiagnosticsFloatingError = { fg = palette.apricot }, - LspDiagnosticsFloatingHint = { fg = palette.silver }, - LspDiagnosticsFloatingInfor = { fg = palette.delta }, - LspDiagnosticsFloatingWarn = { fg = palette.lightning }, + LspCodeLensSeparator = { link = "LspCodeLens" }, + LspDiagnosticsFloatingError = { link = "DiagnosticError" }, + LspDiagnosticsFloatingHint = { link = "DiagnosticHint" }, + LspDiagnosticsFloatingInformation = { link = "DiagnosticInfo" }, + LspDiagnosticsFloatingWarn = { link = "DiagnosticWarn" }, LspFloatWinBorder = { fg = palette.revolver }, - LspFloatWinNormal = { fg = palette.lavender, bg = palette.revolver }, + LspFloatWinNormal = { fg = palette.fg, bg = palette.revolver }, LspInlayHint = { link = "Comment" }, - LspReferenceRead = { fg = palette.none, bg = palette.bg }, LspReferenceText = { fg = palette.none, bg = palette.bg }, - LspReferenceWrite = { fg = palette.none, bg = palette.bg }, + LspReferenceRead = { link = "LspReferenceText" }, + LspReferenceWrite = { link = "LspReferenceText" }, ProviderTruncateLine = { fg = palette.fg }, - ["@lsp.type.builtinType"] = { fg = palette.white, bg = palette.none }, + ["@lsp.type.builtinType"] = { link = "Type" }, ["@lsp.type.keyword"] = { link = "Keyword" }, ["@lsp.type.operator"] = { link = "Operator" }, - ["@lsp.type.parameter"] = { fg = palette.lavender, bg = palette.none }, - ["@lsp.type.property"] = { link = "@property" }, - ["@lsp.type.variable"] = { link = "@lsp.type.variable" }, - ["@lsp.typemod.enumMember.defaultLibrary"] = { fg = palette.white, bg = palette.none }, - ["@lsp.typemod.function.defaultLibrary"] = { fg = palette.white, bg = palette.none }, - ["@lsp.typemod.function.global"] = { fg = palette.white, bg = palette.none }, - ["@lsp.typemod.method.defaultLibrary"] = { fg = palette.white, bg = palette.none }, + ["@lsp.type.property"] = { link = "Operator" }, + ["@lsp.type.parameter"] = { link = "Identifier" }, + ["@lsp.type.variable"] = { link = "Identifier" }, + ["@lsp.typemod.enumMember.defaultLibrary"] = { link = "Constant" }, + ["@lsp.typemod.function.defaultLibrary"] = { link = "Function" }, + ["@lsp.typemod.function.global"] = { link = "Function" }, + ["@lsp.typemod.method.defaultLibrary"] = { link = "Function" }, ["@lsp.typemod.method.reference"] = { link = "Function" }, ["@lsp.typemod.method.trait"] = { link = "Function" }, ["@lsp.typemod.selfKeyword.defaultLibrary"] = { fg = palette.mint, bg = palette.none }, - ["@lsp.typemod.variable.defaultLibrary"] = { fg = palette.white, bg = palette.none }, + ["@lsp.typemod.variable.defaultLibrary"] = { link = "Identifier" }, ["@lsp.typemod.variable.readonly"] = { link = "Constant" }, - ["@lsp.type.macro"] = { fg = palette.lilac, bg = palette.none }, + ["@lsp.type.macro"] = { link = "PreProc" }, } apply_highlights(highlights)