diff --git a/nvim/.config/nvim/colors/minimal.lua b/nvim/.config/nvim/colors/minimal.lua index b21b72f..380071f 100644 --- a/nvim/.config/nvim/colors/minimal.lua +++ b/nvim/.config/nvim/colors/minimal.lua @@ -1,4 +1,3 @@ --- Monochrome palette with a handful of semantic accents. local c = { bg = '#0e0e0e', bg_alt = '#191919', @@ -7,7 +6,6 @@ local c = { gray2 = '#353535', gray3 = '#494949', gray4 = '#5e5e5e', - gray5 = '#747474', gray6 = '#8b8b8b', gray7 = '#a3a3a3', gray8 = '#bbbbbb', @@ -17,189 +15,92 @@ local c = { neutral_red = '#eca8a8', neutral_green = '#ccd389', neutral_blue = '#a5c6e1', - orange = '#cb4b16', - green = '#719e07', - purple = '#e1bee9', + orange = '#b6927b', + green = '#8a9a7b', + purple = '#a292a3', } -local function hl(group, spec) - vim.api.nvim_set_hl(0, group, spec or {}) +vim.api.nvim_command('hi clear') +if vim.fn.exists('syntax_on') then + vim.api.nvim_command('syntax reset') end +vim.g.colors_name = 'monochrome' -local function clear_groups(list) - for group in vim.gsplit(vim.trim(list), '%s+') do - hl(group) - end +-- Core +vim.api.nvim_set_hl(0, 'Normal', { fg = c.fg, bg = c.bg }) +vim.api.nvim_set_hl(0, 'Visual', { fg = c.bg, bg = c.fg }) +vim.api.nvim_set_hl(0, 'Cursor', { fg = c.bg, bg = c.fg }) +vim.api.nvim_set_hl(0, 'CursorColumn', { fg = c.fg }) +vim.api.nvim_set_hl(0, 'CursorLine', { bg = c.bg_alt }) +vim.api.nvim_set_hl(0, 'ColorColumn', { bg = c.bg_alt }) +vim.api.nvim_set_hl(0, 'Conceal', { fg = c.gray2 }) +vim.api.nvim_set_hl(0, 'LineNr', { fg = c.gray3 }) +vim.api.nvim_set_hl(0, 'CursorLineNr', { fg = c.gray8, bg = c.bg_alt }) +vim.api.nvim_set_hl(0, 'VertSplit', { fg = c.bg, bg = c.bg }) +vim.api.nvim_set_hl(0, 'IncSearch', { fg = c.bg, bg = c.bright_blue, bold = true }) +vim.api.nvim_set_hl(0, 'Search', { fg = c.bg, bg = c.faded_blue }) +vim.api.nvim_set_hl(0, 'MatchParen', { bold = true }) +vim.api.nvim_set_hl(0, 'Pmenu', { fg = c.fg, bg = c.gray1 }) +vim.api.nvim_set_hl(0, 'PmenuSel', { fg = c.gray1, bg = c.fg }) +vim.api.nvim_set_hl(0, 'PmenuSbar', { fg = c.fg, bg = c.gray1 }) +vim.api.nvim_set_hl(0, 'PmenuThumb', { fg = c.bg, bg = c.gray8 }) +vim.api.nvim_set_hl(0, 'Todo', { fg = c.purple, bold = true }) +vim.api.nvim_set_hl(0, 'SpellBad', { fg = c.orange, underline = true }) +vim.api.nvim_set_hl(0, 'Substitute', { fg = c.orange, bold = true, reverse = true }) +vim.api.nvim_set_hl(0, 'ErrorMsg', { reverse = true }) +vim.api.nvim_set_hl(0, 'NonText', { fg = c.green }) +vim.api.nvim_set_hl(0, 'Whitespace', { fg = c.gray2 }) + +vim.api.nvim_set_hl(0, 'WinSeparator', { fg = c.gray3, bg = c.bg }) +vim.api.nvim_set_hl(0, 'StatusLine', { fg = c.fg, bg = c.gray1 }) +vim.api.nvim_set_hl(0, 'StatusLineNC', { fg = c.gray6, bg = c.gray1 }) + +vim.api.nvim_set_hl(0, 'DiffAdd', { fg = c.neutral_green }) +vim.api.nvim_set_hl(0, 'DiffChange', { fg = c.neutral_blue }) +vim.api.nvim_set_hl(0, 'DiffDelete', { fg = c.neutral_red }) +vim.api.nvim_set_hl(0, 'DiffText', { fg = c.neutral_blue }) + +vim.api.nvim_set_hl(0, 'Comment', { fg = c.gray3, italic = true }) +vim.api.nvim_set_hl(0, 'Constant', { fg = c.fg }) +vim.api.nvim_set_hl(0, 'Define', { fg = c.gray3 }) +vim.api.nvim_set_hl(0, 'Delimiter', { fg = c.fg }) +vim.api.nvim_set_hl(0, 'Error', { underline = true, italic = true }) +vim.api.nvim_set_hl(0, 'Exception', { underline = true, bold = true }) +vim.api.nvim_set_hl(0, 'Function', { fg = c.gray6 }) +vim.api.nvim_set_hl(0, 'Identifier', { fg = c.gray8 }) +vim.api.nvim_set_hl(0, 'Include', { fg = c.gray7 }) +vim.api.nvim_set_hl(0, 'Keyword', { fg = c.gray4 }) +vim.api.nvim_set_hl(0, 'Conditional', { fg = c.gray4 }) +vim.api.nvim_set_hl(0, 'Repeat', { fg = c.gray4 }) +vim.api.nvim_set_hl(0, 'Label', { fg = c.fg }) +vim.api.nvim_set_hl(0, 'Macro', { fg = c.gray6 }) +vim.api.nvim_set_hl(0, 'Number', { fg = c.fg, bold = true }) +vim.api.nvim_set_hl(0, 'Boolean', { fg = c.fg, bold = true }) +vim.api.nvim_set_hl(0, 'Float', { fg = c.fg, bold = true }) +vim.api.nvim_set_hl(0, 'Operator', { fg = c.fg }) +vim.api.nvim_set_hl(0, 'SpecialChar', { fg = c.gray9 }) +vim.api.nvim_set_hl(0, 'String', { fg = c.gray9 }) +vim.api.nvim_set_hl(0, 'Character', { fg = c.fg }) +vim.api.nvim_set_hl(0, 'Tag', { fg = c.fg }) +vim.api.nvim_set_hl(0, 'Type', { fg = c.gray4 }) +vim.api.nvim_set_hl(0, 'Underlined', { underline = true }) +vim.api.nvim_set_hl(0, 'Bold', { bold = true }) +vim.api.nvim_set_hl(0, 'Italic', { italic = true }) +vim.api.nvim_set_hl(0, 'Statement', { fg = c.gray6 }) +vim.api.nvim_set_hl(0, 'healthError', { bold = true }) +vim.api.nvim_set_hl(0, 'healthWarning', { bold = true }) + +vim.api.nvim_set_hl(0, '@variable', { fg = c.gray8 }) +vim.api.nvim_set_hl(0, '@variable.parameter', { fg = c.gray8 }) + +local cleared = vim.trim([[ + SpellCap SpellLocal SpellRare + ModeMsg MoreMsg + Directory EndOfBuffer FoldColumn Folded Question SignColumn SpecialKey + TabLine TabLineFill WarningMsg Ignore PreProc Special + qfLineNr PmenuSelBold NormalFloat QuickFixLine Debug debugBreakpoint PreCondit + Structure Title +]]) +for group in vim.gsplit(cleared, '%s+') do + vim.api.nvim_set_hl(0, group, {}) end - -local function colorscheme() - vim.api.nvim_command('hi clear') - if vim.fn.exists('syntax_on') then - vim.api.nvim_command('syntax reset') - end - vim.o.termguicolors = true - vim.g.colors_name = 'monochrome' - - -- Core - hl('Normal', { fg = c.fg, bg = c.bg }) - hl('Terminal', { fg = c.fg, bg = c.bg }) - hl('Visual', { fg = c.bg, bg = c.fg }) - hl('VisualNOS', { fg = c.bg, bg = c.fg }) - hl('Cursor', { fg = c.bg, bg = c.fg }) - hl('lCursor', { fg = c.bg, bg = c.fg }) - hl('CursorIM', { fg = c.bg, bg = c.fg }) - hl('CursorColumn', { fg = c.fg }) - hl('CursorLine', { bg = c.bg_alt }) - hl('ColorColumn', { bg = c.bg_alt }) - hl('Conceal', { fg = c.gray2 }) - hl('LineNr', { fg = c.gray3 }) - hl('CursorLineNr', { fg = c.gray8, bg = c.bg_alt }) - hl('VertSplit', { fg = c.bg, bg = c.bg }) - hl('IncSearch', { fg = c.bg, bg = c.bright_blue, bold = true }) - hl('Search', { fg = c.bg, bg = c.faded_blue }) - hl('MatchParen', { bold = true }) - hl('Pmenu', { fg = c.fg, bg = c.gray1 }) - hl('PmenuSel', { fg = c.gray1, bg = c.fg }) - hl('PmenuSbar', { fg = c.fg, bg = c.gray1 }) - hl('PmenuThumb', { fg = c.bg, bg = c.gray8 }) - hl('SpecialComment', { fg = c.gray6, bold = true, italic = true }) - hl('Todo', { fg = c.purple, bold = true }) - hl('SpellBad', { fg = c.orange, underline = true }) - hl('Substitute', { fg = c.orange, bold = true, reverse = true }) - hl('ErrorMsg', { reverse = true }) - hl('NonText', { fg = c.green }) - hl('Whitespace', { fg = c.gray2 }) - hl('ToolbarLine', { bg = c.bg }) - hl('ToolbarButton', { bold = true }) - hl('TabLineSel', { reverse = true }) - hl('WildMenu', { reverse = true }) - hl('Typedef', { fg = c.gray7 }) - - -- Diff - hl('DiffAdd', { fg = c.neutral_green }) - hl('DiffChange', { fg = c.neutral_blue }) - hl('DiffDelete', { fg = c.neutral_red }) - hl('DiffText', { fg = c.neutral_blue }) - - -- Treesitter / legacy syntax colors - hl('TSBoolean', { fg = c.fg, bold = true }) - hl('TSCharacter', { fg = c.fg }) - hl('TSComment', { fg = c.gray3, italic = true }) - hl('TSConditional', { fg = c.gray4 }) - hl('TSConstant', { fg = c.fg }) - hl('TSConstBuiltin', { fg = c.gray3 }) - hl('TSConstructor', { fg = c.fg }) - hl('TSError', { underline = true, italic = true }) - hl('TSException', { underline = true, bold = true }) - hl('TSField', { fg = c.gray5 }) - hl('TSFloat', { fg = c.fg, bold = true }) - hl('TSFunction', { fg = c.gray6 }) - hl('TSFuncBuiltin', { fg = c.gray4 }) - hl('TSFuncMacro', { fg = c.gray6 }) - hl('TSInclude', { fg = c.gray7 }) - hl('TSKeyword', { fg = c.gray4 }) - hl('TSKeywordFunction', { fg = c.gray4 }) - hl('TSKeywordOperator', { fg = c.gray4 }) - hl('TSKeywordReturn', { fg = c.gray4 }) - hl('TSLabel', { fg = c.fg }) - hl('TSMethod', { fg = c.gray6 }) - hl('TSNamespace', { fg = c.gray4 }) - hl('TSNone', { fg = c.gray3 }) - hl('TSNumber', { fg = c.fg, bold = true }) - hl('TSOperator', { fg = c.fg }) - hl('TSParameter', { fg = c.gray7 }) - hl('TSParameterReference', { fg = c.gray7 }) - hl('TSProperty', { fg = c.gray5 }) - hl('TSPunctDelimiter', { fg = c.fg }) - hl('TSPunctBracket', { fg = c.fg }) - hl('TSPunctSpecial', { fg = c.fg }) - hl('TSRepeat', { fg = c.gray4 }) - hl('TSString', { fg = c.gray9 }) - hl('TSStringRegex', { fg = c.gray9 }) - hl('TSStringEscape', { fg = c.gray9 }) - hl('TSSymbol', { fg = c.fg }) - hl('TSTag', { fg = c.fg }) - hl('TSText', { fg = c.fg }) - hl('TSStrong', { bold = true }) - hl('TSEmphasis', { italic = true }) - hl('TSUnderline', { underline = true }) - hl('TSStrike', { strikethrough = true }) - hl('TSLiteral', { fg = c.fg }) - hl('TSNote', { bold = true }) - hl('TSWarning', { bold = true }) - hl('TSDanger', { bold = true }) - hl('TSType', { fg = c.gray4 }) - hl('TSTypeBuiltin', { fg = c.gray4 }) - hl('TSVariable', { fg = c.gray8 }) - hl('TSVariableBuiltin', { fg = c.gray8 }) - - -- Markdown (Vim's built-in syntax) - hl('markdownBold', { bold = true }) - hl('markdownH1', { bold = true }) - hl('markdownUrl', { fg = c.bright_blue }) - hl('markdownLinkDelimiter', { fg = c.gray4 }) - hl('markdownLinkTextDelimiter', { fg = c.gray4 }) - hl('mkdCodeStart', { fg = c.gray4 }) - hl('mkdCodeEnd', { fg = c.gray4 }) - hl('mkdURL', { fg = c.bright_blue }) - - -- Aliases - local links = { - Bold = 'TSStrong', - Boolean = 'TSBoolean', - Character = 'TSCharacter', - Comment = 'TSComment', - Conditional = 'TSConditional', - Constant = 'TSConstant', - Define = 'TSConstBuiltin', - Delimiter = 'TSPunctDelimiter', - Error = 'TSError', - Exception = 'TSException', - Field = 'TSProperty', - Float = 'TSFloat', - Function = 'TSFunction', - Identifier = 'TSVariable', - Include = 'TSInclude', - Italic = 'TSEmphasis', - Keyword = 'TSKeyword', - Label = 'TSLabel', - Macro = 'TSFuncMacro', - Number = 'TSNumber', - Operator = 'TSOperator', - Repeat = 'TSRepeat', - Statement = 'Function', - SpecialChar = 'TSStringEscape', - String = 'TSString', - Structure = 'TSAnnotation', - Tag = 'TSTag', - Title = 'TSTitle', - Type = 'TSType', - Underlined = 'TSUnderline', - asciidocAttributeEntry = 'TSAttribute', - cIncluded = 'TSConstructor', - healthError = 'TSDanger', - healthWarning = 'TSWarning', - markdownFootnote = 'TSNote', - markdownLinkText = 'TSURI', - rubySymbol = 'TSSymbol', - xmlNamespace = 'TSNamespace', - } - for group, target in pairs(links) do - hl(group, { link = target }) - end - - -- Explicitly clear Vim's stock defaults for these groups. - clear_groups([[ - SpellCap SpellLocal SpellRare - ModeMsg MoreMsg StatusLine StatusLineNC - Directory EndOfBuffer FoldColumn Folded Question SignColumn SpecialKey - TabLine TabLineFill WarningMsg Ignore PreProc Special - qfLineNr PmenuSelBold NormalFloat QuickFixLine Debug debugBreakpoint PreCondit - TSAnnotation TSAttribute TSConstMacro TSTagDelimiter TSTitle TSURI - TSMath TSTextReference TSEnvironment TSEnvironmentName - markdownCode markdownCodeDelimiter markdownError - mkdDelimiter mkdLineBreak mkdListItem - ]]) -end - -colorscheme()