From 8fc56f0aeca6cc2a02743669545653abc37a21d4 Mon Sep 17 00:00:00 2001 From: He4eT Date: Tue, 12 Jul 2022 01:32:49 +0300 Subject: [PATCH] Dirty colorscheme tuning --- lua/lush_theme/monotone.lua | 211 +++++++++++++++++++----------------- 1 file changed, 114 insertions(+), 97 deletions(-) diff --git a/lua/lush_theme/monotone.lua b/lua/lush_theme/monotone.lua index 3cfa621..96987db 100644 --- a/lua/lush_theme/monotone.lua +++ b/lua/lush_theme/monotone.lua @@ -25,26 +25,30 @@ -- -- Lua configuration example: -- --- vim.g.monotone_h = 85 --- vim.g.monotone_s = 30 --- vim.g.monotone_l = 50 --- vim.g.monotone_contrast = 100 --- vim.g.monotone_true_monotone = true --- vim.o.background = 'light' + vim.o.background = 'dark' + + vim.g.monotone_h = 0 + vim.g.monotone_s = 0 + vim.g.monotone_l = 70 + vim.g.monotone_contrast = 120 -- local lush = require("lush") local hsl = lush.hsl -- Config options + local opt = { bg = vim.o.background, - color = hsl(tonumber(vim.g.monotone_h) or 15, tonumber(vim.g.monotone_s) or 5, (tonumber(vim.g.monotone_l) or 50)), contrast = (tonumber(vim.g.monotone_contrast) or 100) / 100, - true_monotone = vim.g.monotone_true_monotone or false, + color = hsl( + tonumber(vim.g.monotone_h) or 15, + tonumber(vim.g.monotone_s) or 5, + tonumber(vim.g.monotone_l) or 50), } -- Handle dark/light background color + local offset_fn = "lighten" if opt.bg == "light" then opt.color = opt.color.darken(50) @@ -52,143 +56,141 @@ if opt.bg == "light" then end -- Monochrome shades + local shade = function(color, offset) return color[offset_fn](offset * opt.contrast) end -local s = { 50, 20, 10, 0, -10, -25, -45, -60, -70, inv = -100, normal = 100 } +local s = { 50, 20, 10, 0, -10, -25, -45, -60, -70 } --, inv = -100, normal = 100 } for k, v in pairs(s) do s[k] = shade(opt.color, v) end +s.normal = hsl("#cdcdcd") +s.inv = hsl("#383838") + -- Highlight colors -local red = shade(hsl(2, 90, s.normal.l), -35) -local yellow = shade(hsl(32, 70, s.normal.l), -35) -local blue = shade(hsl(205, 55, s.normal.l), -35) -local green = shade(hsl(90, 35, s.normal.l), -35) -local eob = shade(hsl(240, 35, s.normal.l), -45) -local nt = shade(hsl(330, 35, s.normal.l), -50) -if opt.true_monotone then - -- Disable all colors - red = s[3] - yellow = s[2] - blue = s[1] - green = s[4] - eob = s[4] - nt = s[4] -end +local red = hsl("#ff5111") +local yellow = hsl("#ffc812") +local yellow2 = hsl("#ffd700") -local hl1 = red -local hl2 = yellow -local hl3 = blue +local green = hsl("#4e9a06") +local white = hsl("#ffffff") +local eob = s[4] +local nt = s[4] + +---@diagnostic disable: undefined-global return lush(function() return { Normal({ fg = s.normal, bg = s.inv }), -- Normal text - SyntaxError({ sp = red, gui = "undercurl" }), - SyntaxWarning({ sp = yellow, gui = "undercurl" }), - SyntaxInfo({ sp = blue, gui = "undercurl" }), - SyntaxHint({ sp = green, gui = "undercurl" }), + SyntaxError({ fg = red, gui = "underline" }), + SyntaxWarning({ fg = yellow, gui = "underline" }), + SyntaxInfo({ fg = yellow, gui = "underline" }), + SyntaxHint({ fg = green, gui = "underline" }), - Comment({ fg = s[6], gui = "italic" }), -- any comment + Comment({ fg = s[6] }), -- any comment ColorColumn({ bg = s[6] }), -- used for the columns set with 'colorcolumn' Conceal({}), -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor({ bg = hl1 }), -- character under the cursor - CursorI({ bg = hl1 }), -- insert cursor TODO make this based on other colors - CursorR({ bg = hl2 }), -- replace cursor - CursorO({ bg = hl3 }), -- operator-pending cursor + Cursor({ fg = s.inv, bg = yellow }), -- character under the cursor + -- CursorI({}), -- insert cursor TODO make this based on other colors + -- CursorR({}), -- replace cursor + -- CursorO({}), -- operator-pending cursor -- lCursor { }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| -- CursorColumn { }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - CursorLine({ bg = Normal.bg[offset_fn](5) }), -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. + CursorLine({ bg = Normal.bg[offset_fn](2) }), -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. Directory({}), -- directory names (and other special names in listings) - DiffAdd({ fg = green }), -- diff mode: Added line |diff.txt| - DiffChange({ fg = yellow }), -- diff mode: Changed line |diff.txt| + DiffAdd({ fg = green, gui = "bold" }), -- diff mode: Added line |diff.txt| + DiffChange({ fg = yellow, gui = "bold" }), -- diff mode: Changed line |diff.txt| DiffDelete({ fg = red }), -- diff mode: Deleted line |diff.txt| - DiffText({ fg = s.inv, bg = red }), -- diff mode: Changed text within a changed line |diff.txt| + DiffText({ fg = white, bg = red }), -- diff mode: Changed text within a changed line |diff.txt| EndOfBuffer({ fg = eob }), -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. -- TermCursor { }, -- cursor in a focused terminal -- TermCursorNC { }, -- cursor in an unfocused terminal - Error({ fg = hl1, gui = "bold" }), -- (preferred) any erroneous construct - ErrorMsg({ fg = s.inv, bg = hl1, gui = "bold" }), -- error messages on the command line - VertSplit({ fg = s[1] }), -- the column separating vertically split windows - Folded({ fg = s[3], bg = s[9], gui = "italic" }), -- line used for closed folds + Error({ fg = red, gui = "bold" }), -- (preferred) any erroneous construct + ErrorMsg({ fg = red, gui = "bold" }), -- error messages on the command line + VertSplit({ fg = s[8] }), -- the column separating vertically split windows + Folded({ fg = s[3], bg = s[9] }), -- line used for closed folds FoldColumn({}), -- 'foldcolumn' SignColumn({}), -- column where |signs| are displayed - IncSearch({ fg = s.inv, bg = hl3 }), -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + IncSearch({ fg = s.inv, bg = yellow }), -- 'incsearch' highlighting; also used for the text replaced with ":s///c" Substitute({}), -- |:substitute| replacement text highlighting - LineNr({ fg = s[1] }), -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + LineNr({ fg = s[6] }), -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. CursorLineNr({ fg = s[1] }), -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - MatchParen({ fg = red, bg = shade(red, -78), gui = "bold,italic" }), -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| + MatchParen({ fg = yellow2, gui = "underline" }), -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| ParenMatch({ MatchParen }), ModeMsg({}), -- 'showmode' message (e.g., "-- INSERT -- ") MsgArea({}), -- Area for messages and cmdline MsgSeparator({}), -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg({ fg = hl3, gui = "bold" }), -- |more-prompt| + MoreMsg({ fg = yellow, gui = "bold" }), -- |more-prompt| NonText({ fg = nt }), -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. - NormalFloat({ bg = s[9], fg = s[2] }), -- Normal text in floating windows. + NormalFloat({ bg = s[7], fg = s[1] }), -- Normal text in floating windows. NormalNC({}), -- Normal text in non-current windows - Pmenu({ fg = s[1], bg = s[8] }), -- Popup menu: Normal item. + Pmenu({NormalFloat}), -- Popup menu: Normal item. PmenuSel({ fg = s.inv, bg = s.normal }), -- Popup menu: selected item. - PmenuSbar({ bg = s[8] }), -- Popup menu: scrollbar. + PmenuSbar({ bg = s[6] }), -- Popup menu: scrollbar. PmenuThumb({ bg = s[3] }), -- Popup menu: Thumb of the scrollbar. Question({}), -- |hit-enter| prompt and yes/no questions QuickFixLine({}), -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. - Search({ fg = s.inv, bg = hl2 }), -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + Search({ fg = s.inv, bg = yellow }), -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. SpecialKey({ gui = "bold" }), -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| SpellBad({ SyntaxError }), -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. SpellCap({ SyntaxInfo }), -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal({ SyntaxHint }), -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare({ SyntaxWarning }), -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine({ fg = s[1], bg = s[8] }), -- status line of current window - StatusLineNC({ fg = s[3], bg = s[9] }), -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + StatusLine({ fg = s.normal, bg = s.inv }), -- status line of current window + -- StatusLine({ fg = s[1], bg = s[8] }), -- status line of current window + StatusLineNC({ fg = s[6], bg = s.inv }), -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. TabLine({ fg = s[3] }), -- tab pages line, not active tab page label TabLineFill({ fg = s[3] }), -- tab pages line, where there are no labels TabLineSel({ fg = s[1], gui = "bold" }), -- tab pages line, active tab page label Title({ gui = "bold" }), -- titles for output from ":set all", ":autocmd" etc. Visual({ fg = s.inv, bg = s.normal }), -- Visual mode selection VisualNOS({}), -- Visual mode selection when vim is "Not Owning the Selection". - Warning({ fg = hl2, gui = "bold" }), -- warning messages + Warning({ fg = yellow, gui = "bold" }), -- warning messages WarningMsg({ Warning }), -- warning messages Whitespace({ fg = s[7] }), -- "nbsp", "space", "tab" and "trail" in 'listchars' - WildMenu({ fg = s[6], fg = s.normal }), -- current match in 'wildmenu' completion + WildMenu({ fg = s[6], bg = s.normal }), -- current match in 'wildmenu' completion - Constant({ gui = "underline", sp = "fg" }), -- (preferred) any constant - String({ fg = s[2] }), -- a string constant: "this is a string" - Character({}), -- a character constant: 'c', '\n' - Number({}), -- a number constant: 234, 0xff - Boolean({ gui = "italic" }), -- a boolean constant: TRUE, false - Float({}), -- a floating point constant: 2.3e10 + Constant({ fg = yellow2 }), -- (preferred) any constant + -- String({ fg = s[2] }), -- a string constant: "this is a string" + -- Character({}), -- a character constant: 'c', '\n' + -- Number({}), -- a number constant: 234, 0xff + -- Boolean({}), -- a boolean constant: TRUE, false + -- Float({}), -- a floating point constant: 2.3e10 - Identifier({ gui = "italic" }), -- (preferred) any variable name - Function({ gui = "bold" }), -- function name (also: methods for classes) + Identifier({ fg = yellow }), -- (preferred) any variable name + -- Identifier({ fg = white }), -- (preferred) any variable name + -- Function({}), -- function name (also: methods for classes) - Statement({ gui = "bold,italic" }), -- (preferred) any statement - Conditional({}), -- if, then, else, endif, switch, etc. - Repeat({}), -- for, do, while, etc. - Label({}), -- case, default, etc. - Operator({}), -- "sizeof", "+", "*", etc. - Keyword({}), -- any other keyword - Exception({}), -- try, catch, throw + Statement({ fg = white }), -- (preferred) any statement + -- Conditional({}), -- if, then, else, endif, switch, etc. + -- Repeat({}), -- for, do, while, etc. + -- Label({}), -- case, default, etc. + -- Operator({}), -- "sizeof", "+", "*", etc. + -- Keyword({}), -- any other keyword + -- Exception({}), -- try, catch, throw PreProc({}), -- (preferred) generic Preprocessor - Include({ gui = "italic" }), -- preprocessor #include - Define({}), -- preprocessor #define - Macro({}), -- same as Define - PreCondit({}), -- preprocessor #if, #else, #endif, etc. + -- Include({}), -- preprocessor #include + -- Define({}), -- preprocessor #define + -- Macro({}), -- same as Define + -- PreCondit({}), -- preprocessor #if, #else, #endif, etc. - Type({ gui = "bold" }), -- (preferred) int, long, char, etc. + Type({}), -- (preferred) int, long, char, etc. StorageClass({}), -- static, register, volatile, etc. Structure({}), -- struct, union, enum, etc. Typedef({}), -- A typedef - Special({}), -- (preferred) any special symbol - SpecialChar({}), -- special character in a constant - Tag({}), -- you can use CTRL-] on this - Delimiter({ fg = s[1] }), -- character that needs attention - SpecialComment({}), -- special things inside a comment - Debug({}), -- debugging statements + -- Special({ fg = yellow2 }), -- (preferred) any special symbol + Special({ fg = white }), -- (preferred) any special symbol + -- SpecialChar({}), -- special character in a constant + -- Tag({}), -- you can use CTRL-] on this + -- Delimiter({ fg = s[1] }), -- character that needs attention + -- SpecialComment({}), -- special things inside a comment + -- Debug({}), -- debugging statements Underlined({ gui = "underline" }), -- (preferred) text that stands out, HTML links Bold({ gui = "bold" }), @@ -196,19 +198,19 @@ return lush(function() -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| - Todo({ fg = hl2, gui = "bold,italic" }), -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Todo({ fg = yellow, gui = "bold" }), -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX - LspReferenceText({ gui = "underline", sp = blue }), -- used for highlighting "text" references - LspReferenceRead({ gui = "underline", sp = s.normal }), -- used for highlighting "read" references - LspReferenceWrite({ gui = "underline", sp = green }), -- used for highlighting "write" references + LspReferenceText({ gui = "underline", fg = yellow }), -- used for highlighting "text" references + LspReferenceRead({ gui = "underline", fg = yellow }), -- used for highlighting "read" references + LspReferenceWrite({ gui = "underline", fg = green }), -- used for highlighting "write" references IndentBlanklineChar({ fg = s[8] }), IndentBlanklineContextChar({ fg = nt }), - DiagnosticError({ fg = red, bg = shade(red, -78) }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - DiagnosticWarn({ fg = yellow, bg = shade(yellow, -78) }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - DiagnosticInfo({ fg = blue, bg = shade(blue, -78) }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - DiagnosticHint({ fg = green, bg = shade(green, -78) }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticError({ fg = red }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticWarn({ fg = yellow }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticInfo({ fg = yellow }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticHint({ fg = green }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) -- LspDiagnosticsVirtualTextError { }, -- Used for "Error" diagnostic virtual text -- LspDiagnosticsVirtualTextWarning { }, -- Used for "Warning" diagnostic virtual text @@ -225,10 +227,10 @@ return lush(function() -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float - DiagnosticSignError({ fg = red, bg = shade(red, -84) }), -- Used for "Error" signs in sign column - DiagnosticSignWarning({ fg = yellow, bg = shade(yellow, -84) }), -- Used for "Warning" signs in sign column - DiagnosticSignInformation({ fg = blue, bg = shade(blue, -84) }), -- Used for "Information" signs in sign column - DiagnosticSignHint({ fg = green, bg = shade(green, -84) }), -- Used for "Hint" signs in sign column + DiagnosticSignError({ fg = red }), -- Used for "Error" signs in sign column + DiagnosticSignWarning({ fg = yellow }), -- Used for "Warning" signs in sign column + DiagnosticSignInformation({ fg = s.normal }), -- Used for "Information" signs in sign column + DiagnosticSignHint({ fg = green }), -- Used for "Hint" signs in sign column -- TSAnnotation { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. -- TSAttribute { }; -- (unstable) TODO: docs @@ -258,13 +260,13 @@ return lush(function() -- TSOperator { }; -- For any operator: `+`, but also `->` and `*` in C. -- TSParameter { }; -- For parameters of a function. -- TSParameterReference { }; -- For references to parameters of a function. - TSProperty({ gui = "italic" }), -- Same as `TSField`. + TSProperty({}), -- Same as `TSField`. -- TSPunctDelimiter { }; -- For delimiters ie: `.` -- TSPunctBracket { }; -- For brackets and parens. -- TSPunctSpecial { }; -- For special punctutation that does not fall in the catagories before. -- TSRepeat { }; -- For keywords related to loops. -- TSString { }; -- For strings. - TSStringRegex({ fg = s[1], gui = "italic" }), -- For regexes. + TSStringRegex({ fg = s[1] }), -- For regexes. TSStringEscape({ fg = s.normal, gui = "bold" }), -- For escape characters within a string. -- TSSymbol { }; -- For identifiers referring to symbols or atoms. -- TSType { }; -- For types. @@ -283,6 +285,21 @@ return lush(function() -- TSURI { }; -- Any URI like a link or email. IndentBlankLineContextStart({ gui = "underline", sp = nt }), - TreesitterContext({ fg = s[3], gui = "italic" }), + TreesitterContext({ fg = s[3] }), + + -- Lightspeed + + LightspeedGreyWash({ Comment }), + LightspeedLabel({ fg = white }), + LightspeedOverlapped({ fg = white.darken(15), gui = "underline" }), + LightspeedLabelDistant({ fg = yellow, gui = "underline" }), + LightspeedLabelDistantOverlapped({ fg = yellow.darken(15), gui = "underline" }), + LightspeedShortcut({ fg = yellow }), + LightspeedShortcutOverlapped({ LightspeedShortcut }), + LightspeedMaskedChar({ fg = s.normal, gui = "none" }), + LightspeedUnlabeledMatch({ fg = s.normal, gui = "bold" }), + LightspeedOneCharMatch({ LightspeedShortcut, gui = "none" }), + LightspeedUniqueChar({ LightspeedUnlabeledMatch }), + LightspeedPendingOpArea({ LightspeedShortcut, gui = "underline" }), } end)