From 92c67f64e16443c0d0a9c8823773433f1944cc3d Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 10 Sep 2021 18:41:56 +0800 Subject: [PATCH 01/53] initial zenflesh colors --- lua/zenflesh/init.lua | 396 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 396 insertions(+) create mode 100644 lua/zenflesh/init.lua diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua new file mode 100644 index 0000000..68a56c1 --- /dev/null +++ b/lua/zenflesh/init.lua @@ -0,0 +1,396 @@ +local lush = require "lush" +local hsluv = lush.hsluv + +local c = { + sand = hsluv(39, 12, 16), + stone = hsluv(230, 2, 80), + leaf = hsluv(103, 68, 54), + water = hsluv(236, 84, 53), + rose = hsluv(4, 62, 53), + wood = hsluv(26, 74, 51), + blossom = hsluv(318, 40, 52), + sky = hsluv(204, 80, 58), +} + +local normal_bg = c.sand +local diff_bg_li = 0 + +local lightness = vim.g.zenbones_lightness +if lightness == "bright" then + normal_bg = normal_bg.abs_da(-4) + diff_bg_li = -4 +elseif lightness == "dim" then + normal_bg = normal_bg.abs_da(4).de(18) + diff_bg_li = 4 +elseif lightness ~= nil then + local error_msg = "Unknown zenbones_lightness value: " .. vim.inspect(lightness) + vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) +end + +-- stylua: ignore start +local theme = lush(function() + return { + -- The following are all the Neovim default highlight groups from the docs + -- as of 0.5.0-nightly-446, to aid your theme creation. Your themes should + -- probably style all of these at a bare minimum. + -- + -- Referenced/linked groups must come before being referenced/lined, + -- so the order shown ((mostly) alphabetical) is likely + -- not the order you will end up with. + -- + -- You can uncomment these and leave them empty to disable any + -- styling for that group (meaning they mostly get styled as Normal) + -- or leave them commented to apply vims default colouring or linking. + + Normal { bg = normal_bg, fg = c.stone }, -- normal text + + Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links + Bold { gui = "bold" }, + Italic { gui = "italic" }, + + Error { fg = c.rose }, -- (preferred) any erroneous construct + ErrorMsg { Error }, -- error messages on the command line + WarningMsg { fg = c.wood }, -- warning messages + + Comment { fg = c.sand.li(38).de(28), gui = "italic" }, -- any comment + Conceal { fg = c.stone.li(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') + + Cursor { bg = c.stone, fg = c.sand.da(10) }, -- character under the cursor + lCursor { Cursor, bg = Cursor.bg.li(20) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| + TermCursor { Cursor }, -- cursor in a focused terminal + + CursorLine { bg = Normal.bg.li(4) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. + CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + ColorColumn { bg = c.wood.de(38).da(20) }, -- used for the columns set with 'colorcolumn' + + DiffAdd { bg = c.leaf.de(20).da(10).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.water.de(22).li(10).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = c.rose.de(37).li(10).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = c.water.de(24).li(20).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + + LineNr { fg = Normal.bg.li(32) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + SignColumn { LineNr }, -- column where |signs| are displayed + FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' + Folded { bg = Normal.bg.li(16), fg = Normal.bg.da(64) }, -- line used for closed folds + CursorLineNr { LineNr, fg = c.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + + -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") + -- MsgArea { }, -- Area for messages and cmdline + -- MsgSeparator { }, -- Separator for scrolled messages, `msgsep` flag of 'display' + MoreMsg { fg = c.leaf, gui = "bold" }, -- |more-prompt| + NormalFloat { bg = Normal.bg.li(6) }, -- Normal text in floating windows. + FloatBorder { fg = Normal.bg.li(50) }, -- Normal text in floating windows. + + Pmenu { bg = Normal.bg.li(10) }, -- Popup menu: normal item. + PmenuSel { bg = Normal.bg.li(20) }, -- Popup menu: selected item. + PmenuSbar { bg = Normal.bg.li(28) }, -- Popup menu: scrollbar. + PmenuThumb { bg = Normal.bg.li(58) }, -- Popup menu: Thumb of the scrollbar. + + Search { bg = c.blossom.de(10).da(20), fg = c.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch { bg = c.blossom, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + -- Substitute { }, -- |:substitute| replacement text highlighting + MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| + -- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. + + SpellBad { fg = Error.fg.de(30), gui = "undercurl", guisp = Error.fg }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. + SpellCap { SpellBad, guisp = Error.fg.li(10) }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. + SpellRare { SpellBad, guisp = c.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + + StatusLine { bg = c.sand.li(14), fg = c.stone }, -- status line of current window + StatusLineNC { bg = c.sand.li(10), fg = c.stone.li(28) }, -- 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 { StatusLine, gui = "italic" }, -- tab pages line, not active tab page label + TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels + TabLineSel { gui = "bold" }, -- tab pages line, active tab page label + VertSplit { fg = PmenuThumb.bg }, -- the column separating vertically split windows + + Visual { bg = c.stone.li(84) }, -- Visual mode selection + -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". + + NonText { fg = Normal.bg.li(22) }, -- '@' 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|. + SpecialKey { NonText, gui = "italic" }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + Whitespace { NonText }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + EndOfBuffer { NonText }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. + + WildMenu { bg = c.blossom, fg = c.sand }, -- current match in 'wildmenu' completion + Directory { gui = "bold" }, -- directory names (and other special names in listings) + Question { MoreMsg }, -- |hit-enter| prompt and yes/no questions + Title { gui = "bold" }, -- titles for output from ":set all", ":autocmd" etc. + + + -- These groups are not listed as default vim groups, + -- but they are defacto standard group names for syntax highlighting. + -- commented out groups should chain up to their "preferred" group by + -- default, + -- Uncomment and edit if you want more specific syntax highlighting. + + Constant { fg = c.stone.li(24), gui = "italic" }, -- (preferred) any constant + -- String { }, -- 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 { fg = c.stone.li(16) }, -- (preferred) any variable name + Function { fg = c.stone }, -- function name (also: methods for classes) + + Statement { fg = c.stone, gui = "bold" }, -- (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 { Statement }, -- (preferred) generic Preprocessor + -- Include { }, -- preprocessor #include + -- Define { }, -- preprocessor #define + -- Macro { }, -- same as Define + -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. + + Type { fg = c.sand.li(62) }, -- (preferred) int, long, char, etc. + -- StorageClass { }, -- static, register, volatile, etc. + -- Structure { }, -- struct, union, enum, etc. + -- Typedef { }, -- A typedef + + Special { fg = c.stone.li(21), gui = "bold" }, -- (preferred) any special symbol + -- SpecialChar { }, -- special character in a constant + -- Tag { }, -- you can use CTRL-] on this + Delimiter { fg = c.sand.li(68) }, -- character that needs attention + SpecialComment { Comment, gui = "bold" }, -- special things inside a comment + -- Debug { }, -- debugging statements + + -- ("Ignore", below, may be invisible...) + -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| + + Todo { gui = "bold,underline" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + + -- These groups are for the native LSP client. Some other LSP clients may + -- use these groups, or use their own. Consult your LSP client's + -- documentation. + + LspReferenceText { ColorColumn }, -- used for highlighting "text" references + LspReferenceRead { ColorColumn }, -- used for highlighting "read" references + LspReferenceWrite { ColorColumn }, -- used for highlighting "write" references + + LspDiagnosticsDefaultError { Error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultWarning { WarningMsg }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultInformation { fg = c.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultHint { fg = c.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + + LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(48).da(60) }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(58).da(60) }, -- Used for "Warning" diagnostic virtual text + -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text + -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text + + LspDiagnosticsUnderlineError { LspDiagnosticsDefaultError, gui = "undercurl" }, -- Used to underline "Error" diagnostics + LspDiagnosticsUnderlineWarning { LspDiagnosticsDefaultWarning, gui = "undercurl" }, -- Used to underline "Warning" diagnostics + LspDiagnosticsUnderlineInformation { LspDiagnosticsDefaultInformation, gui = "undercurl" }, -- Used to underline "Information" diagnostics + LspDiagnosticsUnderlineHint { LspDiagnosticsDefaultHint, gui = "undercurl" }, -- Used to underline "Hint" diagnostics + + -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float + + -- LspDiagnosticsSignError { }, -- Used for "Error" signs in sign column + -- LspDiagnosticsSignWarning { }, -- Used for "Warning" signs in sign column + -- LspDiagnosticsSignInformation { }, -- Used for "Information" signs in sign column + -- LspDiagnosticsSignHint { }, -- Used for "Hint" signs in sign column + + LspCodeLens { LineNr }, + + -- These groups are for the neovim tree-sitter highlights. + -- As of writing, tree-sitter support is a WIP, group names may change. + -- By default, most of these groups link to an appropriate Vim group, + -- TSError -> Error for example, so you do not have to define these unless + -- you explicitly want to support Treesitter's improved syntax awareness. + + -- TSAnnotation { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. + -- TSAttribute { }; -- (unstable) TODO: docs + -- TSBoolean { }; -- For booleans. + -- TSCharacter { }; -- For characters. + -- TSComment { }; -- For comment blocks. + -- TSConstructor { }; -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. + -- TSConditional { }; -- For keywords related to conditionnals. + -- TSConstant { }; -- For constants + -- TSConstBuiltin { }; -- For constant that are built in the language: `nil` in Lua. + -- TSConstMacro { }; -- For constants that are defined by macros: `NULL` in C. + -- TSError { }; -- For syntax/parser errors. + -- TSException { }; -- For exception related keywords. + -- TSField { }; -- For fields. + -- TSFloat { }; -- For floats. + -- TSFunction { }; -- For function (calls and definitions). + -- TSFuncBuiltin { }; -- For builtin functions: `table.insert` in Lua. + -- TSFuncMacro { }; -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. + -- TSInclude { }; -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. + -- TSKeyword { }; -- For keywords that don't fall in previous categories. + -- TSKeywordFunction { }; -- For keywords used to define a fuction. + -- TSLabel { }; -- For labels: `label:` in C and `:label:` in Lua. + -- TSMethod { }; -- For method calls and definitions. + -- TSNamespace { }; -- For identifiers referring to modules and namespaces. + -- TSNone { }; -- TODO: docs + -- TSNumber { }; -- For all numbers + -- TSOperator { }; -- For any operator: `+`, but also `->` and `*` in C. + -- TSParameter { }; -- For parameters of a function. + -- TSParameterReference { }; -- For references to parameters of a function. + -- 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 { }; -- For regexes. + -- TSStringEscape { }; -- For escape characters within a string. + -- TSSymbol { }; -- For identifiers referring to symbols or atoms. + -- TSType { }; -- For types. + -- TSTypeBuiltin { }; -- For builtin types. + TSVariable { Identifier }, -- Any variable name that does not have another highlight. + -- TSVariableBuiltin { }; -- Variable names that are defined by the languages, like `this` or `self`. + + TSTag { Special }, -- Tags like html tag names. + -- TSTagDelimiter { }; -- Tag delimiter like `<` `>` `/` + -- TSText { }; -- For strings considered text in a markup language. + -- TSEmphasis { }; -- For text to be represented with emphasis. + -- TSUnderline { }; -- For text to be represented with an underline. + -- TSStrike { }; -- For strikethrough text. + -- TSTitle { }; -- Text that is part of a title. + -- TSLiteral { }; -- Literal text. + -- TSURI { }; -- Any URI like a link or email. + + TSNote { LspDiagnosticsDefaultInformation }, + TSWarning { WarningMsg }, + TSDanger { Error }, + + -- Syntax + diffAdded { fg = c.leaf }, + diffRemoved { fg = c.rose }, + diffChanged { fg = c.water }, + diffOldFile { fg = c.rose, gui = "italic" }, + diffNewFile { fg = c.leaf, gui = "italic" }, + diffFile { fg = c.wood, gui = "bold" }, + diffLine { fg = c.blossom, gui = "bold" }, + diffIndexLine { fg = c.wood }, + + markdownH1 { Statement, gui = "bold,underline" }, + markdownH2 { Statement }, + markdownH3 { Statement }, + markdownH4 { Special }, + markdownH5 { Special }, + markdownH6 { Special }, + markdownCode { Identifier }, + markdownLinkTextDelimiter { Delimiter }, + + helpHyperTextEntry { Special }, + helpHyperTextJump { Constant }, + helpSpecial { Type }, + helpOption { Constant }, + + -- Other plugins + GitSignsAdd { fg = c.leaf }, + GitSignsChange { fg = c.water }, + GitSignsDelete { fg = c.rose }, + + GitGutterAdd { GitSignsAdd }, + GitGutterChange { GitSignsChange }, + GitGutterDelete { GitSignsDelete }, + + IndentBlanklineChar { fg = c.sand.da(12).de(20) }, + + TelescopeSelection { CursorLine }, + TelescopeSelectionCaret { TelescopeSelection, fg = c.rose }, + TelescopeMatching { fg = c.blossom, gui = "bold" }, + TelescopeBorder { FloatBorder }, + + Sneak { Search }, + SneakLabel { WildMenu }, + SneakLabelMask { bg = c.blossom, fg = c.blossom }, + + LightspeedLabel { fg = c.blossom, gui = "bold,underline" }, + LightspeedLabelOverlapped { fg = c.blossom, gui = "underline" }, + LightspeedLabelDistant { fg = c.sky, gui = "bold,underline" }, + LightspeedLabelDistantOverlapped { fg = c.sky, gui = "underline" }, + LightspeedShortcut { SneakLabel, gui = "bold,underline" }, + LightspeedOneCharMatch { SneakLabel, gui = "bold" }, + LightspeedMaskedChar { Conceal }, + LightspeedUnlabeledMatch { Bold }, + LightspeedPendingOpArea { SneakLabel }, + LightspeedPendingChangeOpArea { fg = c.blossom }, + LightspeedGreyWash { fg = Comment.fg }, + + HopNextKey { LightspeedLabel }, + HopNextKey1 { LightspeedLabelDistant }, + HopNextKey2 { fg = c.water }, + HopUnmatched { LightspeedGreyWash } , + + BufferCurrent { TabLineSel }, + BufferVisible { fg = StatusLineNC.fg }, + BufferVisibleSign { fg = StatusLineNC.fg }, + BufferVisibleIndex { fg = StatusLineNC.fg }, + + CocErrorSign { LspDiagnosticsDefaultError }, + CocWarningSign { LspDiagnosticsDefaultWarning }, + CocInfoSign { LspDiagnosticsDefaultInformation }, + CocHintSign { LspDiagnosticsDefaultHint }, + CocErrorHighlight { CocErrorSign, gui = "underline" }, + CocWarningHighlight { CocWarningSign, gui = "underline" }, + CocInfoHighlight { CocInfoSign, gui = "underline" }, + CocHintHighlight { CocHintSign, gui = "underline" }, + CocErrorVirtualText { LspDiagnosticsVirtualTextError }, + CocWarningVitualText { LspDiagnosticsVirtualTextWarning }, + CocSelectedText { SpellBad }, + CocCodeLens { LineNr }, + CocMarkdownLink { fg = c.sky, gui = "underline" }, + + NeogitNotificationError { LspDiagnosticsDefaultError }, + NeogitNotificationWarning { LspDiagnosticsDefaultWarning }, + NeogitNotificationInfo { LspDiagnosticsDefaultInformation }, + + NeogitDiffContextHighlight { CursorLine }, + NeogitDiffDeleteHighlight { DiffDelete }, + NeogitDiffAddHighlight { DiffAdd }, + NeogitHunkHeader { LineNr }, + NeogitHunkHeaderHighlight { CursorLine, fg = c.stone, gui = "bold" }, + + WhichKey { Statement }, + WhichKeyGroup { Special }, + WhichKeySeparator { LineNr }, + WhichKeyValue { Constant }, + + TroubleNormal { Function }, + TroubleText { Function }, + TroubleSource { Constant }, + } +end) +-- stylua: ignore end + +local specs = { + theme, +} + +if vim.g.zenbones_dim_noncurrent_window then + table.insert( + specs, + lush(function() + return { + NormalNC { theme.Normal, bg = theme.Normal.bg.abs_da(2) }, -- normal text in non-current windows + } + end) + ) +end + +if vim.g.zenbones_solid_vert_split then + table.insert( + specs, + lush(function() + return { + VertSplit { bg = theme.StatusLineNC.bg, fg = theme.LineNr.fg }, -- the column separating vertically split windows + } + end) + ) +end + +return lush.merge(specs) + +-- vi:nowrap From c0b02ebc53b6c2a2e46bbad2baa74413f8790327 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 10 Sep 2021 18:55:17 +0800 Subject: [PATCH 02/53] adjust overall contrast --- lua/zenflesh/init.lua | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 68a56c1..bbff647 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -3,12 +3,13 @@ local hsluv = lush.hsluv local c = { sand = hsluv(39, 12, 16), - stone = hsluv(230, 2, 80), + -- stone = hsluv(230, 2, 80), + stone = hsluv(52, 7, 76), leaf = hsluv(103, 68, 54), water = hsluv(236, 84, 53), - rose = hsluv(4, 62, 53), - wood = hsluv(26, 74, 51), - blossom = hsluv(318, 40, 52), + rose = hsluv(4, 55, 56), + wood = hsluv(26, 59, 54), + blossom = hsluv(318, 45, 56), sky = hsluv(204, 80, 58), } @@ -87,7 +88,7 @@ local theme = lush(function() PmenuSbar { bg = Normal.bg.li(28) }, -- Popup menu: scrollbar. PmenuThumb { bg = Normal.bg.li(58) }, -- Popup menu: Thumb of the scrollbar. - Search { bg = c.blossom.de(10).da(20), fg = c.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + Search { bg = c.blossom.de(10).da(25), fg = c.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. IncSearch { bg = c.blossom, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" -- Substitute { }, -- |:substitute| replacement text highlighting MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| @@ -105,7 +106,7 @@ local theme = lush(function() TabLineSel { gui = "bold" }, -- tab pages line, active tab page label VertSplit { fg = PmenuThumb.bg }, -- the column separating vertically split windows - Visual { bg = c.stone.li(84) }, -- Visual mode selection + Visual { bg = c.stone.da(70) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". NonText { fg = Normal.bg.li(22) }, -- '@' 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|. @@ -125,14 +126,14 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.li(24), gui = "italic" }, -- (preferred) any constant + Constant { fg = c.stone.da(26), gui = "italic" }, -- (preferred) any constant -- String { }, -- 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 { fg = c.stone.li(16) }, -- (preferred) any variable name + Identifier { fg = c.stone.da(12) }, -- (preferred) any variable name Function { fg = c.stone }, -- function name (also: methods for classes) Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement From f38400c6b1217523a1c5caa30bece10548061fbb Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 10 Sep 2021 19:27:59 +0800 Subject: [PATCH 03/53] adjust base stone and sand adjust diff colors --- lua/zenflesh/init.lua | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index bbff647..b51e646 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -2,9 +2,9 @@ local lush = require "lush" local hsluv = lush.hsluv local c = { - sand = hsluv(39, 12, 16), + sand = hsluv(48, 10, 12), -- stone = hsluv(230, 2, 80), - stone = hsluv(52, 7, 76), + stone = hsluv(92, 6, 78), leaf = hsluv(103, 68, 54), water = hsluv(236, 84, 53), rose = hsluv(4, 55, 56), @@ -53,7 +53,7 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = c.wood }, -- warning messages - Comment { fg = c.sand.li(38).de(28), gui = "italic" }, -- any comment + Comment { fg = c.sand.li(32).de(30), gui = "italic" }, -- any comment Conceal { fg = c.stone.li(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor { bg = c.stone, fg = c.sand.da(10) }, -- character under the cursor @@ -63,14 +63,14 @@ local theme = lush(function() CursorLine { bg = Normal.bg.li(4) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - ColorColumn { bg = c.wood.de(38).da(20) }, -- used for the columns set with 'colorcolumn' + ColorColumn { bg = c.wood.de(38).da(24) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(20).da(10).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(22).li(10).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(37).li(10).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(24).li(20).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = c.leaf.de(17).da(23).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.water.de(18).da(22).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = c.rose.de(23).da(15).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = c.water.de(22).da(17).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| - LineNr { fg = Normal.bg.li(32) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + LineNr { fg = Normal.bg.li(26) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' Folded { bg = Normal.bg.li(16), fg = Normal.bg.da(64) }, -- line used for closed folds @@ -95,7 +95,7 @@ local theme = lush(function() -- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. SpellBad { fg = Error.fg.de(30), gui = "undercurl", guisp = Error.fg }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. - SpellCap { SpellBad, guisp = Error.fg.li(10) }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + SpellCap { SpellBad, guisp = Error.fg.da(10) }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare { SpellBad, guisp = c.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. @@ -126,14 +126,14 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.da(26), gui = "italic" }, -- (preferred) any constant + Constant { fg = c.stone.da(30), gui = "italic" }, -- (preferred) any constant -- String { }, -- 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 { fg = c.stone.da(12) }, -- (preferred) any variable name + Identifier { fg = c.stone.da(18) }, -- (preferred) any variable name Function { fg = c.stone }, -- function name (also: methods for classes) Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement @@ -150,15 +150,15 @@ local theme = lush(function() -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - Type { fg = c.sand.li(62) }, -- (preferred) int, long, char, etc. + Type { fg = c.sand.li(68) }, -- (preferred) int, long, char, etc. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = c.stone.li(21), gui = "bold" }, -- (preferred) any special symbol + Special { fg = c.stone.da(18), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = c.sand.li(68) }, -- character that needs attention + Delimiter { fg = c.sand.li(38) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements From d098ff9051851be05706b26abac25e82e6e15215 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 11 Sep 2021 13:21:35 +0800 Subject: [PATCH 04/53] add zenflesh-lush color --- colors/zenflesh-lush.lua | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 colors/zenflesh-lush.lua diff --git a/colors/zenflesh-lush.lua b/colors/zenflesh-lush.lua new file mode 100644 index 0000000..0064e9b --- /dev/null +++ b/colors/zenflesh-lush.lua @@ -0,0 +1,21 @@ +vim.opt.background = "light" +vim.g.colors_name = "zenflesh-lush" + +require("zenbones.terminal").setup() + +-- By setting our module to nil, we clear lua's cache, +-- which means the require ahead will *always* occur. +-- +-- This isn't strictly required but it can be a useful trick if you are +-- incrementally editing your config a lot and want to be sure your themes +-- changes are being picked up without restarting neovim. +-- +-- Note if you're working in on your theme and have :Lushify'd the buffer, +-- your changes will be applied with our without the following line. +-- +-- The performance impact of this call can be measured in the hundreds of +-- *nanoseconds* and such could be considered "production safe". +package.loaded["zenflesh"] = nil + +-- include our theme file and pass it to lush to apply +require "lush"(require "zenflesh") From 6192a4b07e0409a4f287f601bfec097baea74a16 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 11 Sep 2021 13:22:19 +0800 Subject: [PATCH 05/53] simplify readme --- README.md | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index ac12ceb..7a6fa1b 100644 --- a/README.md +++ b/README.md @@ -49,33 +49,13 @@ colorscheme zenbones If you want to make use of the lua version: ```vim -" has('nvim') only +" Requires `neovim` and `rktjmp/lush.nvim` installed colorscheme zenbones-lush ``` It works pretty much the same as the first one but pretty handy when extending or customizing the colors to your likings. - - -## Showcase - -**Diff highlights** - -Vim diff - -**Search matches** - -Search matches - -**LSP diagnostics** - -LSP diagnostics - -_Font used is [Iosevka Curly Slab](https://typeof.net/Iosevka/)_. - - - ## Configuration Configuration is only available for `zenbones-lush`. @@ -107,8 +87,7 @@ Set to `v:true` to make non-current window background dimmer than _Normal_. ## Advanced Usage -Zenbones is pretty extensible thanks to -[Lush](https://github.com/rktjmp/lush.nvim). You can easily retrieve the colors +Zenbones is pretty extensible thanks to Lush. You can easily retrieve the colors in lua: ```lua @@ -121,7 +100,7 @@ print(sand.darken(20).hex) See also [Lush's documentation](https://github.com/rktjmp/lush.nvim#advanced-usage) for -the complete options. +more options. ## Other plugins support @@ -192,6 +171,26 @@ It's also possible to generate color configuration files using a template, [this one for Kitty](lua/zenbones/build/kitty.lua) for example. Please feel free to submit a PR if you want to add some more. + + +## Showcase + +**Diff highlights** + +Vim diff + +**Search matches** + +Search matches + +**LSP diagnostics** + +LSP diagnostics + +_Font used is [Iosevka Curly Slab](https://typeof.net/Iosevka/)_. + + + ## Inspirations Zenbones is heavily inspired by From 41beeba2cd2320ccb9daf18bdf2dfb7d31ac926b Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 11 Sep 2021 16:50:43 +0800 Subject: [PATCH 06/53] overall color tweaking --- lua/zenflesh/init.lua | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index b51e646..48b4acb 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -2,14 +2,14 @@ local lush = require "lush" local hsluv = lush.hsluv local c = { - sand = hsluv(48, 10, 12), + sand = hsluv(39, 8, 12), -- stone = hsluv(230, 2, 80), - stone = hsluv(92, 6, 78), + stone = hsluv(106, 6, 74), leaf = hsluv(103, 68, 54), water = hsluv(236, 84, 53), rose = hsluv(4, 55, 56), wood = hsluv(26, 59, 54), - blossom = hsluv(318, 45, 56), + blossom = hsluv(318, 45, 58), sky = hsluv(204, 80, 58), } @@ -53,27 +53,28 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = c.wood }, -- warning messages - Comment { fg = c.sand.li(32).de(30), gui = "italic" }, -- any comment - Conceal { fg = c.stone.li(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Comment { fg = c.sand.li(36).de(30), gui = "italic" }, -- any comment + Conceal { fg = c.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor { bg = c.stone, fg = c.sand.da(10) }, -- character under the cursor - lCursor { Cursor, bg = Cursor.bg.li(20) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + Cursor { bg = c.stone.li(20), fg = c.sand.da(20) }, -- character under the cursor + lCursor { Cursor, bg = Cursor.bg.da(20) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| TermCursor { Cursor }, -- cursor in a focused terminal + TermCursorNC { lCursor }, -- cursor in an unfocused terminal CursorLine { bg = Normal.bg.li(4) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - ColorColumn { bg = c.wood.de(38).da(24) }, -- used for the columns set with 'colorcolumn' + ColorColumn { bg = c.wood.de(38).da(28) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(17).da(23).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(18).da(22).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(23).da(15).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(22).da(17).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = c.leaf.de(14).da(38).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.water.de(18).da(41).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = c.rose.de(23).da(44).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = c.water.de(22).da(18).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.li(26) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' - Folded { bg = Normal.bg.li(16), fg = Normal.bg.da(64) }, -- line used for closed folds + Folded { bg = Normal.bg.li(16), fg = Normal.bg.li(64) }, -- line used for closed folds CursorLineNr { LineNr, fg = c.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") @@ -88,8 +89,8 @@ local theme = lush(function() PmenuSbar { bg = Normal.bg.li(28) }, -- Popup menu: scrollbar. PmenuThumb { bg = Normal.bg.li(58) }, -- Popup menu: Thumb of the scrollbar. - Search { bg = c.blossom.de(10).da(25), fg = c.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch { bg = c.blossom, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + Search { bg = c.blossom.de(10).da(30), fg = c.sand }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch { bg = c.blossom, fg = c.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" -- Substitute { }, -- |:substitute| replacement text highlighting MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| -- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. @@ -106,7 +107,7 @@ local theme = lush(function() TabLineSel { gui = "bold" }, -- tab pages line, active tab page label VertSplit { fg = PmenuThumb.bg }, -- the column separating vertically split windows - Visual { bg = c.stone.da(70) }, -- Visual mode selection + Visual { bg = c.stone.da(68) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". NonText { fg = Normal.bg.li(22) }, -- '@' 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|. @@ -126,14 +127,14 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.da(30), gui = "italic" }, -- (preferred) any constant + Constant { fg = c.stone.da(32), gui = "italic" }, -- (preferred) any constant -- String { }, -- 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 { fg = c.stone.da(18) }, -- (preferred) any variable name + Identifier { fg = c.stone.da(20) }, -- (preferred) any variable name Function { fg = c.stone }, -- function name (also: methods for classes) Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement @@ -155,10 +156,10 @@ local theme = lush(function() -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = c.stone.da(18), gui = "bold" }, -- (preferred) any special symbol + Special { fg = c.stone.da(20), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = c.sand.li(38) }, -- character that needs attention + Delimiter { fg = c.sand.sa(12).li(42) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements @@ -180,8 +181,8 @@ local theme = lush(function() LspDiagnosticsDefaultInformation { fg = c.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultHint { fg = c.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(48).da(60) }, -- Used for "Error" diagnostic virtual text - LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(58).da(60) }, -- Used for "Warning" diagnostic virtual text + LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(48).da(64) }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(58).da(64) }, -- Used for "Warning" diagnostic virtual text -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text From b8c5cfd00534f93d61b145bee54818036960bedf Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sun, 12 Sep 2021 12:07:54 +0800 Subject: [PATCH 07/53] separate highlight for Number and Boolean --- lua/zenbones/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 9a1a974..49659fb 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -117,8 +117,8 @@ local theme = lush(function() Constant { fg = c.stone.li(24), gui = "italic" }, -- (preferred) any constant -- String { }, -- 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 + Number { gui = "italic" }, -- a number constant: 234, 0xff + Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 Identifier { fg = c.stone.li(16) }, -- (preferred) any variable name From aba7fec9e0df44daefec4b07df5f5be0c0f47354 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sun, 12 Sep 2021 12:08:29 +0800 Subject: [PATCH 08/53] adjust colors saturation --- lua/zenflesh/init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 48b4acb..d93e4e4 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -2,14 +2,14 @@ local lush = require "lush" local hsluv = lush.hsluv local c = { - sand = hsluv(39, 8, 12), + sand = hsluv(39, 8, 10), -- stone = hsluv(230, 2, 80), - stone = hsluv(106, 6, 74), + stone = hsluv(230, 3, 74), leaf = hsluv(103, 68, 54), water = hsluv(236, 84, 53), - rose = hsluv(4, 55, 56), + rose = hsluv(4, 53, 56), wood = hsluv(26, 59, 54), - blossom = hsluv(318, 45, 58), + blossom = hsluv(318, 38, 56), sky = hsluv(204, 80, 58), } From 6fe184ee3f50b15f3a3b2214b31855d40c0aa5c4 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sun, 12 Sep 2021 14:19:33 +0800 Subject: [PATCH 09/53] rename colors -> palette --- README.md | 4 ++-- doc/zenbones.txt | 4 ++-- lua/zenbones/init.lua | 2 +- lua/zenbones/{colors.lua => palette.lua} | 4 +--- lua/zenbones/terminal.lua | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) rename lua/zenbones/{colors.lua => palette.lua} (89%) diff --git a/README.md b/README.md index 7a6fa1b..64c0fd7 100644 --- a/README.md +++ b/README.md @@ -92,10 +92,10 @@ in lua: ```lua local theme = require "zenbones" -local colors = require "zenbones.colors" +local palette = require "zenbones.palette" print(theme.StatusLine.bg.hex) -print(sand.darken(20).hex) +print(palette.sand.darken(20).hex) ``` See also diff --git a/doc/zenbones.txt b/doc/zenbones.txt index 865ef09..956be35 100644 --- a/doc/zenbones.txt +++ b/doc/zenbones.txt @@ -111,10 +111,10 @@ lua: > local theme = require "zenbones" - local colors = require "zenbones.colors" + local palette = require "zenbones.palette" print(theme.StatusLine.bg.hex) - print(sand.darken(20).hex) + print(palette.sand.darken(20).hex) < diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 49659fb..a597038 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -1,5 +1,5 @@ local lush = require "lush" -local c = require "zenbones.colors" +local c = require "zenbones.palette" local normal_bg = c.sand local diff_bg_li = 0 diff --git a/lua/zenbones/colors.lua b/lua/zenbones/palette.lua similarity index 89% rename from lua/zenbones/colors.lua rename to lua/zenbones/palette.lua index be040cd..b738e11 100644 --- a/lua/zenbones/colors.lua +++ b/lua/zenbones/palette.lua @@ -1,7 +1,7 @@ local lush = require "lush" local hsluv = lush.hsluv -local colors = { +return { sand = hsluv(39, 12, 94), stone = hsluv(230, 30, 22), leaf = hsluv(103, 72, 46), @@ -11,5 +11,3 @@ local colors = { blossom = hsluv(318, 42, 42), sky = hsluv(204, 80, 53), } - -return colors diff --git a/lua/zenbones/terminal.lua b/lua/zenbones/terminal.lua index f365abe..0252760 100644 --- a/lua/zenbones/terminal.lua +++ b/lua/zenbones/terminal.lua @@ -1,5 +1,5 @@ local lush = require "lush" -local c = require "zenbones.colors" +local c = require "zenbones.palette" local colors = { c.stone, From c9b3bdda54909c0a4506d7c96f82e16fdb4028f9 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sun, 12 Sep 2021 14:20:36 +0800 Subject: [PATCH 10/53] adjust palette saturation --- lua/zenflesh/init.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index d93e4e4..9a4bd06 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -3,14 +3,13 @@ local hsluv = lush.hsluv local c = { sand = hsluv(39, 8, 10), - -- stone = hsluv(230, 2, 80), - stone = hsluv(230, 3, 74), + stone = hsluv(230, 6, 75), leaf = hsluv(103, 68, 54), water = hsluv(236, 84, 53), - rose = hsluv(4, 53, 56), + rose = hsluv(4, 44, 53), wood = hsluv(26, 59, 54), blossom = hsluv(318, 38, 56), - sky = hsluv(204, 80, 58), + sky = hsluv(204, 74, 58), } local normal_bg = c.sand From 41303e6e0ea8a08b91f75f5b2e29f3a029d06ae7 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sun, 12 Sep 2021 14:21:19 +0800 Subject: [PATCH 11/53] adjust overall colors --- colors/zenbones.vim | 2 ++ lua/zenflesh/init.lua | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 8ff2985..73eabb5 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -102,6 +102,7 @@ highlight NeogitHunkHeaderHighlight guifg=#2C363C guibg=#E6E1DF guisp=NONE gui=b highlight NonText guifg=#C0B0A8 guibg=NONE guisp=NONE gui=NONE highlight Normal guifg=#2C363C guibg=#F0EDEC guisp=NONE gui=NONE highlight NormalFloat guifg=NONE guibg=#E1DCD9 guisp=NONE gui=NONE +highlight Number guifg=NONE guibg=NONE guisp=NONE gui=italic highlight Pmenu guifg=NONE guibg=#DAD3CF guisp=NONE gui=NONE highlight PmenuSbar guifg=NONE guibg=#B2A39B guisp=NONE gui=NONE highlight PmenuSel guifg=NONE guibg=#C4B6AF guisp=NONE gui=NONE @@ -139,6 +140,7 @@ highlight diffOldFile guifg=#A8334C guibg=NONE guisp=NONE gui=italic highlight diffRemoved guifg=#A8334C guibg=NONE guisp=NONE gui=NONE highlight lCursor guifg=#F2F0EF guibg=#4D5C65 guisp=NONE gui=NONE highlight markdownH1 guifg=#2C363C guibg=NONE guisp=NONE gui=bold,underline +highlight! link Boolean Number highlight! link BufferCurrent TabLineSel highlight! link CocCodeLens LineNr highlight! link CocErrorSign LspDiagnosticsDefaultError diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 9a4bd06..15c9d61 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -52,7 +52,7 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = c.wood }, -- warning messages - Comment { fg = c.sand.li(36).de(30), gui = "italic" }, -- any comment + Comment { fg = c.sand.li(34).de(46), gui = "italic" }, -- any comment Conceal { fg = c.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor { bg = c.stone.li(20), fg = c.sand.da(20) }, -- character under the cursor @@ -70,7 +70,7 @@ local theme = lush(function() DiffDelete { bg = c.rose.de(23).da(44).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| DiffText { bg = c.water.de(22).da(18).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| - LineNr { fg = Normal.bg.li(26) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + LineNr { fg = Normal.bg.li(28) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' Folded { bg = Normal.bg.li(16), fg = Normal.bg.li(64) }, -- line used for closed folds @@ -86,7 +86,7 @@ local theme = lush(function() Pmenu { bg = Normal.bg.li(10) }, -- Popup menu: normal item. PmenuSel { bg = Normal.bg.li(20) }, -- Popup menu: selected item. PmenuSbar { bg = Normal.bg.li(28) }, -- Popup menu: scrollbar. - PmenuThumb { bg = Normal.bg.li(58) }, -- Popup menu: Thumb of the scrollbar. + PmenuThumb { bg = Normal.bg.li(52) }, -- Popup menu: Thumb of the scrollbar. Search { bg = c.blossom.de(10).da(30), fg = c.sand }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. IncSearch { bg = c.blossom, fg = c.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" @@ -126,14 +126,14 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.da(32), gui = "italic" }, -- (preferred) any constant + Constant { fg = c.stone.da(30), gui = "italic" }, -- (preferred) any constant -- String { }, -- 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 + Number { gui = "italic" }, -- a number constant: 234, 0xff + Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 - Identifier { fg = c.stone.da(20) }, -- (preferred) any variable name + Identifier { fg = c.stone.sa(8).da(16) }, -- (preferred) any variable name Function { fg = c.stone }, -- function name (also: methods for classes) Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement @@ -150,15 +150,15 @@ local theme = lush(function() -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - Type { fg = c.sand.li(68) }, -- (preferred) int, long, char, etc. + Type { fg = c.sand.de(24).li(54) }, -- (preferred) int, long, char, etc. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = c.stone.da(20), gui = "bold" }, -- (preferred) any special symbol + Special { fg = c.stone.da(18), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = c.sand.sa(12).li(42) }, -- character that needs attention + Delimiter { fg = c.sand.de(24).li(42) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements From 2acf63de780756dc264eac2badbf04b8ca7dae5b Mon Sep 17 00:00:00 2001 From: mcchrish Date: Sun, 12 Sep 2021 06:41:36 +0000 Subject: [PATCH 12/53] auto generate docs --- doc/zenbones.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/zenbones.txt b/doc/zenbones.txt index 956be35..48284ca 100644 --- a/doc/zenbones.txt +++ b/doc/zenbones.txt @@ -1,4 +1,4 @@ -*zenbones.txt* For NVIM v0.4.3 Last change: 2021 September 10 +*zenbones.txt* For NVIM v0.4.3 Last change: 2021 September 12 ============================================================================== Table of Contents *zenbones-table-of-contents* @@ -58,7 +58,7 @@ Just apply the colorscheme as usual: If you want to make use of the lua version: > - " has('nvim') only + " Requires `neovim` and `rktjmp/lush.nvim` installed colorscheme zenbones-lush < @@ -105,9 +105,8 @@ g:zenbones_dim_noncurrent_window Set to `v:true` to make non-current ADVANCED USAGE *zenbones-advanced-usage* -Zenbones is pretty extensible thanks to Lush -. You can easily retrieve the colors in -lua: +Zenbones is pretty extensible thanks to Lush. You can easily retrieve the +colors in lua: > local theme = require "zenbones" @@ -119,7 +118,7 @@ lua: See also Lush’s documentation - for the complete options. + for more options. OTHER PLUGINS SUPPORT *zenbones-other-plugins-support* From cb8d9aec5ce67da80a44e3c94e959feb9ba8ab4c Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sun, 12 Sep 2021 14:41:43 +0800 Subject: [PATCH 13/53] don't run docs in PR --- .github/workflows/doc.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index a8780c3..fb3e4fc 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -7,8 +7,6 @@ on: # Triggers the workflow on push or pull request events but only for the main branch push: branches: [ main ] - pull_request: - branches: [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From c343c2778d444cca30fdcf3c91b44eb2593b69d3 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sun, 12 Sep 2021 19:16:45 +0800 Subject: [PATCH 14/53] looking good --- lua/zenflesh/init.lua | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 15c9d61..aed0277 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -3,12 +3,12 @@ local hsluv = lush.hsluv local c = { sand = hsluv(39, 8, 10), - stone = hsluv(230, 6, 75), - leaf = hsluv(103, 68, 54), - water = hsluv(236, 84, 53), - rose = hsluv(4, 44, 53), - wood = hsluv(26, 59, 54), - blossom = hsluv(318, 38, 56), + stone = hsluv(230, 4, 75), + leaf = hsluv(103, 63, 54), + water = hsluv(236, 78, 53), + rose = hsluv(4, 38, 53), + wood = hsluv(26, 56, 54), + blossom = hsluv(318, 32, 56), sky = hsluv(204, 74, 58), } @@ -52,7 +52,7 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = c.wood }, -- warning messages - Comment { fg = c.sand.li(34).de(46), gui = "italic" }, -- any comment + Comment { fg = c.sand.li(34).de(42), gui = "italic" }, -- any comment Conceal { fg = c.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor { bg = c.stone.li(20), fg = c.sand.da(20) }, -- character under the cursor @@ -63,12 +63,12 @@ local theme = lush(function() CursorLine { bg = Normal.bg.li(4) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - ColorColumn { bg = c.wood.de(38).da(28) }, -- used for the columns set with 'colorcolumn' + ColorColumn { bg = c.wood.de(40).da(28) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(14).da(38).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(18).da(41).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(23).da(44).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(22).da(18).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = c.leaf.de(10).da(38).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.water.de(14).da(41).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = c.rose.de(19).da(44).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = c.water.de(20).da(18).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.li(28) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed @@ -88,7 +88,7 @@ local theme = lush(function() PmenuSbar { bg = Normal.bg.li(28) }, -- Popup menu: scrollbar. PmenuThumb { bg = Normal.bg.li(52) }, -- Popup menu: Thumb of the scrollbar. - Search { bg = c.blossom.de(10).da(30), fg = c.sand }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + Search { bg = c.blossom.de(10).da(28), fg = c.sand }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. IncSearch { bg = c.blossom, fg = c.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" -- Substitute { }, -- |:substitute| replacement text highlighting MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| @@ -126,14 +126,14 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.da(30), gui = "italic" }, -- (preferred) any constant + Constant { fg = c.stone.da(24), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' Number { gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 - Identifier { fg = c.stone.sa(8).da(16) }, -- (preferred) any variable name + Identifier { fg = c.stone.sa(8).da(14) }, -- (preferred) any variable name Function { fg = c.stone }, -- function name (also: methods for classes) Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement @@ -150,7 +150,7 @@ local theme = lush(function() -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - Type { fg = c.sand.de(24).li(54) }, -- (preferred) int, long, char, etc. + Type { fg = c.sand.de(24).li(58) }, -- (preferred) int, long, char, etc. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef From 2e7cbd4dc886639459d9dabee2eb789734607a7f Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 16:01:40 +0800 Subject: [PATCH 15/53] adjust zenbones_lightness --- lua/zenbones/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index a597038..c9e0513 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -6,10 +6,10 @@ local diff_bg_li = 0 local lightness = vim.g.zenbones_lightness if lightness == "bright" then - normal_bg = normal_bg.abs_da(-4) + normal_bg = normal_bg.abs_li(3) diff_bg_li = -4 elseif lightness == "dim" then - normal_bg = normal_bg.abs_da(4).de(18) + normal_bg = normal_bg.abs_da(3).de(16) diff_bg_li = 4 elseif lightness ~= nil then local error_msg = "Unknown zenbones_lightness value: " .. vim.inspect(lightness) From a00dc5836322e382f1604621c933bb8c215ae76f Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 16:02:16 +0800 Subject: [PATCH 16/53] bring back more saturation into colors --- lua/zenflesh/init.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index aed0277..91961f4 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -3,13 +3,13 @@ local hsluv = lush.hsluv local c = { sand = hsluv(39, 8, 10), - stone = hsluv(230, 4, 75), - leaf = hsluv(103, 63, 54), - water = hsluv(236, 78, 53), - rose = hsluv(4, 38, 53), - wood = hsluv(26, 56, 54), - blossom = hsluv(318, 32, 56), - sky = hsluv(204, 74, 58), + stone = hsluv(230, 7, 75), + leaf = hsluv(103, 65, 54), + water = hsluv(236, 80, 53), + rose = hsluv(4, 40, 53), + wood = hsluv(26, 58, 54), + blossom = hsluv(318, 34, 56), + sky = hsluv(204, 76, 58), } local normal_bg = c.sand From 73170c5ecfa903b013c78f10b05f369013c425f1 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 16:03:27 +0800 Subject: [PATCH 17/53] configure zenflesh_darkness --- lua/zenflesh/init.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 91961f4..6c4b8d2 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -13,17 +13,17 @@ local c = { } local normal_bg = c.sand -local diff_bg_li = 0 +local diff_bg_l = 0 -local lightness = vim.g.zenbones_lightness -if lightness == "bright" then - normal_bg = normal_bg.abs_da(-4) - diff_bg_li = -4 -elseif lightness == "dim" then - normal_bg = normal_bg.abs_da(4).de(18) - diff_bg_li = 4 -elseif lightness ~= nil then - local error_msg = "Unknown zenbones_lightness value: " .. vim.inspect(lightness) +local darkness = vim.g.zenflesh_darkness +if darkness == "stark" then + normal_bg = normal_bg.abs_da(3) + diff_bg_l = -3 +elseif darkness == "warm" then + normal_bg = normal_bg.abs_li(3) + diff_bg_l = 3 +elseif darkness ~= nil then + local error_msg = "Unknown zenflesh_darkness value: " .. vim.inspect(darkness) vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) end From b008770af988a3fe6fd60699b5057b63dfff15da Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 16:04:19 +0800 Subject: [PATCH 18/53] configure zenflesh_lighten_noncurrent_window --- lua/zenbones/init.lua | 14 +++++++------- lua/zenflesh/init.lua | 29 +++++++++-------------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index c9e0513..6295312 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -2,15 +2,15 @@ local lush = require "lush" local c = require "zenbones.palette" local normal_bg = c.sand -local diff_bg_li = 0 +local diff_bg_l = 0 local lightness = vim.g.zenbones_lightness if lightness == "bright" then normal_bg = normal_bg.abs_li(3) - diff_bg_li = -4 + diff_bg_l = -4 elseif lightness == "dim" then normal_bg = normal_bg.abs_da(3).de(16) - diff_bg_li = 4 + diff_bg_l = 4 elseif lightness ~= nil then local error_msg = "Unknown zenbones_lightness value: " .. vim.inspect(lightness) vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) @@ -53,10 +53,10 @@ local theme = lush(function() CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. ColorColumn { bg = c.wood.de(38).li(80) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(77).li(82).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(22).li(76).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(37).li(74).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(24).li(64).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = c.leaf.de(77).li(82).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.water.de(22).li(76).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = c.rose.de(37).li(74).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = c.water.de(24).li(64).abs_da(diff_bg_l), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.da(32) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 6c4b8d2..a579690 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -52,7 +52,7 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = c.wood }, -- warning messages - Comment { fg = c.sand.li(34).de(42), gui = "italic" }, -- any comment + Comment { fg = c.sand.li(34).de(52), gui = "italic" }, -- any comment Conceal { fg = c.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor { bg = c.stone.li(20), fg = c.sand.da(20) }, -- character under the cursor @@ -65,10 +65,10 @@ local theme = lush(function() CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. ColorColumn { bg = c.wood.de(40).da(28) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(10).da(38).abs_da(diff_bg_li) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(14).da(41).abs_da(diff_bg_li) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(19).da(44).abs_da(diff_bg_li) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(20).da(18).abs_da(diff_bg_li), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = c.leaf.de(10).da(38).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.water.de(14).da(41).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = c.rose.de(19).da(44).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = c.water.de(20).da(18).abs_da(diff_bg_l), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.li(28) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed @@ -104,9 +104,9 @@ local theme = lush(function() TabLine { StatusLine, gui = "italic" }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label - VertSplit { fg = PmenuThumb.bg }, -- the column separating vertically split windows + VertSplit { fg = PmenuSbar.bg }, -- the column separating vertically split windows - Visual { bg = c.stone.da(68) }, -- Visual mode selection + Visual { bg = c.stone.sa(24).da(68) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". NonText { fg = Normal.bg.li(22) }, -- '@' 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|. @@ -370,23 +370,12 @@ local specs = { theme, } -if vim.g.zenbones_dim_noncurrent_window then +if vim.g.zenflesh_lighten_noncurrent_window then table.insert( specs, lush(function() return { - NormalNC { theme.Normal, bg = theme.Normal.bg.abs_da(2) }, -- normal text in non-current windows - } - end) - ) -end - -if vim.g.zenbones_solid_vert_split then - table.insert( - specs, - lush(function() - return { - VertSplit { bg = theme.StatusLineNC.bg, fg = theme.LineNr.fg }, -- the column separating vertically split windows + NormalNC { theme.Normal, bg = theme.Normal.bg.abs_li(2) }, -- normal text in non-current windows } end) ) From b9caa4189f33c9aea44777ef6cd915b3c7a043ae Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 16:09:16 +0800 Subject: [PATCH 19/53] adjust overall zenflesh colors --- lua/zenflesh/init.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index a579690..6583afd 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -126,14 +126,14 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.da(24), gui = "italic" }, -- (preferred) any constant + Constant { fg = c.stone.da(29), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' Number { gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 - Identifier { fg = c.stone.sa(8).da(14) }, -- (preferred) any variable name + Identifier { fg = c.stone.da(16) }, -- (preferred) any variable name Function { fg = c.stone }, -- function name (also: methods for classes) Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement @@ -158,7 +158,7 @@ local theme = lush(function() Special { fg = c.stone.da(18), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = c.sand.de(24).li(42) }, -- character that needs attention + Delimiter { fg = c.sand.de(18).li(42) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements From e0ce4a3068cba9a46f801af61d3df23e5827e949 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 16:31:09 +0800 Subject: [PATCH 20/53] separate file for palette and terminal --- colors/zenflesh-lush.lua | 2 +- lua/zenflesh/init.lua | 25 +++++++------------------ lua/zenflesh/palette.lua | 13 +++++++++++++ lua/zenflesh/terminal.lua | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 lua/zenflesh/palette.lua create mode 100644 lua/zenflesh/terminal.lua diff --git a/colors/zenflesh-lush.lua b/colors/zenflesh-lush.lua index 0064e9b..d028b31 100644 --- a/colors/zenflesh-lush.lua +++ b/colors/zenflesh-lush.lua @@ -1,7 +1,7 @@ vim.opt.background = "light" vim.g.colors_name = "zenflesh-lush" -require("zenbones.terminal").setup() +require("zenflesh.terminal").setup() -- By setting our module to nil, we clear lua's cache, -- which means the require ahead will *always* occur. diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 6583afd..2a4b469 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -1,16 +1,5 @@ local lush = require "lush" -local hsluv = lush.hsluv - -local c = { - sand = hsluv(39, 8, 10), - stone = hsluv(230, 7, 75), - leaf = hsluv(103, 65, 54), - water = hsluv(236, 80, 53), - rose = hsluv(4, 40, 53), - wood = hsluv(26, 58, 54), - blossom = hsluv(318, 34, 56), - sky = hsluv(204, 76, 58), -} +local c = require "zenflesh.palette" local normal_bg = c.sand local diff_bg_l = 0 @@ -20,7 +9,7 @@ if darkness == "stark" then normal_bg = normal_bg.abs_da(3) diff_bg_l = -3 elseif darkness == "warm" then - normal_bg = normal_bg.abs_li(3) + normal_bg = normal_bg.abs_li(3).de(16) diff_bg_l = 3 elseif darkness ~= nil then local error_msg = "Unknown zenflesh_darkness value: " .. vim.inspect(darkness) @@ -56,7 +45,7 @@ local theme = lush(function() Conceal { fg = c.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor { bg = c.stone.li(20), fg = c.sand.da(20) }, -- character under the cursor - lCursor { Cursor, bg = Cursor.bg.da(20) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + lCursor { Cursor, bg = Cursor.bg.da(35) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| TermCursor { Cursor }, -- cursor in a focused terminal TermCursorNC { lCursor }, -- cursor in an unfocused terminal @@ -65,10 +54,10 @@ local theme = lush(function() CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. ColorColumn { bg = c.wood.de(40).da(28) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(10).da(38).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(14).da(41).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(19).da(44).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(20).da(18).abs_da(diff_bg_l), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = c.leaf.de(18).da(38).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.water.de(22).da(41).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = c.rose.de(27).da(44).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = c.water.de(28).da(18).abs_da(diff_bg_l), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.li(28) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed diff --git a/lua/zenflesh/palette.lua b/lua/zenflesh/palette.lua new file mode 100644 index 0000000..936072d --- /dev/null +++ b/lua/zenflesh/palette.lua @@ -0,0 +1,13 @@ +local lush = require "lush" +local hsluv = lush.hsluv + +return { + sand = hsluv(39, 10, 10), + stone = hsluv(230, 7, 75), + leaf = hsluv(103, 65, 54), + water = hsluv(236, 80, 53), + rose = hsluv(4, 40, 53), + wood = hsluv(26, 58, 54), + blossom = hsluv(318, 34, 56), + sky = hsluv(204, 76, 58), +} diff --git a/lua/zenflesh/terminal.lua b/lua/zenflesh/terminal.lua new file mode 100644 index 0000000..40eb469 --- /dev/null +++ b/lua/zenflesh/terminal.lua @@ -0,0 +1,33 @@ +local lush = require "lush" +local c = require "zenflesh.palette" + +local colors = { + c.stone, + c.rose, + c.leaf, + c.wood, + c.water, + c.blossom, + c.sky, + c.sand, + c.stone.da(16), + c.rose.sa(20).li(10), + c.leaf.sa(20).li(10), + c.wood.sa(18).li(10), + c.water.sa(20).li(10), + c.blossom.sa(24).li(10), + c.sky.sa(20).li(10), + c.sand.sa(4).li(10), +} + +local M = {} + +M.colors = colors + +function M.setup() + for i, v in ipairs(colors) do + vim.g["terminal_color_" .. (i - 1)] = v.hex + end +end + +return M From b80984f8588b942c6b8b8ac4ca4bdc2084d119f8 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 16:38:23 +0800 Subject: [PATCH 21/53] slightly adjust contrasts --- lua/zenflesh/init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 2a4b469..bd172bb 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -41,7 +41,7 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = c.wood }, -- warning messages - Comment { fg = c.sand.li(34).de(52), gui = "italic" }, -- any comment + Comment { fg = c.sand.li(32).de(48), gui = "italic" }, -- any comment Conceal { fg = c.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor { bg = c.stone.li(20), fg = c.sand.da(20) }, -- character under the cursor @@ -62,7 +62,7 @@ local theme = lush(function() LineNr { fg = Normal.bg.li(28) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' - Folded { bg = Normal.bg.li(16), fg = Normal.bg.li(64) }, -- line used for closed folds + Folded { bg = Normal.bg.li(14), fg = Normal.bg.li(64) }, -- line used for closed folds CursorLineNr { LineNr, fg = c.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") @@ -73,9 +73,9 @@ local theme = lush(function() FloatBorder { fg = Normal.bg.li(50) }, -- Normal text in floating windows. Pmenu { bg = Normal.bg.li(10) }, -- Popup menu: normal item. - PmenuSel { bg = Normal.bg.li(20) }, -- Popup menu: selected item. - PmenuSbar { bg = Normal.bg.li(28) }, -- Popup menu: scrollbar. - PmenuThumb { bg = Normal.bg.li(52) }, -- Popup menu: Thumb of the scrollbar. + PmenuSel { bg = Normal.bg.li(16) }, -- Popup menu: selected item. + PmenuSbar { bg = Normal.bg.li(24) }, -- Popup menu: scrollbar. + PmenuThumb { bg = Normal.bg.li(48) }, -- Popup menu: Thumb of the scrollbar. Search { bg = c.blossom.de(10).da(28), fg = c.sand }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. IncSearch { bg = c.blossom, fg = c.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" @@ -115,7 +115,7 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.da(29), gui = "italic" }, -- (preferred) any constant + Constant { fg = c.stone.da(27), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' Number { gui = "italic" }, -- a number constant: 234, 0xff From 0ebfc713ab4713106bf2b43913970377077831ad Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 16:43:50 +0800 Subject: [PATCH 22/53] fine-tune Constant and Identifier contrast --- lua/zenbones/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 6295312..7a836ea 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -114,14 +114,14 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.li(24), gui = "italic" }, -- (preferred) any constant + Constant { fg = c.stone.li(25), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' Number { gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 - Identifier { fg = c.stone.li(16) }, -- (preferred) any variable name + Identifier { fg = c.stone.li(15) }, -- (preferred) any variable name Function { fg = c.stone }, -- function name (also: methods for classes) Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement From 9ddeeff8df85af599faa81040eca5389b135d807 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 17:01:50 +0800 Subject: [PATCH 23/53] adjust saturation again --- lua/zenflesh/palette.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/zenflesh/palette.lua b/lua/zenflesh/palette.lua index 936072d..6fb709c 100644 --- a/lua/zenflesh/palette.lua +++ b/lua/zenflesh/palette.lua @@ -4,10 +4,10 @@ local hsluv = lush.hsluv return { sand = hsluv(39, 10, 10), stone = hsluv(230, 7, 75), - leaf = hsluv(103, 65, 54), - water = hsluv(236, 80, 53), - rose = hsluv(4, 40, 53), - wood = hsluv(26, 58, 54), - blossom = hsluv(318, 34, 56), - sky = hsluv(204, 76, 58), + leaf = hsluv(103, 63, 54), + water = hsluv(236, 78, 53), + rose = hsluv(4, 38, 53), + wood = hsluv(26, 56, 54), + blossom = hsluv(318, 32, 56), + sky = hsluv(204, 71, 58), } From fc60dd4e2e0cbf077b726001cdd93b24d2f56e94 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 18:10:43 +0800 Subject: [PATCH 24/53] adjust lightness saturation --- lua/zenbones/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 7a836ea..1392c23 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -6,10 +6,10 @@ local diff_bg_l = 0 local lightness = vim.g.zenbones_lightness if lightness == "bright" then - normal_bg = normal_bg.abs_li(3) + normal_bg = normal_bg.abs_li(3).sa(6) diff_bg_l = -4 elseif lightness == "dim" then - normal_bg = normal_bg.abs_da(3).de(16) + normal_bg = normal_bg.abs_da(3).de(12) diff_bg_l = 4 elseif lightness ~= nil then local error_msg = "Unknown zenbones_lightness value: " .. vim.inspect(lightness) From 0fcc7a94dc0d02a6a0acc7f7dc7ae2db6cbb0d95 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 18:13:50 +0800 Subject: [PATCH 25/53] adjust sand/stone saturation/contrast --- lua/zenflesh/init.lua | 14 +++++++------- lua/zenflesh/palette.lua | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index bd172bb..9d5ee2c 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -6,7 +6,7 @@ local diff_bg_l = 0 local darkness = vim.g.zenflesh_darkness if darkness == "stark" then - normal_bg = normal_bg.abs_da(3) + normal_bg = normal_bg.abs_da(3).sa(8) diff_bg_l = -3 elseif darkness == "warm" then normal_bg = normal_bg.abs_li(3).de(16) @@ -54,10 +54,10 @@ local theme = lush(function() CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. ColorColumn { bg = c.wood.de(40).da(28) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(18).da(38).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(22).da(41).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(27).da(44).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(28).da(18).abs_da(diff_bg_l), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = c.leaf.de(14).da(52).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = c.water.de(20).da(45).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = c.rose.de(26).da(47).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = c.water.de(22).da(28).abs_da(diff_bg_l), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.li(28) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed @@ -169,8 +169,8 @@ local theme = lush(function() LspDiagnosticsDefaultInformation { fg = c.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultHint { fg = c.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(48).da(64) }, -- Used for "Error" diagnostic virtual text - LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(58).da(64) }, -- Used for "Warning" diagnostic virtual text + LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(48).da(68) }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(58).da(68) }, -- Used for "Warning" diagnostic virtual text -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text diff --git a/lua/zenflesh/palette.lua b/lua/zenflesh/palette.lua index 6fb709c..61408b9 100644 --- a/lua/zenflesh/palette.lua +++ b/lua/zenflesh/palette.lua @@ -2,8 +2,8 @@ local lush = require "lush" local hsluv = lush.hsluv return { - sand = hsluv(39, 10, 10), - stone = hsluv(230, 7, 75), + sand = hsluv(39, 12, 8), + stone = hsluv(230, 8, 76), leaf = hsluv(103, 63, 54), water = hsluv(236, 78, 53), rose = hsluv(4, 38, 53), From 3b7c4d50725d9b3df1fee0a3075dcf4e264bd3e1 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 18:38:02 +0800 Subject: [PATCH 26/53] more visible VertSplit --- lua/zenbones/init.lua | 2 +- lua/zenflesh/init.lua | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 1392c23..cfffd1d 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -92,7 +92,7 @@ local theme = lush(function() TabLine { StatusLine, gui = "italic" }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label - VertSplit { fg = PmenuThumb.bg }, -- the column separating vertically split windows + VertSplit { LineNr }, -- the column separating vertically split windows Visual { bg = c.stone.li(84) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 9d5ee2c..440cc04 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -93,7 +93,7 @@ local theme = lush(function() TabLine { StatusLine, gui = "italic" }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label - VertSplit { fg = PmenuSbar.bg }, -- the column separating vertically split windows + VertSplit { LineNr }, -- the column separating vertically split windows Visual { bg = c.stone.sa(24).da(68) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". @@ -370,6 +370,17 @@ if vim.g.zenflesh_lighten_noncurrent_window then ) end +if vim.g.zenflesh_solid_vert_split then + table.insert( + specs, + lush(function() + return { + VertSplit { bg = theme.StatusLineNC.bg, fg = theme.LineNr.fg }, -- the column separating vertically split windows + } + end) + ) +end + return lush.merge(specs) -- vi:nowrap From b5d0803c5356138b10486e54df520420c86aa52c Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 13 Sep 2021 18:41:32 +0800 Subject: [PATCH 27/53] remove print function --- README.md | 37 ------------------------------------- lua/zenbones/print.lua | 33 --------------------------------- 2 files changed, 70 deletions(-) delete mode 100644 lua/zenbones/print.lua diff --git a/README.md b/README.md index 64c0fd7..2871bf2 100644 --- a/README.md +++ b/README.md @@ -130,43 +130,6 @@ currently supported. - [WezTerm](extras/wezterm/Zenbones.toml) - [Tmux](extras/tmux/zenbones.tmux) -### Print terminal colors - -You can retrieve the terminal colors by using this command: - -```vim -:lua require("zenbones.print").print_terminal_colors() -``` - -Useful when you want to apply a zenbones theme to your terminal. Recent output: - -``` -Terminal colors -foreground: #2C363C -background: #F0EDEC -ansi color0: #2C363C -ansi color1: #A8334C -ansi color2: #617437 -ansi color3: #944927 -ansi color4: #286486 -ansi color5: #88507D -ansi color6: #3B8992 -ansi color7: #F0EDEC -ansi color8: #44525B -ansi color9: #9C2842 -ansi color10: #55672A -ansi color11: #87411E -ansi color12: #1F5A7A -ansi color13: #864079 -ansi color14: #2F7C85 -ansi color15: #DCD2CE -cursor foreground: #F2F0EF -cursor background: #2C363C -inactive cursor foreground: #F2F0EF -inactive cursor background: #4D5C65 -selection background: #D2DFE7 -``` - It's also possible to generate color configuration files using a template, [this one for Kitty](lua/zenbones/build/kitty.lua) for example. Please feel free to submit a PR if you want to add some more. diff --git a/lua/zenbones/print.lua b/lua/zenbones/print.lua deleted file mode 100644 index 8b090b7..0000000 --- a/lua/zenbones/print.lua +++ /dev/null @@ -1,33 +0,0 @@ -local t = require "zenbones" -local terminal = require "zenbones.terminal" - -local M = {} - -function M.print_terminal_colors() - local lines = {} - - table.insert(lines, "Terminal colors") - table.insert(lines, "foreground: " .. t.Normal.fg.hex) - table.insert(lines, "background: " .. t.Normal.bg.hex) - - for i, v in ipairs(terminal.colors) do - table.insert(lines, "ansi color" .. (i - 1) .. ": " .. v.hex) - -- table.insert(lines, "let g:terminal_color_" .. (i - 1) .. " = '" .. v.hex .. "'") - end - - table.insert(lines, "cursor foreground: " .. t.Cursor.fg.hex) - table.insert(lines, "cursor background: " .. t.Cursor.bg.hex) - - table.insert(lines, "inactive cursor foreground: " .. t.lCursor.fg.hex) - table.insert(lines, "inactive cursor background: " .. t.lCursor.bg.hex) - table.insert(lines, "selection background: " .. t.Visual.bg.hex) - - local buf = vim.api.nvim_create_buf(false, true) - vim.api.nvim_buf_set_lines(buf, 0, -1, false, lines) - - vim.cmd('tabnew') - local win = vim.api.nvim_get_current_win() - vim.api.nvim_win_set_buf(win, buf) -end - -return M From 87bd1e39fa11eddfbd3a511a783b141748e34449 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 05:53:51 +0800 Subject: [PATCH 28/53] modify build script for zenflesh --- lua/zenbones/build.lua | 6 ++-- lua/zenbones/build/alacritty.lua | 25 +++++++------- lua/zenbones/build/kitty.lua | 47 ++++++++++++++------------- lua/zenbones/build/lightline.lua | 56 +++++++++++++++++--------------- lua/zenbones/build/lualine.lua | 38 ++++++++++++---------- lua/zenbones/build/tmux.lua | 20 +++++++----- lua/zenbones/build/vim.lua | 39 ++++++++++++---------- lua/zenbones/build/wezterm.lua | 37 ++++++++++++--------- 8 files changed, 143 insertions(+), 125 deletions(-) diff --git a/lua/zenbones/build.lua b/lua/zenbones/build.lua index 825bdfd..749390d 100644 --- a/lua/zenbones/build.lua +++ b/lua/zenbones/build.lua @@ -1,6 +1,3 @@ -local theme = require "zenbones" -local terminal = require "zenbones.terminal" - -- got from http://lua-users.org/wiki/StringInterpolation function interp(s, tab) return (s:gsub("($%b{})", function(w) @@ -19,7 +16,8 @@ end local function build() local templates = { "vim", "kitty", "alacritty", "wezterm", "lualine", "lightline", "tmux" } for _, t in ipairs(templates) do - write_template(unpack(require("zenbones.build." .. t))) + write_template(unpack(require("zenbones.build." .. t) "zenbones")) + write_template(unpack(require("zenbones.build." .. t) "zenflesh")) end end diff --git a/lua/zenbones/build/alacritty.lua b/lua/zenbones/build/alacritty.lua index 1a0d92f..3037bc5 100644 --- a/lua/zenbones/build/alacritty.lua +++ b/lua/zenbones/build/alacritty.lua @@ -1,4 +1,4 @@ -local template = [[# Zenbones Alacritty Colors +local template = [[# ${name} alacritty colors colors: # Default colors primary: @@ -26,15 +26,18 @@ colors: white: '${color15}' ]] -local theme = require "zenbones" -local terminal = require "zenbones.terminal" +return function(name) + local theme = require(name) + local terminal = require(name .. ".terminal") -local values = { - bg = theme.Normal.bg.hex, - fg = theme.Normal.fg.hex, -} -for i, v in ipairs(terminal.colors) do - values["color" .. (i - 1)] = v.hex + local values = { + name = name, + bg = theme.Normal.bg.hex, + fg = theme.Normal.fg.hex, + } + for i, v in ipairs(terminal.colors) do + values["color" .. (i - 1)] = v.hex + end + + return { string.format("extras/alacritty/%s.yml", name), template, values } end - -return { "extras/alacritty/zenbones.yml", template, values } diff --git a/lua/zenbones/build/kitty.lua b/lua/zenbones/build/kitty.lua index b7da423..6e31674 100644 --- a/lua/zenbones/build/kitty.lua +++ b/lua/zenbones/build/kitty.lua @@ -1,8 +1,8 @@ local template = [[# vim:ft=kitty -## name: zenbones +## name: ${name} ## license: MIT ## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenbones.conf +## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/${name}.conf background ${background} foreground ${foreground} @@ -39,25 +39,28 @@ color14 ${color14} color15 ${color15} ]] -local theme = require "zenbones" -local terminal = require "zenbones.terminal" +return function(name) + local theme = require(name) + local terminal = require(name .. ".terminal") -local bg = theme.Normal.bg.hex -local fg = theme.Normal.fg.hex -local values = { - background = bg, - foreground = fg, - selection_background = theme.Visual.bg.hex, - selection_foreground = fg, - url_color = terminal.colors[14].hex, - cursor = fg, - active_tab_background = theme.Search.bg.hex, - active_tab_foreground = fg, - inactive_tab_background = theme.StatusLine.bg.hex, - inactive_tab_foreground = fg, -} -for i, v in ipairs(terminal.colors) do - values["color" .. (i - 1)] = v.hex + local bg = theme.Normal.bg.hex + local fg = theme.Normal.fg.hex + local values = { + name = name, + background = bg, + foreground = fg, + selection_background = theme.Visual.bg.hex, + selection_foreground = fg, + url_color = terminal.colors[14].hex, + cursor = fg, + active_tab_background = theme.Search.bg.hex, + active_tab_foreground = fg, + inactive_tab_background = theme.StatusLine.bg.hex, + inactive_tab_foreground = fg, + } + for i, v in ipairs(terminal.colors) do + values["color" .. (i - 1)] = v.hex + end + + return { string.format("extras/kitty/%s.conf", name), template, values } end - -return { "extras/kitty/zenbones.conf", template, values } diff --git a/lua/zenbones/build/lightline.lua b/lua/zenbones/build/lightline.lua index 89a0d84..f820515 100644 --- a/lua/zenbones/build/lightline.lua +++ b/lua/zenbones/build/lightline.lua @@ -22,31 +22,33 @@ let s:p.tabline.tabsel = [ [ "${tabsel_fg}", "${tabsel_bg}", "bold" ] ] let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p) ]] -local theme = require "zenbones" +return function(name) + local theme = require(name) -return { - "autoload/lightline/colorscheme/zenbones.vim", - template, - { - common_fg = theme.Folded.fg.hex, - inactive_bg = theme.StatusLineNC.bg.hex, - inactive_fg = theme.StatusLineNC.fg.hex, - normal_a_bg = theme.PmenuSbar.bg.hex, - normal_b_bg = theme.PmenuSel.bg.hex, - normal_c_bg = theme.StatusLine.bg.hex, - normal_c_fg = theme.StatusLine.fg.hex, - insert_a_bg = theme.DiffAdd.bg.hex, - visual_a_bg = theme.Visual.bg.hex, - replace_a_bg = theme.DiffDelete.bg.hex, - tabline_left_bg = theme.PmenuSel.bg.hex, - tabline_left_fg = theme.Normal.fg.hex, - tabline_right_bg = theme.PmenuSel.bg.hex, - tabline_right_fg = theme.Normal.fg.hex, - tabsel_bg = theme.Normal.bg.hex, - tabsel_fg = theme.Normal.fg.hex, - warning_bg = theme.LspDiagnosticsVirtualTextWarning.bg.hex, - warning_fg = theme.LspDiagnosticsVirtualTextWarning.fg.hex, - error_bg = theme.LspDiagnosticsVirtualTextError.bg.hex, - error_fg = theme.LspDiagnosticsVirtualTextError.fg.hex, - }, -} + return { + string.format("autoload/lightline/colorscheme/%s.vim", name), + template, + { + common_fg = theme.Folded.fg.hex, + inactive_bg = theme.StatusLineNC.bg.hex, + inactive_fg = theme.StatusLineNC.fg.hex, + normal_a_bg = theme.PmenuSbar.bg.hex, + normal_b_bg = theme.PmenuSel.bg.hex, + normal_c_bg = theme.StatusLine.bg.hex, + normal_c_fg = theme.StatusLine.fg.hex, + insert_a_bg = theme.DiffAdd.bg.hex, + visual_a_bg = theme.Visual.bg.hex, + replace_a_bg = theme.DiffDelete.bg.hex, + tabline_left_bg = theme.PmenuSel.bg.hex, + tabline_left_fg = theme.Normal.fg.hex, + tabline_right_bg = theme.PmenuSel.bg.hex, + tabline_right_fg = theme.Normal.fg.hex, + tabsel_bg = theme.Normal.bg.hex, + tabsel_fg = theme.Normal.fg.hex, + warning_bg = theme.LspDiagnosticsVirtualTextWarning.bg.hex, + warning_fg = theme.LspDiagnosticsVirtualTextWarning.fg.hex, + error_bg = theme.LspDiagnosticsVirtualTextError.bg.hex, + error_fg = theme.LspDiagnosticsVirtualTextError.fg.hex, + }, + } +end diff --git a/lua/zenbones/build/lualine.lua b/lua/zenbones/build/lualine.lua index 8e2aa7f..7d20559 100644 --- a/lua/zenbones/build/lualine.lua +++ b/lua/zenbones/build/lualine.lua @@ -33,22 +33,24 @@ return { } ]] -local theme = require "zenbones" +return function(name) + local theme = require(name) -return { - "lua/lualine/themes/zenbones.lua", - template, - { - common_fg = theme.Folded.fg.hex, - inactive_bg = theme.StatusLineNC.bg.hex, - inactive_fg = theme.StatusLineNC.fg.hex, - normal_a_bg = theme.PmenuSbar.bg.hex, - normal_b_bg = theme.PmenuSel.bg.hex, - normal_c_bg = theme.StatusLine.bg.hex, - normal_c_fg = theme.StatusLine.fg.hex, - insert_a_bg = theme.DiffAdd.bg.hex, - command_a_bg = theme.Search.bg.hex, - visual_a_bg = theme.Visual.bg.hex, - replace_a_bg = theme.DiffDelete.bg.hex, - }, -} + return { + string.format("lua/lualine/themes/%s.lua", name), + template, + { + common_fg = theme.Folded.fg.hex, + inactive_bg = theme.StatusLineNC.bg.hex, + inactive_fg = theme.StatusLineNC.fg.hex, + normal_a_bg = theme.PmenuSbar.bg.hex, + normal_b_bg = theme.PmenuSel.bg.hex, + normal_c_bg = theme.StatusLine.bg.hex, + normal_c_fg = theme.StatusLine.fg.hex, + insert_a_bg = theme.DiffAdd.bg.hex, + command_a_bg = theme.Search.bg.hex, + visual_a_bg = theme.Visual.bg.hex, + replace_a_bg = theme.DiffDelete.bg.hex, + }, + } +end diff --git a/lua/zenbones/build/tmux.lua b/lua/zenbones/build/tmux.lua index f16b703..5374ce7 100644 --- a/lua/zenbones/build/tmux.lua +++ b/lua/zenbones/build/tmux.lua @@ -17,14 +17,16 @@ set -g clock-mode-colour '${color5}' set -g mode-style fg='${color0}',bg='${selection_background}' ]] -local theme = require "zenbones" -local terminal = require "zenbones.terminal" +return function(name) + local theme = require(name) + local terminal = require(name .. ".terminal") -local values = { - selection_background = theme.Visual.bg.hex, -} -for i, v in ipairs(terminal.colors) do - values["color" .. (i - 1)] = v.hex + local values = { + selection_background = theme.Visual.bg.hex, + } + for i, v in ipairs(terminal.colors) do + values["color" .. (i - 1)] = v.hex + end + + return { string.format("extras/tmux/%s.tmux", name), template, values } end - -return { "extras/tmux/zenbones.tmux", template, values } diff --git a/lua/zenbones/build/vim.lua b/lua/zenbones/build/vim.lua index 2b77fd0..fb5ab7b 100644 --- a/lua/zenbones/build/vim.lua +++ b/lua/zenbones/build/vim.lua @@ -1,6 +1,4 @@ local lush = require "lush" -local theme = require "zenbones" -local terminal = require "zenbones.terminal" local template = [[if exists('g:colors_name') highlight clear @@ -9,7 +7,7 @@ local template = [[if exists('g:colors_name') endif set background=light -let g:colors_name = 'zenbones' +let g:colors_name = '${name}' ${termcolors} if has('terminal') @@ -36,19 +34,24 @@ endif ${vimcolors} ]] -local termcolors = "" -for i, v in ipairs(terminal.colors) do - termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex) +return function(name) + local theme = require(name) + local terminal = require(name .. ".terminal") + local termcolors = "" + for i, v in ipairs(terminal.colors) do + termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex) + end + + -- Compile lush table, concatenate to a single string, and remove blend property + local vimcolors = table.concat(vim.fn.sort(lush.compile(theme, { exclude_keys = { "blend" } })), "\n") + + return { + string.format("colors/%s.vim", name), + template, + { + name = name, + termcolors = termcolors, + vimcolors = vimcolors, + }, + } end - --- Compile lush table, concatenate to a single string, and remove blend property -local vimcolors = table.concat(vim.fn.sort(lush.compile(theme, { exclude_keys = { "blend" } })), "\n") - -return { - "colors/zenbones.vim", - template, - { - termcolors = termcolors, - vimcolors = vimcolors, - }, -} diff --git a/lua/zenbones/build/wezterm.lua b/lua/zenbones/build/wezterm.lua index 3af01bd..a6ce30e 100644 --- a/lua/zenbones/build/wezterm.lua +++ b/lua/zenbones/build/wezterm.lua @@ -1,4 +1,4 @@ -local template = [[# Zenbones +local template = [[# ${name} [colors] foreground = "${fg}" background = "${bg}" @@ -12,20 +12,25 @@ ansi = ["${color0}", "${color1}", "${color2}", "${color3}", "${color4}", "${colo brights = ["${color8}", "${color9}", "${color10}", "${color11}", "${color12}", "${color13}", "${color14}", "${color15}"] ]] -local theme = require "zenbones" -local terminal = require "zenbones.terminal" +return function(name) + local theme = require(name) + local terminal = require(name .. ".terminal") -local values = { - fg = theme.Normal.fg.hex, - bg = theme.Normal.bg.hex, - cursor_bg = theme.Cursor.bg.hex, - cursor_border = theme.Cursor.fg.hex, - cursor_fg = theme.Cursor.fg.hex, - selection_bg = theme.Visual.bg.hex, - selection_fg = theme.Normal.fg.hex, -} -for i, v in ipairs(terminal.colors) do - values["color" .. (i - 1)] = v.hex + local name = name:sub(1, 1):upper() .. name:sub(2) + + local values = { + name = name, + fg = theme.Normal.fg.hex, + bg = theme.Normal.bg.hex, + cursor_bg = theme.Cursor.bg.hex, + cursor_border = theme.Cursor.fg.hex, + cursor_fg = theme.Cursor.fg.hex, + selection_bg = theme.Visual.bg.hex, + selection_fg = theme.Normal.fg.hex, + } + for i, v in ipairs(terminal.colors) do + values["color" .. (i - 1)] = v.hex + end + + return { string.format("extras/wezterm/%s.toml", name), template, values } end - -return { "extras/wezterm/Zenbones.toml", template, values } From c728d71fa0134d0f17a99f36c7ff3e2aa53a7cba Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 05:54:36 +0800 Subject: [PATCH 29/53] generate zenflesh files --- autoload/lightline/colorscheme/zenflesh.vim | 22 ++ colors/zenbones.vim | 4 +- colors/zenflesh.vim | 213 ++++++++++++++++++++ extras/alacritty/zenbones.yml | 2 +- extras/alacritty/zenflesh.yml | 26 +++ extras/kitty/zenflesh.conf | 39 ++++ extras/tmux/zenflesh.tmux | 17 ++ extras/wezterm/Zenflesh.toml | 12 ++ lua/lualine/themes/zenflesh.lua | 33 +++ 9 files changed, 365 insertions(+), 3 deletions(-) create mode 100644 autoload/lightline/colorscheme/zenflesh.vim create mode 100644 colors/zenflesh.vim create mode 100644 extras/alacritty/zenflesh.yml create mode 100644 extras/kitty/zenflesh.conf create mode 100644 extras/tmux/zenflesh.tmux create mode 100644 extras/wezterm/Zenflesh.toml create mode 100644 lua/lualine/themes/zenflesh.lua diff --git a/autoload/lightline/colorscheme/zenflesh.vim b/autoload/lightline/colorscheme/zenflesh.vim new file mode 100644 index 0000000..480499a --- /dev/null +++ b/autoload/lightline/colorscheme/zenflesh.vim @@ -0,0 +1,22 @@ +let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} + +let s:p.normal.left = [ [ "#AFA099", "#4D4542", "bold" ], [ "#AFA099", "#3C3633" ] ] +let s:p.normal.middle = [ [ "#B6BCC1", "#37312F" ] ] +let s:p.normal.right = [ [ "#AFA099", "#3C3633" ], [ "#AFA099", "#3C3633" ] ] +let s:p.normal.warning = [ [ "#B86E54", "#352723" ] ] +let s:p.normal.error = [ [ "#BB6572", "#2A2A2A" ] ] + +let s:p.inactive.left = [ [ "#CBCFD3", "#2E2927" ], [ "#CBCFD3", "#2E2927" ] ] +let s:p.inactive.middle = [ [ "#CBCFD3", "#2E2927" ] ] +let s:p.inactive.right = [ [ "#CBCFD3", "#2E2927" ] ] + +let s:p.insert.left = [ [ "#AFA099", "#384126", "bold" ], [ "#AFA099", "#3C3633" ] ] +let s:p.replace.left = [ [ "#AFA099", "#5D383D", "bold" ], [ "#AFA099", "#3C3633" ] ] +let s:p.visual.left = [ [ "#AFA099", "#303B41", "bold" ], [ "#AFA099", "#3C3633" ] ] + +let s:p.tabline.left = [ [ "#B6BCC1", "#3C3633", "italic" ] ] +let s:p.tabline.middle = [ [ "#CBCFD3", "#2E2927" ] ] +let s:p.tabline.right = [ [ "#B6BCC1", "#3C3633" ] ] +let s:p.tabline.tabsel = [ [ "#B6BCC1", "#1A1715", "bold" ] ] + +let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p) diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 73eabb5..3fa16d2 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -57,7 +57,7 @@ highlight CocWarningHighlight guifg=#944927 guibg=NONE guisp=NONE gui=underline highlight ColorColumn guifg=NONE guibg=#EFD8D3 guisp=NONE gui=NONE highlight Comment guifg=#948985 guibg=NONE guisp=NONE gui=italic highlight Conceal guifg=#4D5C65 guibg=NONE guisp=NONE gui=bold,italic -highlight Constant guifg=#53636D guibg=NONE guisp=NONE gui=italic +highlight Constant guifg=#556570 guibg=NONE guisp=NONE gui=italic highlight Cursor guifg=#F2F0EF guibg=#2C363C guisp=NONE gui=NONE highlight CursorLine guifg=NONE guibg=#E6E1DF guisp=NONE gui=NONE highlight CursorLineNr guifg=#2C363C guibg=NONE guisp=NONE gui=bold @@ -126,7 +126,6 @@ highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline highlight Type guifg=#5C534F guibg=NONE guisp=NONE gui=NONE highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline -highlight VertSplit guifg=#F7F6F5 guibg=NONE guisp=NONE gui=NONE highlight Visual guifg=NONE guibg=#D2DFE7 guisp=NONE gui=NONE highlight WarningMsg guifg=#944927 guibg=NONE guisp=NONE gui=NONE highlight WildMenu guifg=#F0EDEC guibg=#88507D guisp=NONE gui=NONE @@ -194,6 +193,7 @@ highlight! link TermCursor Cursor highlight! link TroubleNormal Function highlight! link TroubleSource Constant highlight! link TroubleText Function +highlight! link VertSplit LineNr highlight! link WhichKey Statement highlight! link WhichKeyGroup Special highlight! link WhichKeySeparator LineNr diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim new file mode 100644 index 0000000..5cce9d2 --- /dev/null +++ b/colors/zenflesh.vim @@ -0,0 +1,213 @@ +if exists('g:colors_name') + highlight clear + syntax reset + set t_Co=256 +endif + +set background=light +let g:colors_name = 'zenflesh' + +let g:terminal_color_0 = '#B6BCC1' +let g:terminal_color_1 = '#BB6572' +let g:terminal_color_2 = '#75884C' +let g:terminal_color_3 = '#B86E54' +let g:terminal_color_4 = '#4185AE' +let g:terminal_color_5 = '#AC75A1' +let g:terminal_color_6 = '#4F969E' +let g:terminal_color_7 = '#1A1715' +let g:terminal_color_8 = '#969CA0' +let g:terminal_color_9 = '#D16D7D' +let g:terminal_color_10 = '#7F974C' +let g:terminal_color_11 = '#D07654' +let g:terminal_color_12 = '#4293C2' +let g:terminal_color_13 = '#C873B8' +let g:terminal_color_14 = '#4CA2AC' +let g:terminal_color_15 = '#2F2925' + +if has('terminal') + let g:terminal_ansi_colors = [ + \ g:terminal_color_0, + \ g:terminal_color_1, + \ g:terminal_color_2, + \ g:terminal_color_3, + \ g:terminal_color_4, + \ g:terminal_color_5, + \ g:terminal_color_6, + \ g:terminal_color_7, + \ g:terminal_color_8, + \ g:terminal_color_9, + \ g:terminal_color_10, + \ g:terminal_color_11, + \ g:terminal_color_12, + \ g:terminal_color_13, + \ g:terminal_color_14, + \ g:terminal_color_15 + \ ] +endif + +highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold +highlight BufferVisible guifg=#CBCFD3 guibg=NONE guisp=NONE gui=NONE +highlight BufferVisibleIndex guifg=#CBCFD3 guibg=NONE guisp=NONE gui=NONE +highlight BufferVisibleSign guifg=#CBCFD3 guibg=NONE guisp=NONE gui=NONE +highlight CocErrorHighlight guifg=#BB6572 guibg=NONE guisp=NONE gui=underline +highlight CocHintHighlight guifg=#AC75A1 guibg=NONE guisp=NONE gui=underline +highlight CocInfoHighlight guifg=#4185AE guibg=NONE guisp=NONE gui=underline +highlight CocMarkdownLink guifg=#4F969E guibg=NONE guisp=NONE gui=underline +highlight CocWarningHighlight guifg=#B86E54 guibg=NONE guisp=NONE gui=underline +highlight ColorColumn guifg=NONE guibg=#775349 guisp=NONE gui=NONE +highlight Comment guifg=#5B5654 guibg=NONE guisp=NONE gui=italic +highlight Conceal guifg=#8E9498 guibg=NONE guisp=NONE gui=bold,italic +highlight Constant guifg=#7F8488 guibg=NONE guisp=NONE gui=italic +highlight Cursor guifg=#161311 guibg=#C5CACE guisp=NONE gui=NONE +highlight CursorLine guifg=NONE guibg=#231F1D guisp=NONE gui=NONE +highlight CursorLineNr guifg=#B6BCC1 guibg=NONE guisp=NONE gui=bold +highlight Delimiter guifg=#776E69 guibg=NONE guisp=NONE gui=NONE +highlight DiffAdd guifg=NONE guibg=#384126 guisp=NONE gui=NONE +highlight DiffChange guifg=NONE guibg=#2C475B guisp=NONE gui=NONE +highlight DiffDelete guifg=NONE guibg=#5D383D guisp=NONE gui=NONE +highlight DiffText guifg=#B6BCC1 guibg=#3B5D75 guisp=NONE gui=NONE +highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold +highlight Error guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE +highlight FloatBorder guifg=#8B7F79 guibg=NONE guisp=NONE gui=NONE +highlight FoldColumn guifg=#564E4A guibg=NONE guisp=NONE gui=bold +highlight Folded guifg=#AFA099 guibg=#37312F guisp=NONE gui=NONE +highlight Function guifg=#B6BCC1 guibg=NONE guisp=NONE gui=NONE +highlight GitSignsAdd guifg=#75884C guibg=NONE guisp=NONE gui=NONE +highlight GitSignsChange guifg=#4185AE guibg=NONE guisp=NONE gui=NONE +highlight GitSignsDelete guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE +highlight HopNextKey2 guifg=#4185AE guibg=NONE guisp=NONE gui=NONE +highlight Identifier guifg=#969CA0 guibg=NONE guisp=NONE gui=NONE +highlight IncSearch guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold +highlight IndentBlanklineChar guifg=#181514 guibg=NONE guisp=NONE gui=NONE +highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic +highlight LightspeedGreyWash guifg=#5B5654 guibg=NONE guisp=NONE gui=NONE +highlight LightspeedLabel guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold,underline +highlight LightspeedLabelDistant guifg=#4F969E guibg=NONE guisp=NONE gui=bold,underline +highlight LightspeedLabelDistantOverlapped guifg=#4F969E guibg=NONE guisp=NONE gui=underline +highlight LightspeedLabelOverlapped guifg=#AC75A1 guibg=NONE guisp=NONE gui=underline +highlight LightspeedOneCharMatch guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold +highlight LightspeedPendingChangeOpArea guifg=#AC75A1 guibg=NONE guisp=NONE gui=NONE +highlight LightspeedShortcut guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold,underline +highlight LineNr guifg=#564E4A guibg=NONE guisp=NONE gui=NONE +highlight LspDiagnosticsDefaultHint guifg=#AC75A1 guibg=NONE guisp=NONE gui=NONE +highlight LspDiagnosticsDefaultInformation guifg=#4185AE guibg=NONE guisp=NONE gui=NONE +highlight LspDiagnosticsUnderlineError guifg=#BB6572 guibg=NONE guisp=NONE gui=undercurl +highlight LspDiagnosticsUnderlineHint guifg=#AC75A1 guibg=NONE guisp=NONE gui=undercurl +highlight LspDiagnosticsUnderlineInformation guifg=#4185AE guibg=NONE guisp=NONE gui=undercurl +highlight LspDiagnosticsUnderlineWarning guifg=#B86E54 guibg=NONE guisp=NONE gui=undercurl +highlight LspDiagnosticsVirtualTextError guifg=#BB6572 guibg=#2A2A2A guisp=NONE gui=NONE +highlight LspDiagnosticsVirtualTextWarning guifg=#B86E54 guibg=#352723 guisp=NONE gui=NONE +highlight MoreMsg guifg=#75884C guibg=NONE guisp=NONE gui=bold +highlight NeogitHunkHeaderHighlight guifg=#B6BCC1 guibg=#231F1D guisp=NONE gui=bold +highlight NonText guifg=#48413D guibg=NONE guisp=NONE gui=NONE +highlight Normal guifg=#B6BCC1 guibg=#1A1715 guisp=NONE gui=NONE +highlight NormalFloat guifg=NONE guibg=#272321 guisp=NONE gui=NONE +highlight Number guifg=NONE guibg=NONE guisp=NONE gui=italic +highlight Pmenu guifg=NONE guibg=#2E2927 guisp=NONE gui=NONE +highlight PmenuSbar guifg=NONE guibg=#4D4542 guisp=NONE gui=NONE +highlight PmenuSel guifg=NONE guibg=#3C3633 guisp=NONE gui=NONE +highlight PmenuThumb guifg=NONE guibg=#867A74 guisp=NONE gui=NONE +highlight Search guifg=#1A1715 guibg=#775370 guisp=NONE gui=NONE +highlight SneakLabelMask guifg=#AC75A1 guibg=#AC75A1 guisp=NONE gui=NONE +highlight Special guifg=#91979B guibg=NONE guisp=NONE gui=bold +highlight SpecialComment guifg=#5B5654 guibg=NONE guisp=NONE gui=bold +highlight SpecialKey guifg=#48413D guibg=NONE guisp=NONE gui=italic +highlight SpellBad guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl +highlight SpellCap guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl +highlight SpellRare guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl +highlight Statement guifg=#B6BCC1 guibg=NONE guisp=NONE gui=bold +highlight StatusLine guifg=#B6BCC1 guibg=#37312F guisp=NONE gui=NONE +highlight StatusLineNC guifg=#CBCFD3 guibg=#2E2927 guisp=NONE gui=NONE +highlight TabLine guifg=#B6BCC1 guibg=#37312F guisp=NONE gui=italic +highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold +highlight TelescopeMatching guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold +highlight TelescopeSelectionCaret guifg=#BB6572 guibg=#231F1D guisp=NONE gui=NONE +highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold +highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline +highlight Type guifg=#9C918C guibg=NONE guisp=NONE gui=NONE +highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline +highlight Visual guifg=NONE guibg=#303B41 guisp=NONE gui=NONE +highlight WarningMsg guifg=#B86E54 guibg=NONE guisp=NONE gui=NONE +highlight WildMenu guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=NONE +highlight diffAdded guifg=#75884C guibg=NONE guisp=NONE gui=NONE +highlight diffChanged guifg=#4185AE guibg=NONE guisp=NONE gui=NONE +highlight diffFile guifg=#B86E54 guibg=NONE guisp=NONE gui=bold +highlight diffIndexLine guifg=#B86E54 guibg=NONE guisp=NONE gui=NONE +highlight diffLine guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold +highlight diffNewFile guifg=#75884C guibg=NONE guisp=NONE gui=italic +highlight diffOldFile guifg=#BB6572 guibg=NONE guisp=NONE gui=italic +highlight diffRemoved guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE +highlight lCursor guifg=#161311 guibg=#7A7F83 guisp=NONE gui=NONE +highlight markdownH1 guifg=#B6BCC1 guibg=NONE guisp=NONE gui=bold,underline +highlight! link Boolean Number +highlight! link BufferCurrent TabLineSel +highlight! link CocCodeLens LineNr +highlight! link CocErrorSign LspDiagnosticsDefaultError +highlight! link CocErrorVirtualText LspDiagnosticsVirtualTextError +highlight! link CocHintSign LspDiagnosticsDefaultHint +highlight! link CocInfoSign LspDiagnosticsDefaultInformation +highlight! link CocSelectedText SpellBad +highlight! link CocWarningSign LspDiagnosticsDefaultWarning +highlight! link CocWarningVitualText LspDiagnosticsVirtualTextWarning +highlight! link CursorColumn CursorLine +highlight! link EndOfBuffer NonText +highlight! link ErrorMsg Error +highlight! link GitGutterAdd GitSignsAdd +highlight! link GitGutterChange GitSignsChange +highlight! link GitGutterDelete GitSignsDelete +highlight! link HopNextKey LightspeedLabel +highlight! link HopNextKey1 LightspeedLabelDistant +highlight! link HopUnmatched LightspeedGreyWash +highlight! link LightspeedMaskedChar Conceal +highlight! link LightspeedPendingOpArea SneakLabel +highlight! link LightspeedUnlabeledMatch Bold +highlight! link LspCodeLens LineNr +highlight! link LspDiagnosticsDefaultError Error +highlight! link LspDiagnosticsDefaultWarning WarningMsg +highlight! link LspReferenceRead ColorColumn +highlight! link LspReferenceText ColorColumn +highlight! link LspReferenceWrite ColorColumn +highlight! link MatchParen Search +highlight! link NeogitDiffAddHighlight DiffAdd +highlight! link NeogitDiffContextHighlight CursorLine +highlight! link NeogitDiffDeleteHighlight DiffDelete +highlight! link NeogitHunkHeader LineNr +highlight! link NeogitNotificationError LspDiagnosticsDefaultError +highlight! link NeogitNotificationInfo LspDiagnosticsDefaultInformation +highlight! link NeogitNotificationWarning LspDiagnosticsDefaultWarning +highlight! link PreProc Statement +highlight! link Question MoreMsg +highlight! link SignColumn LineNr +highlight! link Sneak Search +highlight! link SneakLabel WildMenu +highlight! link SpellLocal SpellCap +highlight! link TSDanger Error +highlight! link TSNote LspDiagnosticsDefaultInformation +highlight! link TSTag Special +highlight! link TSVariable Identifier +highlight! link TSWarning WarningMsg +highlight! link TabLineFill StatusLineNC +highlight! link TelescopeBorder FloatBorder +highlight! link TelescopeSelection CursorLine +highlight! link TermCursor Cursor +highlight! link TermCursorNC lCursor +highlight! link TroubleNormal Function +highlight! link TroubleSource Constant +highlight! link TroubleText Function +highlight! link VertSplit LineNr +highlight! link WhichKey Statement +highlight! link WhichKeyGroup Special +highlight! link WhichKeySeparator LineNr +highlight! link WhichKeyValue Constant +highlight! link Whitespace NonText +highlight! link helpHyperTextEntry Special +highlight! link helpHyperTextJump Constant +highlight! link helpOption Constant +highlight! link helpSpecial Type +highlight! link markdownCode Identifier +highlight! link markdownH2 Statement +highlight! link markdownH3 Statement +highlight! link markdownH4 Special +highlight! link markdownH5 Special +highlight! link markdownH6 Special +highlight! link markdownLinkTextDelimiter Delimiter diff --git a/extras/alacritty/zenbones.yml b/extras/alacritty/zenbones.yml index 68c88be..611671a 100644 --- a/extras/alacritty/zenbones.yml +++ b/extras/alacritty/zenbones.yml @@ -1,4 +1,4 @@ -# Zenbones Alacritty Colors +# zenbones alacritty colors colors: # Default colors primary: diff --git a/extras/alacritty/zenflesh.yml b/extras/alacritty/zenflesh.yml new file mode 100644 index 0000000..aaf9b21 --- /dev/null +++ b/extras/alacritty/zenflesh.yml @@ -0,0 +1,26 @@ +# zenflesh alacritty colors +colors: + # Default colors + primary: + background: '#1A1715' + foreground: '#B6BCC1' + # Normal colors + normal: + black: '#B6BCC1' + red: '#BB6572' + green: '#75884C' + yellow: '#B86E54' + blue: '#4185AE' + magenta: '#AC75A1' + cyan: '#4F969E' + white: '#1A1715' + # Bright colors + bright: + black: '#969CA0' + red: '#D16D7D' + green: '#7F974C' + yellow: '#D07654' + blue: '#4293C2' + magenta: '#C873B8' + cyan: '#4CA2AC' + white: '#2F2925' diff --git a/extras/kitty/zenflesh.conf b/extras/kitty/zenflesh.conf new file mode 100644 index 0000000..271e1ee --- /dev/null +++ b/extras/kitty/zenflesh.conf @@ -0,0 +1,39 @@ +# vim:ft=kitty +## name: zenflesh +## license: MIT +## author: Michael Chris Lopez +## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenflesh.conf + +background #1A1715 +foreground #B6BCC1 +selection_background #303B41 +selection_foreground #B6BCC1 +url_color #C873B8 +cursor #B6BCC1 + +# Tabs +active_tab_background #775370 +active_tab_foreground #B6BCC1 +inactive_tab_background #37312F +inactive_tab_foreground #B6BCC1 +#tab_bar_background ${tab_bar_background} + +# normal +color0 #B6BCC1 +color1 #BB6572 +color2 #75884C +color3 #B86E54 +color4 #4185AE +color5 #AC75A1 +color6 #4F969E +color7 #1A1715 + +# bright +color8 #969CA0 +color9 #D16D7D +color10 #7F974C +color11 #D07654 +color12 #4293C2 +color13 #C873B8 +color14 #4CA2AC +color15 #2F2925 diff --git a/extras/tmux/zenflesh.tmux b/extras/tmux/zenflesh.tmux new file mode 100644 index 0000000..09fb42b --- /dev/null +++ b/extras/tmux/zenflesh.tmux @@ -0,0 +1,17 @@ +set -g status-left ' #[fg=#AC75A1,bold]#{s/root//:client_key_table} ' +set -g status-right '#[fg=#AC75A1,bold] [#S]#[fg=#AC75A1,bold] [%d/%m] #[fg=#AC75A1,bold][%I:%M%p] ' +set -g status-style fg='#AC75A1',bg='#1A1715' + +set -g window-status-current-style fg='#AC75A1',bg='#1A1715',bold + +set -g pane-border-style fg='#AC75A1' +set -g pane-active-border-style fg='#AC75A1' + +set -g message-style fg='#B6BCC1',bg='#303B41' + +set -g display-panes-active-colour '#AC75A1' +set -g display-panes-colour '#AC75A1' + +set -g clock-mode-colour '#AC75A1' + +set -g mode-style fg='#B6BCC1',bg='#303B41' diff --git a/extras/wezterm/Zenflesh.toml b/extras/wezterm/Zenflesh.toml new file mode 100644 index 0000000..842a670 --- /dev/null +++ b/extras/wezterm/Zenflesh.toml @@ -0,0 +1,12 @@ +# Zenflesh +[colors] +foreground = "#B6BCC1" +background = "#1A1715" +cursor_bg = "#C5CACE" +cursor_border = "#161311" +cursor_fg = "#161311" +selection_bg = "#303B41" +selection_fg = "#B6BCC1" + +ansi = ["#B6BCC1", "#BB6572", "#75884C", "#B86E54", "#4185AE", "#AC75A1", "#4F969E", "#1A1715"] +brights = ["#969CA0", "#D16D7D", "#7F974C", "#D07654", "#4293C2", "#C873B8", "#4CA2AC", "#2F2925"] diff --git a/lua/lualine/themes/zenflesh.lua b/lua/lualine/themes/zenflesh.lua new file mode 100644 index 0000000..a319145 --- /dev/null +++ b/lua/lualine/themes/zenflesh.lua @@ -0,0 +1,33 @@ +local common_fg = "#AFA099" +local inactive_bg = "#2E2927" +local inactive_fg = "#CBCFD3" + +return { + normal = { + a = { bg = "#4D4542", fg = common_fg, gui = "bold" }, + b = { bg = "#3C3633", fg = common_fg }, + c = { bg = "#37312F", fg = "#B6BCC1" }, + }, + + insert = { + a = { bg = "#384126", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "#775370", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "#303B41", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "#5D383D", fg = common_fg, gui = "bold" }, + }, + + inactive = { + a = { bg = inactive_bg, fg = inactive_fg, gui = "bold" }, + b = { bg = inactive_bg, fg = inactive_fg }, + c = { bg = inactive_bg, fg = inactive_fg }, + }, +} From e300373fe5fa60c518a0dd3b5d946e31728c31aa Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 06:38:07 +0800 Subject: [PATCH 30/53] background=dark for zenflesh --- colors/zenflesh-lush.lua | 2 +- colors/zenflesh.vim | 4 ++-- lua/zenbones/build/vim.lua | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/colors/zenflesh-lush.lua b/colors/zenflesh-lush.lua index d028b31..fc45182 100644 --- a/colors/zenflesh-lush.lua +++ b/colors/zenflesh-lush.lua @@ -1,4 +1,4 @@ -vim.opt.background = "light" +vim.opt.background = "dark" vim.g.colors_name = "zenflesh-lush" require("zenflesh.terminal").setup() diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index 5cce9d2..d9434a2 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -4,7 +4,7 @@ if exists('g:colors_name') set t_Co=256 endif -set background=light +set background=dark let g:colors_name = 'zenflesh' let g:terminal_color_0 = '#B6BCC1' @@ -124,7 +124,7 @@ highlight TelescopeMatching guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold highlight TelescopeSelectionCaret guifg=#BB6572 guibg=#231F1D guisp=NONE gui=NONE highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline -highlight Type guifg=#9C918C guibg=NONE guisp=NONE gui=NONE +highlight Type guifg=#9B918D guibg=NONE guisp=NONE gui=NONE highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline highlight Visual guifg=NONE guibg=#303B41 guisp=NONE gui=NONE highlight WarningMsg guifg=#B86E54 guibg=NONE guisp=NONE gui=NONE diff --git a/lua/zenbones/build/vim.lua b/lua/zenbones/build/vim.lua index fb5ab7b..86c4007 100644 --- a/lua/zenbones/build/vim.lua +++ b/lua/zenbones/build/vim.lua @@ -6,7 +6,7 @@ local template = [[if exists('g:colors_name') set t_Co=256 endif -set background=light +set background=${background} let g:colors_name = '${name}' ${termcolors} @@ -49,6 +49,7 @@ return function(name) string.format("colors/%s.vim", name), template, { + background = name == "zenbones" and "light" or "dark", name = name, termcolors = termcolors, vimcolors = vimcolors, From d60fc8aeef69823d5cf36e56db6855ee9527fc60 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 07:50:23 +0800 Subject: [PATCH 31/53] pass colors from builder --- lua/zenbones/build.lua | 22 +++++++++++++++++-- lua/zenbones/build/alacritty.lua | 5 +---- lua/zenbones/build/kitty.lua | 5 +---- lua/zenbones/build/lightline.lua | 4 +--- lua/zenbones/build/lualine.lua | 4 +--- lua/zenbones/build/tmux.lua | 5 +---- lua/zenbones/build/vim.lua | 36 +++++++++++++++----------------- lua/zenbones/build/wezterm.lua | 5 +---- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/lua/zenbones/build.lua b/lua/zenbones/build.lua index 749390d..e909be2 100644 --- a/lua/zenbones/build.lua +++ b/lua/zenbones/build.lua @@ -16,8 +16,26 @@ end local function build() local templates = { "vim", "kitty", "alacritty", "wezterm", "lualine", "lightline", "tmux" } for _, t in ipairs(templates) do - write_template(unpack(require("zenbones.build." .. t) "zenbones")) - write_template(unpack(require("zenbones.build." .. t) "zenflesh")) + write_template( + unpack( + require("zenbones.build." .. t)( + "zenbones", + require "zenbones", + require "zenbones.palette", + require "zenbones.terminal" + ) + ) + ) + write_template( + unpack( + require("zenbones.build." .. t)( + "zenflesh", + require "zenflesh", + require "zenflesh.palette", + require "zenflesh.terminal" + ) + ) + ) end end diff --git a/lua/zenbones/build/alacritty.lua b/lua/zenbones/build/alacritty.lua index 3037bc5..f5e2df2 100644 --- a/lua/zenbones/build/alacritty.lua +++ b/lua/zenbones/build/alacritty.lua @@ -26,10 +26,7 @@ colors: white: '${color15}' ]] -return function(name) - local theme = require(name) - local terminal = require(name .. ".terminal") - +return function(name, theme, palette, terminal) local values = { name = name, bg = theme.Normal.bg.hex, diff --git a/lua/zenbones/build/kitty.lua b/lua/zenbones/build/kitty.lua index 6e31674..02693ed 100644 --- a/lua/zenbones/build/kitty.lua +++ b/lua/zenbones/build/kitty.lua @@ -39,10 +39,7 @@ color14 ${color14} color15 ${color15} ]] -return function(name) - local theme = require(name) - local terminal = require(name .. ".terminal") - +return function(name, theme, palette, terminal) local bg = theme.Normal.bg.hex local fg = theme.Normal.fg.hex local values = { diff --git a/lua/zenbones/build/lightline.lua b/lua/zenbones/build/lightline.lua index f820515..686a775 100644 --- a/lua/zenbones/build/lightline.lua +++ b/lua/zenbones/build/lightline.lua @@ -22,9 +22,7 @@ let s:p.tabline.tabsel = [ [ "${tabsel_fg}", "${tabsel_bg}", "bold" ] ] let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p) ]] -return function(name) - local theme = require(name) - +return function(name, theme, palette, terminal) return { string.format("autoload/lightline/colorscheme/%s.vim", name), template, diff --git a/lua/zenbones/build/lualine.lua b/lua/zenbones/build/lualine.lua index 7d20559..d474e20 100644 --- a/lua/zenbones/build/lualine.lua +++ b/lua/zenbones/build/lualine.lua @@ -33,9 +33,7 @@ return { } ]] -return function(name) - local theme = require(name) - +return function(name, theme, palette, terminal) return { string.format("lua/lualine/themes/%s.lua", name), template, diff --git a/lua/zenbones/build/tmux.lua b/lua/zenbones/build/tmux.lua index 5374ce7..b45dd69 100644 --- a/lua/zenbones/build/tmux.lua +++ b/lua/zenbones/build/tmux.lua @@ -17,10 +17,7 @@ set -g clock-mode-colour '${color5}' set -g mode-style fg='${color0}',bg='${selection_background}' ]] -return function(name) - local theme = require(name) - local terminal = require(name .. ".terminal") - +return function(name, theme, palette, terminal) local values = { selection_background = theme.Visual.bg.hex, } diff --git a/lua/zenbones/build/vim.lua b/lua/zenbones/build/vim.lua index 86c4007..702e379 100644 --- a/lua/zenbones/build/vim.lua +++ b/lua/zenbones/build/vim.lua @@ -34,25 +34,23 @@ endif ${vimcolors} ]] -return function(name) - local theme = require(name) - local terminal = require(name .. ".terminal") - local termcolors = "" - for i, v in ipairs(terminal.colors) do - termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex) - end +return function(name, theme, palette, terminal) + local termcolors = "" + for i, v in ipairs(terminal.colors) do + termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex) + end - -- Compile lush table, concatenate to a single string, and remove blend property - local vimcolors = table.concat(vim.fn.sort(lush.compile(theme, { exclude_keys = { "blend" } })), "\n") + -- Compile lush table, concatenate to a single string, and remove blend property + local vimcolors = table.concat(vim.fn.sort(lush.compile(theme, { exclude_keys = { "blend" } })), "\n") - return { - string.format("colors/%s.vim", name), - template, - { - background = name == "zenbones" and "light" or "dark", - name = name, - termcolors = termcolors, - vimcolors = vimcolors, - }, - } + return { + string.format("colors/%s.vim", name), + template, + { + background = name == "zenbones" and "light" or "dark", + name = name, + termcolors = termcolors, + vimcolors = vimcolors, + }, + } end diff --git a/lua/zenbones/build/wezterm.lua b/lua/zenbones/build/wezterm.lua index a6ce30e..7686077 100644 --- a/lua/zenbones/build/wezterm.lua +++ b/lua/zenbones/build/wezterm.lua @@ -12,10 +12,7 @@ ansi = ["${color0}", "${color1}", "${color2}", "${color3}", "${color4}", "${colo brights = ["${color8}", "${color9}", "${color10}", "${color11}", "${color12}", "${color13}", "${color14}", "${color15}"] ]] -return function(name) - local theme = require(name) - local terminal = require(name .. ".terminal") - +return function(name, theme, palette, terminal) local name = name:sub(1, 1):upper() .. name:sub(2) local values = { From 549adf129f3ab329a3a1df8bea294e63d78ab29d Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 14:29:42 +0800 Subject: [PATCH 32/53] option to disable italic comments --- README.md | 4 ++++ lua/zenbones/init.lua | 4 +++- lua/zenflesh/init.lua | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2871bf2..b5acb7f 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,10 @@ highlight. Set to `v:true` to make non-current window background dimmer than _Normal_. +#### g:zenbones_italic_comments + +Set to `v:false` to make comments not italicize. + ## Advanced Usage Zenbones is pretty extensible thanks to Lush. You can easily retrieve the colors diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index cfffd1d..609f61d 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -16,6 +16,8 @@ elseif lightness ~= nil then vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) end +local italic_comments = type(vim.g.zenbones_italic_comments) == "boolean" and vim.g.zenbones_italic_comments or true + -- stylua: ignore start local theme = lush(function() return { @@ -41,7 +43,7 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = c.wood }, -- warning messages - Comment { fg = c.sand.da(38).de(28), gui = "italic" }, -- any comment + Comment { fg = c.sand.da(38).de(28), gui = (italic_comments and "italic" or "NONE") }, -- any comment Conceal { fg = c.stone.li(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor { bg = c.stone, fg = c.sand.li(20) }, -- character under the cursor diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 440cc04..c220112 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -16,6 +16,8 @@ elseif darkness ~= nil then vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) end +local italic_comments = type(vim.g.zenflesh_italic_comments) == "boolean" and vim.g.zenflesh_italic_comments or true + -- stylua: ignore start local theme = lush(function() return { @@ -41,7 +43,7 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = c.wood }, -- warning messages - Comment { fg = c.sand.li(32).de(48), gui = "italic" }, -- any comment + Comment { fg = c.sand.li(32).de(48), gui = (italic_comments and "italic" or "NONE") }, -- any comment Conceal { fg = c.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') Cursor { bg = c.stone.li(20), fg = c.sand.da(20) }, -- character under the cursor From 9a2fd3c7a7cda4d46ec6bbe9dbdbb4b9126c89a7 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 14:50:56 +0800 Subject: [PATCH 33/53] rename variables --- lua/zenbones/init.lua | 122 +++++++++++++++++------------------ lua/zenbones/terminal.lua | 34 +++++----- lua/zenflesh/init.lua | 130 +++++++++++++++++++------------------- lua/zenflesh/palette.lua | 2 +- lua/zenflesh/terminal.lua | 34 +++++----- 5 files changed, 161 insertions(+), 161 deletions(-) diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 609f61d..f337ec4 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -1,7 +1,7 @@ local lush = require "lush" -local c = require "zenbones.palette" +local p = require "zenbones.palette" -local normal_bg = c.sand +local normal_bg = p.sand local diff_bg_l = 0 local lightness = vim.g.zenbones_lightness @@ -33,43 +33,43 @@ local theme = lush(function() -- styling for that group (meaning they mostly get styled as Normal) -- or leave them commented to apply vims default colouring or linking. - Normal { bg = normal_bg, fg = c.stone }, -- normal text + Normal { bg = normal_bg, fg = p.stone }, -- normal text Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links Bold { gui = "bold" }, Italic { gui = "italic" }, - Error { fg = c.rose }, -- (preferred) any erroneous construct + Error { fg = p.rose }, -- (preferred) any erroneous construct ErrorMsg { Error }, -- error messages on the command line - WarningMsg { fg = c.wood }, -- warning messages + WarningMsg { fg = p.wood }, -- warning messages - Comment { fg = c.sand.da(38).de(28), gui = (italic_comments and "italic" or "NONE") }, -- any comment - Conceal { fg = c.stone.li(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Comment { fg = p.sand.da(38).de(28), gui = (italic_comments and "italic" or "NONE") }, -- any comment + Conceal { fg = p.stone.li(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor { bg = c.stone, fg = c.sand.li(20) }, -- character under the cursor + Cursor { bg = p.stone, fg = p.sand.li(20) }, -- character under the cursor lCursor { Cursor, bg = Cursor.bg.li(20) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| TermCursor { Cursor }, -- cursor in a focused terminal CursorLine { bg = Normal.bg.da(4) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - ColorColumn { bg = c.wood.de(38).li(80) }, -- used for the columns set with 'colorcolumn' + ColorColumn { bg = p.wood.de(38).li(80) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(77).li(82).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(22).li(76).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(37).li(74).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(24).li(64).abs_da(diff_bg_l), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = p.leaf.de(77).li(82).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = p.water.de(22).li(76).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = p.rose.de(37).li(74).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = p.water.de(24).li(64).abs_da(diff_bg_l), fg = p.stone }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.da(32) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' Folded { bg = Normal.bg.da(16), fg = Normal.bg.da(64) }, -- line used for closed folds - CursorLineNr { LineNr, fg = c.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + CursorLineNr { LineNr, fg = p.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") -- MsgArea { }, -- Area for messages and cmdline -- MsgSeparator { }, -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg { fg = c.leaf, gui = "bold" }, -- |more-prompt| + MoreMsg { fg = p.leaf, gui = "bold" }, -- |more-prompt| NormalFloat { bg = Normal.bg.da(6) }, -- Normal text in floating windows. FloatBorder { fg = Normal.bg.da(50) }, -- Normal text in floating windows. @@ -78,8 +78,8 @@ local theme = lush(function() PmenuSbar { bg = Normal.bg.da(28) }, -- Popup menu: scrollbar. PmenuThumb { bg = Normal.bg.li(58) }, -- Popup menu: Thumb of the scrollbar. - Search { bg = c.blossom.de(10).li(54), fg = c.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch { bg = c.blossom, fg = c.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + Search { bg = p.blossom.de(10).li(54), fg = p.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch { bg = p.blossom, fg = p.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" -- Substitute { }, -- |:substitute| replacement text highlighting MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| -- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. @@ -87,16 +87,16 @@ local theme = lush(function() SpellBad { fg = Error.fg.de(30), gui = "undercurl", guisp = Error.fg }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. SpellCap { SpellBad, guisp = Error.fg.li(10) }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. - SpellRare { SpellBad, guisp = c.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + SpellRare { SpellBad, guisp = p.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine { bg = c.sand.da(14), fg = c.stone }, -- status line of current window - StatusLineNC { bg = c.sand.da(10), fg = c.stone.li(28) }, -- 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 { bg = p.sand.da(14), fg = p.stone }, -- status line of current window + StatusLineNC { bg = p.sand.da(10), fg = p.stone.li(28) }, -- 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 { StatusLine, gui = "italic" }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label VertSplit { LineNr }, -- the column separating vertically split windows - Visual { bg = c.stone.li(84) }, -- Visual mode selection + Visual { bg = p.stone.li(84) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". NonText { fg = Normal.bg.da(22) }, -- '@' 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|. @@ -104,7 +104,7 @@ local theme = lush(function() Whitespace { NonText }, -- "nbsp", "space", "tab" and "trail" in 'listchars' EndOfBuffer { NonText }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. - WildMenu { bg = c.blossom, fg = c.sand }, -- current match in 'wildmenu' completion + WildMenu { bg = p.blossom, fg = p.sand }, -- current match in 'wildmenu' completion Directory { gui = "bold" }, -- directory names (and other special names in listings) Question { MoreMsg }, -- |hit-enter| prompt and yes/no questions Title { gui = "bold" }, -- titles for output from ":set all", ":autocmd" etc. @@ -116,21 +116,21 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.li(25), gui = "italic" }, -- (preferred) any constant + Constant { fg = p.stone.li(25), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' Number { gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 - Identifier { fg = c.stone.li(15) }, -- (preferred) any variable name - Function { fg = c.stone }, -- function name (also: methods for classes) + Identifier { fg = p.stone.li(15) }, -- (preferred) any variable name + Function { fg = p.stone }, -- function name (also: methods for classes) - Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement - -- Conditional { }, -- if, then, else, endif, switch, etc. - -- Repeat { }, -- for, do, while, etc. - -- Label { }, -- case, default, etc. - -- Operator { }, -- "sizeof", "+", "*", etc. + Statement { fg = p.stone, gui = "bold" }, -- (preferred) any statement + -- Conditional { }, -- if, then, else, endif, switch, etp. + -- Repeat { }, -- for, do, while, etp. + -- Label { }, -- case, default, etp. + -- Operator { }, -- "sizeof", "+", "*", etp. -- Keyword { }, -- any other keyword -- Exception { }, -- try, catch, throw @@ -138,17 +138,17 @@ local theme = lush(function() -- Include { }, -- preprocessor #include -- Define { }, -- preprocessor #define -- Macro { }, -- same as Define - -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. + -- PreCondit { }, -- preprocessor #if, #else, #endif, etp. - Type { fg = c.sand.da(62) }, -- (preferred) int, long, char, etc. + Type { fg = p.sand.da(62) }, -- (preferred) int, long, char, etp. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = c.stone.li(21), gui = "bold" }, -- (preferred) any special symbol + Special { fg = p.stone.li(21), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = c.sand.da(42) }, -- character that needs attention + Delimiter { fg = p.sand.da(42) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements @@ -167,11 +167,11 @@ local theme = lush(function() LspDiagnosticsDefaultError { Error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultWarning { WarningMsg }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultInformation { fg = c.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultHint { fg = c.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultInformation { fg = p.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultHint { fg = p.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(48).li(82) }, -- Used for "Error" diagnostic virtual text - LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(58).li(86) }, -- Used for "Warning" diagnostic virtual text + LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = p.rose.abs_de(48).li(82) }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = p.wood.de(58).li(86) }, -- Used for "Warning" diagnostic virtual text -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text @@ -255,14 +255,14 @@ local theme = lush(function() TSDanger { Error }, -- Syntax - diffAdded { fg = c.leaf }, - diffRemoved { fg = c.rose }, - diffChanged { fg = c.water }, - diffOldFile { fg = c.rose, gui = "italic" }, - diffNewFile { fg = c.leaf, gui = "italic" }, - diffFile { fg = c.wood, gui = "bold" }, - diffLine { fg = c.blossom, gui = "bold" }, - diffIndexLine { fg = c.wood }, + diffAdded { fg = p.leaf }, + diffRemoved { fg = p.rose }, + diffChanged { fg = p.water }, + diffOldFile { fg = p.rose, gui = "italic" }, + diffNewFile { fg = p.leaf, gui = "italic" }, + diffFile { fg = p.wood, gui = "bold" }, + diffLine { fg = p.blossom, gui = "bold" }, + diffIndexLine { fg = p.wood }, markdownH1 { Statement, gui = "bold,underline" }, markdownH2 { Statement }, @@ -279,40 +279,40 @@ local theme = lush(function() helpOption { Constant }, -- Other plugins - GitSignsAdd { fg = c.leaf }, - GitSignsChange { fg = c.water }, - GitSignsDelete { fg = c.rose }, + GitSignsAdd { fg = p.leaf }, + GitSignsChange { fg = p.water }, + GitSignsDelete { fg = p.rose }, GitGutterAdd { GitSignsAdd }, GitGutterChange { GitSignsChange }, GitGutterDelete { GitSignsDelete }, - IndentBlanklineChar { fg = c.sand.da(12).de(20) }, + IndentBlanklineChar { fg = p.sand.da(12).de(20) }, TelescopeSelection { CursorLine }, - TelescopeSelectionCaret { TelescopeSelection, fg = c.rose }, - TelescopeMatching { fg = c.blossom, gui = "bold" }, + TelescopeSelectionCaret { TelescopeSelection, fg = p.rose }, + TelescopeMatching { fg = p.blossom, gui = "bold" }, TelescopeBorder { FloatBorder }, Sneak { Search }, SneakLabel { WildMenu }, - SneakLabelMask { bg = c.blossom, fg = c.blossom }, + SneakLabelMask { bg = p.blossom, fg = p.blossom }, - LightspeedLabel { fg = c.blossom, gui = "bold,underline" }, - LightspeedLabelOverlapped { fg = c.blossom, gui = "underline" }, - LightspeedLabelDistant { fg = c.sky, gui = "bold,underline" }, - LightspeedLabelDistantOverlapped { fg = c.sky, gui = "underline" }, + LightspeedLabel { fg = p.blossom, gui = "bold,underline" }, + LightspeedLabelOverlapped { fg = p.blossom, gui = "underline" }, + LightspeedLabelDistant { fg = p.sky, gui = "bold,underline" }, + LightspeedLabelDistantOverlapped { fg = p.sky, gui = "underline" }, LightspeedShortcut { SneakLabel, gui = "bold,underline" }, LightspeedOneCharMatch { SneakLabel, gui = "bold" }, LightspeedMaskedChar { Conceal }, LightspeedUnlabeledMatch { Bold }, LightspeedPendingOpArea { SneakLabel }, - LightspeedPendingChangeOpArea { fg = c.blossom }, + LightspeedPendingChangeOpArea { fg = p.blossom }, LightspeedGreyWash { fg = Comment.fg }, HopNextKey { LightspeedLabel }, HopNextKey1 { LightspeedLabelDistant }, - HopNextKey2 { fg = c.water }, + HopNextKey2 { fg = p.water }, HopUnmatched { LightspeedGreyWash } , BufferCurrent { TabLineSel }, @@ -332,7 +332,7 @@ local theme = lush(function() CocWarningVitualText { LspDiagnosticsVirtualTextWarning }, CocSelectedText { SpellBad }, CocCodeLens { LineNr }, - CocMarkdownLink { fg = c.sky, gui = "underline" }, + CocMarkdownLink { fg = p.sky, gui = "underline" }, NeogitNotificationError { LspDiagnosticsDefaultError }, NeogitNotificationWarning { LspDiagnosticsDefaultWarning }, @@ -342,7 +342,7 @@ local theme = lush(function() NeogitDiffDeleteHighlight { DiffDelete }, NeogitDiffAddHighlight { DiffAdd }, NeogitHunkHeader { LineNr }, - NeogitHunkHeaderHighlight { CursorLine, fg = c.stone, gui = "bold" }, + NeogitHunkHeaderHighlight { CursorLine, fg = p.stone, gui = "bold" }, WhichKey { Statement }, WhichKeyGroup { Special }, diff --git a/lua/zenbones/terminal.lua b/lua/zenbones/terminal.lua index 0252760..af8b446 100644 --- a/lua/zenbones/terminal.lua +++ b/lua/zenbones/terminal.lua @@ -1,23 +1,23 @@ local lush = require "lush" -local c = require "zenbones.palette" +local p = require "zenbones.palette" local colors = { - c.stone, - c.rose, - c.leaf, - c.wood, - c.water, - c.blossom, - c.sky, - c.sand, - c.stone.li(16), - c.rose.sa(20).da(10), - c.leaf.sa(20).da(10), - c.wood.sa(18).da(10), - c.water.sa(20).da(10), - c.blossom.sa(24).da(10), - c.sky.sa(20).da(10), - c.sand.sa(4).da(10), + p.stone, + p.rose, + p.leaf, + p.wood, + p.water, + p.blossom, + p.sky, + p.sand, + p.stone.li(16), + p.rose.sa(20).da(10), + p.leaf.sa(20).da(10), + p.wood.sa(18).da(10), + p.water.sa(20).da(10), + p.blossom.sa(24).da(10), + p.sky.sa(20).da(10), + p.sand.sa(4).da(10), } local M = {} diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index c220112..1ca65de 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -1,7 +1,7 @@ local lush = require "lush" -local c = require "zenflesh.palette" +local p = require "zenflesh.palette" -local normal_bg = c.sand +local normal_bg = p.sand local diff_bg_l = 0 local darkness = vim.g.zenflesh_darkness @@ -33,20 +33,20 @@ local theme = lush(function() -- styling for that group (meaning they mostly get styled as Normal) -- or leave them commented to apply vims default colouring or linking. - Normal { bg = normal_bg, fg = c.stone }, -- normal text + Normal { bg = normal_bg, fg = p.stone }, -- normal text Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links Bold { gui = "bold" }, Italic { gui = "italic" }, - Error { fg = c.rose }, -- (preferred) any erroneous construct + Error { fg = p.rose }, -- (preferred) any erroneous construct ErrorMsg { Error }, -- error messages on the command line - WarningMsg { fg = c.wood }, -- warning messages + WarningMsg { fg = p.wood }, -- warning messages - Comment { fg = c.sand.li(32).de(48), gui = (italic_comments and "italic" or "NONE") }, -- any comment - Conceal { fg = c.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Comment { fg = p.sand.li(32).de(48), gui = (italic_comments and "italic" or "NONE") }, -- any comment + Conceal { fg = p.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor { bg = c.stone.li(20), fg = c.sand.da(20) }, -- character under the cursor + Cursor { bg = p.stone.li(20), fg = p.sand.da(20) }, -- character under the cursor lCursor { Cursor, bg = Cursor.bg.da(35) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| TermCursor { Cursor }, -- cursor in a focused terminal @@ -54,33 +54,33 @@ local theme = lush(function() CursorLine { bg = Normal.bg.li(4) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - ColorColumn { bg = c.wood.de(40).da(28) }, -- used for the columns set with 'colorcolumn' + ColorColumn { bg = p.wood.de(40).da(32) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = c.leaf.de(14).da(52).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = c.water.de(20).da(45).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = c.rose.de(26).da(47).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = c.water.de(22).da(28).abs_da(diff_bg_l), fg = c.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = p.leaf.de(14).da(52).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = p.water.de(20).da(45).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = p.rose.de(26).da(47).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = p.water.de(22).da(28).abs_da(diff_bg_l), fg = p.stone }, -- diff mode: Changed text within a changed line |diff.txt| - LineNr { fg = Normal.bg.li(28) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + LineNr { fg = Normal.bg.li(30) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' - Folded { bg = Normal.bg.li(14), fg = Normal.bg.li(64) }, -- line used for closed folds - CursorLineNr { LineNr, fg = c.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + Folded { bg = Normal.bg.li(14), fg = Normal.bg.li(58) }, -- line used for closed folds + CursorLineNr { LineNr, fg = p.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") -- MsgArea { }, -- Area for messages and cmdline -- MsgSeparator { }, -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg { fg = c.leaf, gui = "bold" }, -- |more-prompt| - NormalFloat { bg = Normal.bg.li(6) }, -- Normal text in floating windows. - FloatBorder { fg = Normal.bg.li(50) }, -- Normal text in floating windows. + MoreMsg { fg = p.leaf, gui = "bold" }, -- |more-prompt| + NormalFloat { bg = Normal.bg.li(8) }, -- Normal text in floating windows. + FloatBorder { fg = Normal.bg.li(46) }, -- Normal text in floating windows. - Pmenu { bg = Normal.bg.li(10) }, -- Popup menu: normal item. - PmenuSel { bg = Normal.bg.li(16) }, -- Popup menu: selected item. - PmenuSbar { bg = Normal.bg.li(24) }, -- Popup menu: scrollbar. - PmenuThumb { bg = Normal.bg.li(48) }, -- Popup menu: Thumb of the scrollbar. + Pmenu { bg = Normal.bg.li(12) }, -- Popup menu: normal item. + PmenuSel { bg = Normal.bg.li(18) }, -- Popup menu: selected item. + PmenuSbar { bg = Normal.bg.li(26) }, -- Popup menu: scrollbar. + PmenuThumb { bg = Normal.bg.li(50) }, -- Popup menu: Thumb of the scrollbar. - Search { bg = c.blossom.de(10).da(28), fg = c.sand }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch { bg = c.blossom, fg = c.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + Search { bg = p.blossom.de(12).da(32), fg = p.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch { bg = p.blossom, fg = p.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" -- Substitute { }, -- |:substitute| replacement text highlighting MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| -- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. @@ -88,24 +88,24 @@ local theme = lush(function() SpellBad { fg = Error.fg.de(30), gui = "undercurl", guisp = Error.fg }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. SpellCap { SpellBad, guisp = Error.fg.da(10) }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. - SpellRare { SpellBad, guisp = c.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + SpellRare { SpellBad, guisp = p.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine { bg = c.sand.li(14), fg = c.stone }, -- status line of current window - StatusLineNC { bg = c.sand.li(10), fg = c.stone.li(28) }, -- 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 { bg = p.sand.li(16), fg = p.stone }, -- status line of current window + StatusLineNC { bg = p.sand.li(11), fg = p.stone.li(28) }, -- 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 { StatusLine, gui = "italic" }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label VertSplit { LineNr }, -- the column separating vertically split windows - Visual { bg = c.stone.sa(24).da(68) }, -- Visual mode selection + Visual { bg = p.stone.sa(24).da(68) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". - NonText { fg = Normal.bg.li(22) }, -- '@' 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|. + NonText { fg = Normal.bg.li(26) }, -- '@' 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|. SpecialKey { NonText, gui = "italic" }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| Whitespace { NonText }, -- "nbsp", "space", "tab" and "trail" in 'listchars' EndOfBuffer { NonText }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. - WildMenu { bg = c.blossom, fg = c.sand }, -- current match in 'wildmenu' completion + WildMenu { bg = p.blossom, fg = p.sand }, -- current match in 'wildmenu' completion Directory { gui = "bold" }, -- directory names (and other special names in listings) Question { MoreMsg }, -- |hit-enter| prompt and yes/no questions Title { gui = "bold" }, -- titles for output from ":set all", ":autocmd" etc. @@ -117,17 +117,17 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = c.stone.da(27), gui = "italic" }, -- (preferred) any constant + Constant { fg = p.stone.da(27), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' Number { gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 - Identifier { fg = c.stone.da(16) }, -- (preferred) any variable name - Function { fg = c.stone }, -- function name (also: methods for classes) + Identifier { fg = p.stone.da(16) }, -- (preferred) any variable name + Function { fg = p.stone }, -- function name (also: methods for classes) - Statement { fg = c.stone, gui = "bold" }, -- (preferred) any statement + Statement { fg = p.stone, gui = "bold" }, -- (preferred) any statement -- Conditional { }, -- if, then, else, endif, switch, etc. -- Repeat { }, -- for, do, while, etc. -- Label { }, -- case, default, etc. @@ -141,15 +141,15 @@ local theme = lush(function() -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - Type { fg = c.sand.de(24).li(58) }, -- (preferred) int, long, char, etc. + Type { fg = p.sand.de(29).li(56) }, -- (preferred) int, long, char, etc. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = c.stone.da(18), gui = "bold" }, -- (preferred) any special symbol + Special { fg = p.stone.da(18), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = c.sand.de(18).li(42) }, -- character that needs attention + Delimiter { fg = p.sand.de(20).li(42) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements @@ -168,11 +168,11 @@ local theme = lush(function() LspDiagnosticsDefaultError { Error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultWarning { WarningMsg }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultInformation { fg = c.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultHint { fg = c.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultInformation { fg = p.water }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultHint { fg = p.blossom }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = c.rose.abs_de(48).da(68) }, -- Used for "Error" diagnostic virtual text - LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = c.wood.de(58).da(68) }, -- Used for "Warning" diagnostic virtual text + LspDiagnosticsVirtualTextError { LspDiagnosticsDefaultError, bg = p.rose.abs_de(48).da(68) }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextWarning { LspDiagnosticsDefaultWarning, bg = p.wood.de(58).da(68) }, -- Used for "Warning" diagnostic virtual text -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text @@ -256,14 +256,14 @@ local theme = lush(function() TSDanger { Error }, -- Syntax - diffAdded { fg = c.leaf }, - diffRemoved { fg = c.rose }, - diffChanged { fg = c.water }, - diffOldFile { fg = c.rose, gui = "italic" }, - diffNewFile { fg = c.leaf, gui = "italic" }, - diffFile { fg = c.wood, gui = "bold" }, - diffLine { fg = c.blossom, gui = "bold" }, - diffIndexLine { fg = c.wood }, + diffAdded { fg = p.leaf }, + diffRemoved { fg = p.rose }, + diffChanged { fg = p.water }, + diffOldFile { fg = p.rose, gui = "italic" }, + diffNewFile { fg = p.leaf, gui = "italic" }, + diffFile { fg = p.wood, gui = "bold" }, + diffLine { fg = p.blossom, gui = "bold" }, + diffIndexLine { fg = p.wood }, markdownH1 { Statement, gui = "bold,underline" }, markdownH2 { Statement }, @@ -280,40 +280,40 @@ local theme = lush(function() helpOption { Constant }, -- Other plugins - GitSignsAdd { fg = c.leaf }, - GitSignsChange { fg = c.water }, - GitSignsDelete { fg = c.rose }, + GitSignsAdd { fg = p.leaf }, + GitSignsChange { fg = p.water }, + GitSignsDelete { fg = p.rose }, GitGutterAdd { GitSignsAdd }, GitGutterChange { GitSignsChange }, GitGutterDelete { GitSignsDelete }, - IndentBlanklineChar { fg = c.sand.da(12).de(20) }, + IndentBlanklineChar { fg = p.sand.li(14).de(22) }, TelescopeSelection { CursorLine }, - TelescopeSelectionCaret { TelescopeSelection, fg = c.rose }, - TelescopeMatching { fg = c.blossom, gui = "bold" }, + TelescopeSelectionCaret { TelescopeSelection, fg = p.rose }, + TelescopeMatching { fg = p.blossom, gui = "bold" }, TelescopeBorder { FloatBorder }, Sneak { Search }, SneakLabel { WildMenu }, - SneakLabelMask { bg = c.blossom, fg = c.blossom }, + SneakLabelMask { bg = p.blossom, fg = p.blossom }, - LightspeedLabel { fg = c.blossom, gui = "bold,underline" }, - LightspeedLabelOverlapped { fg = c.blossom, gui = "underline" }, - LightspeedLabelDistant { fg = c.sky, gui = "bold,underline" }, - LightspeedLabelDistantOverlapped { fg = c.sky, gui = "underline" }, + LightspeedLabel { fg = p.blossom, gui = "bold,underline" }, + LightspeedLabelOverlapped { fg = p.blossom, gui = "underline" }, + LightspeedLabelDistant { fg = p.sky, gui = "bold,underline" }, + LightspeedLabelDistantOverlapped { fg = p.sky, gui = "underline" }, LightspeedShortcut { SneakLabel, gui = "bold,underline" }, LightspeedOneCharMatch { SneakLabel, gui = "bold" }, LightspeedMaskedChar { Conceal }, LightspeedUnlabeledMatch { Bold }, LightspeedPendingOpArea { SneakLabel }, - LightspeedPendingChangeOpArea { fg = c.blossom }, + LightspeedPendingChangeOpArea { fg = p.blossom }, LightspeedGreyWash { fg = Comment.fg }, HopNextKey { LightspeedLabel }, HopNextKey1 { LightspeedLabelDistant }, - HopNextKey2 { fg = c.water }, + HopNextKey2 { fg = p.water }, HopUnmatched { LightspeedGreyWash } , BufferCurrent { TabLineSel }, @@ -333,7 +333,7 @@ local theme = lush(function() CocWarningVitualText { LspDiagnosticsVirtualTextWarning }, CocSelectedText { SpellBad }, CocCodeLens { LineNr }, - CocMarkdownLink { fg = c.sky, gui = "underline" }, + CocMarkdownLink { fg = p.sky, gui = "underline" }, NeogitNotificationError { LspDiagnosticsDefaultError }, NeogitNotificationWarning { LspDiagnosticsDefaultWarning }, @@ -343,7 +343,7 @@ local theme = lush(function() NeogitDiffDeleteHighlight { DiffDelete }, NeogitDiffAddHighlight { DiffAdd }, NeogitHunkHeader { LineNr }, - NeogitHunkHeaderHighlight { CursorLine, fg = c.stone, gui = "bold" }, + NeogitHunkHeaderHighlight { CursorLine, fg = p.stone, gui = "bold" }, WhichKey { Statement }, WhichKeyGroup { Special }, diff --git a/lua/zenflesh/palette.lua b/lua/zenflesh/palette.lua index 61408b9..06cf72b 100644 --- a/lua/zenflesh/palette.lua +++ b/lua/zenflesh/palette.lua @@ -3,7 +3,7 @@ local hsluv = lush.hsluv return { sand = hsluv(39, 12, 8), - stone = hsluv(230, 8, 76), + stone = hsluv(230, 8, 75), leaf = hsluv(103, 63, 54), water = hsluv(236, 78, 53), rose = hsluv(4, 38, 53), diff --git a/lua/zenflesh/terminal.lua b/lua/zenflesh/terminal.lua index 40eb469..10814fa 100644 --- a/lua/zenflesh/terminal.lua +++ b/lua/zenflesh/terminal.lua @@ -1,23 +1,23 @@ local lush = require "lush" -local c = require "zenflesh.palette" +local p = require "zenflesh.palette" local colors = { - c.stone, - c.rose, - c.leaf, - c.wood, - c.water, - c.blossom, - c.sky, - c.sand, - c.stone.da(16), - c.rose.sa(20).li(10), - c.leaf.sa(20).li(10), - c.wood.sa(18).li(10), - c.water.sa(20).li(10), - c.blossom.sa(24).li(10), - c.sky.sa(20).li(10), - c.sand.sa(4).li(10), + p.stone, + p.rose, + p.leaf, + p.wood, + p.water, + p.blossom, + p.sky, + p.sand, + p.stone.da(16), + p.rose.sa(20).li(10), + p.leaf.sa(20).li(10), + p.wood.sa(18).li(10), + p.water.sa(20).li(10), + p.blossom.sa(24).li(10), + p.sky.sa(20).li(10), + p.sand.sa(4).li(10), } local M = {} From 193f68089eba10c5428a554208fd6073422ae205 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 14:51:22 +0800 Subject: [PATCH 34/53] regenerate zenflesh colors --- autoload/lightline/colorscheme/zenflesh.vim | 26 ++++---- colors/zenflesh.vim | 68 ++++++++++----------- extras/alacritty/zenflesh.yml | 6 +- extras/kitty/zenflesh.conf | 18 +++--- extras/tmux/zenflesh.tmux | 4 +- extras/wezterm/Zenflesh.toml | 10 +-- lua/lualine/themes/zenflesh.lua | 14 ++--- 7 files changed, 73 insertions(+), 73 deletions(-) diff --git a/autoload/lightline/colorscheme/zenflesh.vim b/autoload/lightline/colorscheme/zenflesh.vim index 480499a..8d81f29 100644 --- a/autoload/lightline/colorscheme/zenflesh.vim +++ b/autoload/lightline/colorscheme/zenflesh.vim @@ -1,22 +1,22 @@ let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -let s:p.normal.left = [ [ "#AFA099", "#4D4542", "bold" ], [ "#AFA099", "#3C3633" ] ] -let s:p.normal.middle = [ [ "#B6BCC1", "#37312F" ] ] -let s:p.normal.right = [ [ "#AFA099", "#3C3633" ], [ "#AFA099", "#3C3633" ] ] +let s:p.normal.left = [ [ "#9E918A", "#514A46", "bold" ], [ "#9E918A", "#403A37" ] ] +let s:p.normal.middle = [ [ "#B3BABF", "#3C3633" ] ] +let s:p.normal.right = [ [ "#9E918A", "#403A37" ], [ "#9E918A", "#403A37" ] ] let s:p.normal.warning = [ [ "#B86E54", "#352723" ] ] let s:p.normal.error = [ [ "#BB6572", "#2A2A2A" ] ] -let s:p.inactive.left = [ [ "#CBCFD3", "#2E2927" ], [ "#CBCFD3", "#2E2927" ] ] -let s:p.inactive.middle = [ [ "#CBCFD3", "#2E2927" ] ] -let s:p.inactive.right = [ [ "#CBCFD3", "#2E2927" ] ] +let s:p.inactive.left = [ [ "#C8CDD0", "#302B29" ], [ "#C8CDD0", "#302B29" ] ] +let s:p.inactive.middle = [ [ "#C8CDD0", "#302B29" ] ] +let s:p.inactive.right = [ [ "#C8CDD0", "#302B29" ] ] -let s:p.insert.left = [ [ "#AFA099", "#384126", "bold" ], [ "#AFA099", "#3C3633" ] ] -let s:p.replace.left = [ [ "#AFA099", "#5D383D", "bold" ], [ "#AFA099", "#3C3633" ] ] -let s:p.visual.left = [ [ "#AFA099", "#303B41", "bold" ], [ "#AFA099", "#3C3633" ] ] +let s:p.insert.left = [ [ "#9E918A", "#384126", "bold" ], [ "#9E918A", "#403A37" ] ] +let s:p.replace.left = [ [ "#9E918A", "#5D383D", "bold" ], [ "#9E918A", "#403A37" ] ] +let s:p.visual.left = [ [ "#9E918A", "#303B41", "bold" ], [ "#9E918A", "#403A37" ] ] -let s:p.tabline.left = [ [ "#B6BCC1", "#3C3633", "italic" ] ] -let s:p.tabline.middle = [ [ "#CBCFD3", "#2E2927" ] ] -let s:p.tabline.right = [ [ "#B6BCC1", "#3C3633" ] ] -let s:p.tabline.tabsel = [ [ "#B6BCC1", "#1A1715", "bold" ] ] +let s:p.tabline.left = [ [ "#B3BABF", "#403A37", "italic" ] ] +let s:p.tabline.middle = [ [ "#C8CDD0", "#302B29" ] ] +let s:p.tabline.right = [ [ "#B3BABF", "#403A37" ] ] +let s:p.tabline.tabsel = [ [ "#B3BABF", "#1A1715", "bold" ] ] let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p) diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index d9434a2..a19974b 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -7,7 +7,7 @@ endif set background=dark let g:colors_name = 'zenflesh' -let g:terminal_color_0 = '#B6BCC1' +let g:terminal_color_0 = '#B3BABF' let g:terminal_color_1 = '#BB6572' let g:terminal_color_2 = '#75884C' let g:terminal_color_3 = '#B86E54' @@ -15,7 +15,7 @@ let g:terminal_color_4 = '#4185AE' let g:terminal_color_5 = '#AC75A1' let g:terminal_color_6 = '#4F969E' let g:terminal_color_7 = '#1A1715' -let g:terminal_color_8 = '#969CA0' +let g:terminal_color_8 = '#93999E' let g:terminal_color_9 = '#D16D7D' let g:terminal_color_10 = '#7F974C' let g:terminal_color_11 = '#D07654' @@ -46,39 +46,39 @@ if has('terminal') endif highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight BufferVisible guifg=#CBCFD3 guibg=NONE guisp=NONE gui=NONE -highlight BufferVisibleIndex guifg=#CBCFD3 guibg=NONE guisp=NONE gui=NONE -highlight BufferVisibleSign guifg=#CBCFD3 guibg=NONE guisp=NONE gui=NONE +highlight BufferVisible guifg=#C8CDD0 guibg=NONE guisp=NONE gui=NONE +highlight BufferVisibleIndex guifg=#C8CDD0 guibg=NONE guisp=NONE gui=NONE +highlight BufferVisibleSign guifg=#C8CDD0 guibg=NONE guisp=NONE gui=NONE highlight CocErrorHighlight guifg=#BB6572 guibg=NONE guisp=NONE gui=underline highlight CocHintHighlight guifg=#AC75A1 guibg=NONE guisp=NONE gui=underline highlight CocInfoHighlight guifg=#4185AE guibg=NONE guisp=NONE gui=underline highlight CocMarkdownLink guifg=#4F969E guibg=NONE guisp=NONE gui=underline highlight CocWarningHighlight guifg=#B86E54 guibg=NONE guisp=NONE gui=underline -highlight ColorColumn guifg=NONE guibg=#775349 guisp=NONE gui=NONE +highlight ColorColumn guifg=NONE guibg=#714F45 guisp=NONE gui=NONE highlight Comment guifg=#5B5654 guibg=NONE guisp=NONE gui=italic -highlight Conceal guifg=#8E9498 guibg=NONE guisp=NONE gui=bold,italic +highlight Conceal guifg=#8C9196 guibg=NONE guisp=NONE gui=bold,italic highlight Constant guifg=#7F8488 guibg=NONE guisp=NONE gui=italic -highlight Cursor guifg=#161311 guibg=#C5CACE guisp=NONE gui=NONE +highlight Cursor guifg=#161311 guibg=#C2C7CB guisp=NONE gui=NONE highlight CursorLine guifg=NONE guibg=#231F1D guisp=NONE gui=NONE -highlight CursorLineNr guifg=#B6BCC1 guibg=NONE guisp=NONE gui=bold +highlight CursorLineNr guifg=#B3BABF guibg=NONE guisp=NONE gui=bold highlight Delimiter guifg=#776E69 guibg=NONE guisp=NONE gui=NONE highlight DiffAdd guifg=NONE guibg=#384126 guisp=NONE gui=NONE highlight DiffChange guifg=NONE guibg=#2C475B guisp=NONE gui=NONE highlight DiffDelete guifg=NONE guibg=#5D383D guisp=NONE gui=NONE -highlight DiffText guifg=#B6BCC1 guibg=#3B5D75 guisp=NONE gui=NONE +highlight DiffText guifg=#B3BABF guibg=#3B5D75 guisp=NONE gui=NONE highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold highlight Error guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE -highlight FloatBorder guifg=#8B7F79 guibg=NONE guisp=NONE gui=NONE -highlight FoldColumn guifg=#564E4A guibg=NONE guisp=NONE gui=bold -highlight Folded guifg=#AFA099 guibg=#37312F guisp=NONE gui=NONE -highlight Function guifg=#B6BCC1 guibg=NONE guisp=NONE gui=NONE +highlight FloatBorder guifg=#80756F guibg=NONE guisp=NONE gui=NONE +highlight FoldColumn guifg=#5C534F guibg=NONE guisp=NONE gui=bold +highlight Folded guifg=#9E918A guibg=#37312F guisp=NONE gui=NONE +highlight Function guifg=#B3BABF guibg=NONE guisp=NONE gui=NONE highlight GitSignsAdd guifg=#75884C guibg=NONE guisp=NONE gui=NONE highlight GitSignsChange guifg=#4185AE guibg=NONE guisp=NONE gui=NONE highlight GitSignsDelete guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE highlight HopNextKey2 guifg=#4185AE guibg=NONE guisp=NONE gui=NONE -highlight Identifier guifg=#969CA0 guibg=NONE guisp=NONE gui=NONE +highlight Identifier guifg=#93999E guibg=NONE guisp=NONE gui=NONE highlight IncSearch guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold -highlight IndentBlanklineChar guifg=#181514 guibg=NONE guisp=NONE gui=NONE +highlight IndentBlanklineChar guifg=#363230 guibg=NONE guisp=NONE gui=NONE highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic highlight LightspeedGreyWash guifg=#5B5654 guibg=NONE guisp=NONE gui=NONE highlight LightspeedLabel guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold,underline @@ -88,7 +88,7 @@ highlight LightspeedLabelOverlapped guifg=#AC75A1 guibg=NONE guisp=NONE gui=unde highlight LightspeedOneCharMatch guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold highlight LightspeedPendingChangeOpArea guifg=#AC75A1 guibg=NONE guisp=NONE gui=NONE highlight LightspeedShortcut guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold,underline -highlight LineNr guifg=#564E4A guibg=NONE guisp=NONE gui=NONE +highlight LineNr guifg=#5C534F guibg=NONE guisp=NONE gui=NONE highlight LspDiagnosticsDefaultHint guifg=#AC75A1 guibg=NONE guisp=NONE gui=NONE highlight LspDiagnosticsDefaultInformation guifg=#4185AE guibg=NONE guisp=NONE gui=NONE highlight LspDiagnosticsUnderlineError guifg=#BB6572 guibg=NONE guisp=NONE gui=undercurl @@ -98,33 +98,33 @@ highlight LspDiagnosticsUnderlineWarning guifg=#B86E54 guibg=NONE guisp=NONE gui highlight LspDiagnosticsVirtualTextError guifg=#BB6572 guibg=#2A2A2A guisp=NONE gui=NONE highlight LspDiagnosticsVirtualTextWarning guifg=#B86E54 guibg=#352723 guisp=NONE gui=NONE highlight MoreMsg guifg=#75884C guibg=NONE guisp=NONE gui=bold -highlight NeogitHunkHeaderHighlight guifg=#B6BCC1 guibg=#231F1D guisp=NONE gui=bold -highlight NonText guifg=#48413D guibg=NONE guisp=NONE gui=NONE -highlight Normal guifg=#B6BCC1 guibg=#1A1715 guisp=NONE gui=NONE -highlight NormalFloat guifg=NONE guibg=#272321 guisp=NONE gui=NONE +highlight NeogitHunkHeaderHighlight guifg=#B3BABF guibg=#231F1D guisp=NONE gui=bold +highlight NonText guifg=#514A46 guibg=NONE guisp=NONE gui=NONE +highlight Normal guifg=#B3BABF guibg=#1A1715 guisp=NONE gui=NONE +highlight NormalFloat guifg=NONE guibg=#292523 guisp=NONE gui=NONE highlight Number guifg=NONE guibg=NONE guisp=NONE gui=italic -highlight Pmenu guifg=NONE guibg=#2E2927 guisp=NONE gui=NONE -highlight PmenuSbar guifg=NONE guibg=#4D4542 guisp=NONE gui=NONE -highlight PmenuSel guifg=NONE guibg=#3C3633 guisp=NONE gui=NONE -highlight PmenuThumb guifg=NONE guibg=#867A74 guisp=NONE gui=NONE -highlight Search guifg=#1A1715 guibg=#775370 guisp=NONE gui=NONE +highlight Pmenu guifg=NONE guibg=#322D2B guisp=NONE gui=NONE +highlight PmenuSbar guifg=NONE guibg=#514A46 guisp=NONE gui=NONE +highlight PmenuSel guifg=NONE guibg=#403A37 guisp=NONE gui=NONE +highlight PmenuThumb guifg=NONE guibg=#8B7F79 guisp=NONE gui=NONE +highlight Search guifg=#B3BABF guibg=#714F6A guisp=NONE gui=NONE highlight SneakLabelMask guifg=#AC75A1 guibg=#AC75A1 guisp=NONE gui=NONE highlight Special guifg=#91979B guibg=NONE guisp=NONE gui=bold highlight SpecialComment guifg=#5B5654 guibg=NONE guisp=NONE gui=bold -highlight SpecialKey guifg=#48413D guibg=NONE guisp=NONE gui=italic +highlight SpecialKey guifg=#514A46 guibg=NONE guisp=NONE gui=italic highlight SpellBad guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl highlight SpellCap guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl highlight SpellRare guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl -highlight Statement guifg=#B6BCC1 guibg=NONE guisp=NONE gui=bold -highlight StatusLine guifg=#B6BCC1 guibg=#37312F guisp=NONE gui=NONE -highlight StatusLineNC guifg=#CBCFD3 guibg=#2E2927 guisp=NONE gui=NONE -highlight TabLine guifg=#B6BCC1 guibg=#37312F guisp=NONE gui=italic +highlight Statement guifg=#B3BABF guibg=NONE guisp=NONE gui=bold +highlight StatusLine guifg=#B3BABF guibg=#3C3633 guisp=NONE gui=NONE +highlight StatusLineNC guifg=#C8CDD0 guibg=#302B29 guisp=NONE gui=NONE +highlight TabLine guifg=#B3BABF guibg=#3C3633 guisp=NONE gui=italic highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold highlight TelescopeMatching guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold highlight TelescopeSelectionCaret guifg=#BB6572 guibg=#231F1D guisp=NONE gui=NONE highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline -highlight Type guifg=#9B918D guibg=NONE guisp=NONE gui=NONE +highlight Type guifg=#998F8A guibg=NONE guisp=NONE gui=NONE highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline highlight Visual guifg=NONE guibg=#303B41 guisp=NONE gui=NONE highlight WarningMsg guifg=#B86E54 guibg=NONE guisp=NONE gui=NONE @@ -137,8 +137,8 @@ highlight diffLine guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold highlight diffNewFile guifg=#75884C guibg=NONE guisp=NONE gui=italic highlight diffOldFile guifg=#BB6572 guibg=NONE guisp=NONE gui=italic highlight diffRemoved guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE -highlight lCursor guifg=#161311 guibg=#7A7F83 guisp=NONE gui=NONE -highlight markdownH1 guifg=#B6BCC1 guibg=NONE guisp=NONE gui=bold,underline +highlight lCursor guifg=#161311 guibg=#787D80 guisp=NONE gui=NONE +highlight markdownH1 guifg=#B3BABF guibg=NONE guisp=NONE gui=bold,underline highlight! link Boolean Number highlight! link BufferCurrent TabLineSel highlight! link CocCodeLens LineNr diff --git a/extras/alacritty/zenflesh.yml b/extras/alacritty/zenflesh.yml index aaf9b21..be02261 100644 --- a/extras/alacritty/zenflesh.yml +++ b/extras/alacritty/zenflesh.yml @@ -3,10 +3,10 @@ colors: # Default colors primary: background: '#1A1715' - foreground: '#B6BCC1' + foreground: '#B3BABF' # Normal colors normal: - black: '#B6BCC1' + black: '#B3BABF' red: '#BB6572' green: '#75884C' yellow: '#B86E54' @@ -16,7 +16,7 @@ colors: white: '#1A1715' # Bright colors bright: - black: '#969CA0' + black: '#93999E' red: '#D16D7D' green: '#7F974C' yellow: '#D07654' diff --git a/extras/kitty/zenflesh.conf b/extras/kitty/zenflesh.conf index 271e1ee..e0c46af 100644 --- a/extras/kitty/zenflesh.conf +++ b/extras/kitty/zenflesh.conf @@ -5,21 +5,21 @@ ## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenflesh.conf background #1A1715 -foreground #B6BCC1 +foreground #B3BABF selection_background #303B41 -selection_foreground #B6BCC1 +selection_foreground #B3BABF url_color #C873B8 -cursor #B6BCC1 +cursor #B3BABF # Tabs -active_tab_background #775370 -active_tab_foreground #B6BCC1 -inactive_tab_background #37312F -inactive_tab_foreground #B6BCC1 +active_tab_background #714F6A +active_tab_foreground #B3BABF +inactive_tab_background #3C3633 +inactive_tab_foreground #B3BABF #tab_bar_background ${tab_bar_background} # normal -color0 #B6BCC1 +color0 #B3BABF color1 #BB6572 color2 #75884C color3 #B86E54 @@ -29,7 +29,7 @@ color6 #4F969E color7 #1A1715 # bright -color8 #969CA0 +color8 #93999E color9 #D16D7D color10 #7F974C color11 #D07654 diff --git a/extras/tmux/zenflesh.tmux b/extras/tmux/zenflesh.tmux index 09fb42b..2f2169b 100644 --- a/extras/tmux/zenflesh.tmux +++ b/extras/tmux/zenflesh.tmux @@ -7,11 +7,11 @@ set -g window-status-current-style fg='#AC75A1',bg='#1A1715',bold set -g pane-border-style fg='#AC75A1' set -g pane-active-border-style fg='#AC75A1' -set -g message-style fg='#B6BCC1',bg='#303B41' +set -g message-style fg='#B3BABF',bg='#303B41' set -g display-panes-active-colour '#AC75A1' set -g display-panes-colour '#AC75A1' set -g clock-mode-colour '#AC75A1' -set -g mode-style fg='#B6BCC1',bg='#303B41' +set -g mode-style fg='#B3BABF',bg='#303B41' diff --git a/extras/wezterm/Zenflesh.toml b/extras/wezterm/Zenflesh.toml index 842a670..8f2794b 100644 --- a/extras/wezterm/Zenflesh.toml +++ b/extras/wezterm/Zenflesh.toml @@ -1,12 +1,12 @@ # Zenflesh [colors] -foreground = "#B6BCC1" +foreground = "#B3BABF" background = "#1A1715" -cursor_bg = "#C5CACE" +cursor_bg = "#C2C7CB" cursor_border = "#161311" cursor_fg = "#161311" selection_bg = "#303B41" -selection_fg = "#B6BCC1" +selection_fg = "#B3BABF" -ansi = ["#B6BCC1", "#BB6572", "#75884C", "#B86E54", "#4185AE", "#AC75A1", "#4F969E", "#1A1715"] -brights = ["#969CA0", "#D16D7D", "#7F974C", "#D07654", "#4293C2", "#C873B8", "#4CA2AC", "#2F2925"] +ansi = ["#B3BABF", "#BB6572", "#75884C", "#B86E54", "#4185AE", "#AC75A1", "#4F969E", "#1A1715"] +brights = ["#93999E", "#D16D7D", "#7F974C", "#D07654", "#4293C2", "#C873B8", "#4CA2AC", "#2F2925"] diff --git a/lua/lualine/themes/zenflesh.lua b/lua/lualine/themes/zenflesh.lua index a319145..dedb902 100644 --- a/lua/lualine/themes/zenflesh.lua +++ b/lua/lualine/themes/zenflesh.lua @@ -1,12 +1,12 @@ -local common_fg = "#AFA099" -local inactive_bg = "#2E2927" -local inactive_fg = "#CBCFD3" +local common_fg = "#9E918A" +local inactive_bg = "#302B29" +local inactive_fg = "#C8CDD0" return { normal = { - a = { bg = "#4D4542", fg = common_fg, gui = "bold" }, - b = { bg = "#3C3633", fg = common_fg }, - c = { bg = "#37312F", fg = "#B6BCC1" }, + a = { bg = "#514A46", fg = common_fg, gui = "bold" }, + b = { bg = "#403A37", fg = common_fg }, + c = { bg = "#3C3633", fg = "#B3BABF" }, }, insert = { @@ -14,7 +14,7 @@ return { }, command = { - a = { bg = "#775370", fg = common_fg, gui = "bold" }, + a = { bg = "#714F6A", fg = common_fg, gui = "bold" }, }, visual = { From 052cbf8426d9ee6f891cbf63c29401247e9e26c0 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 14:52:31 +0800 Subject: [PATCH 35/53] use panvimdoc@v2.7.0 --- .github/workflows/doc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index fb3e4fc..36d42a1 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v2 - name: panvimdoc - uses: kdheepak/panvimdoc@v2.6.0 + uses: kdheepak/panvimdoc@v2.7.1 with: # Output vimdoc project name vimdoc: zenbones From 178aa8861627a49c7bd6fe69609064cc58953aa5 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 16:07:08 +0800 Subject: [PATCH 36/53] reverse terminal white and black --- README.md | 2 +- colors/zenbones.vim | 8 ++++---- colors/zenflesh.vim | 8 ++++---- extras/alacritty/zenbones.yml | 8 ++++---- extras/alacritty/zenflesh.yml | 8 ++++---- extras/kitty/zenbones.conf | 10 +++++----- extras/kitty/zenflesh.conf | 10 +++++----- extras/tmux/zenbones.tmux | 8 ++++---- extras/tmux/zenflesh.tmux | 8 ++++---- extras/wezterm/Zenbones.toml | 4 ++-- extras/wezterm/Zenflesh.toml | 4 ++-- lua/zenbones/build/kitty.lua | 2 +- lua/zenbones/terminal.lua | 8 ++++---- lua/zenflesh/terminal.lua | 8 ++++---- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index b5acb7f..ca28499 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zenbones +# Zenflesh, Zenbones Zenbones is a light vim/neovim [colorscheme](https://neovim.io/doc/user/syntax.html#:colorscheme) designed to diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 3fa16d2..197fab2 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -7,22 +7,22 @@ endif set background=light let g:colors_name = 'zenbones' -let g:terminal_color_0 = '#2C363C' +let g:terminal_color_0 = '#F0EDEC' let g:terminal_color_1 = '#A8334C' let g:terminal_color_2 = '#617437' let g:terminal_color_3 = '#944927' let g:terminal_color_4 = '#286486' let g:terminal_color_5 = '#88507D' let g:terminal_color_6 = '#3B8992' -let g:terminal_color_7 = '#F0EDEC' -let g:terminal_color_8 = '#44525B' +let g:terminal_color_7 = '#2C363C' +let g:terminal_color_8 = '#DCD2CE' let g:terminal_color_9 = '#9C2842' let g:terminal_color_10 = '#55672A' let g:terminal_color_11 = '#87411E' let g:terminal_color_12 = '#1F5A7A' let g:terminal_color_13 = '#864079' let g:terminal_color_14 = '#2F7C85' -let g:terminal_color_15 = '#DCD2CE' +let g:terminal_color_15 = '#44525B' if has('terminal') let g:terminal_ansi_colors = [ diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index a19974b..09f310a 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -7,22 +7,22 @@ endif set background=dark let g:colors_name = 'zenflesh' -let g:terminal_color_0 = '#B3BABF' +let g:terminal_color_0 = '#1A1715' let g:terminal_color_1 = '#BB6572' let g:terminal_color_2 = '#75884C' let g:terminal_color_3 = '#B86E54' let g:terminal_color_4 = '#4185AE' let g:terminal_color_5 = '#AC75A1' let g:terminal_color_6 = '#4F969E' -let g:terminal_color_7 = '#1A1715' -let g:terminal_color_8 = '#93999E' +let g:terminal_color_7 = '#B3BABF' +let g:terminal_color_8 = '#2F2925' let g:terminal_color_9 = '#D16D7D' let g:terminal_color_10 = '#7F974C' let g:terminal_color_11 = '#D07654' let g:terminal_color_12 = '#4293C2' let g:terminal_color_13 = '#C873B8' let g:terminal_color_14 = '#4CA2AC' -let g:terminal_color_15 = '#2F2925' +let g:terminal_color_15 = '#93999E' if has('terminal') let g:terminal_ansi_colors = [ diff --git a/extras/alacritty/zenbones.yml b/extras/alacritty/zenbones.yml index 611671a..b3c9056 100644 --- a/extras/alacritty/zenbones.yml +++ b/extras/alacritty/zenbones.yml @@ -6,21 +6,21 @@ colors: foreground: '#2C363C' # Normal colors normal: - black: '#2C363C' + black: '#F0EDEC' red: '#A8334C' green: '#617437' yellow: '#944927' blue: '#286486' magenta: '#88507D' cyan: '#3B8992' - white: '#F0EDEC' + white: '#2C363C' # Bright colors bright: - black: '#44525B' + black: '#DCD2CE' red: '#9C2842' green: '#55672A' yellow: '#87411E' blue: '#1F5A7A' magenta: '#864079' cyan: '#2F7C85' - white: '#DCD2CE' + white: '#44525B' diff --git a/extras/alacritty/zenflesh.yml b/extras/alacritty/zenflesh.yml index be02261..2a50e4c 100644 --- a/extras/alacritty/zenflesh.yml +++ b/extras/alacritty/zenflesh.yml @@ -6,21 +6,21 @@ colors: foreground: '#B3BABF' # Normal colors normal: - black: '#B3BABF' + black: '#1A1715' red: '#BB6572' green: '#75884C' yellow: '#B86E54' blue: '#4185AE' magenta: '#AC75A1' cyan: '#4F969E' - white: '#1A1715' + white: '#B3BABF' # Bright colors bright: - black: '#93999E' + black: '#2F2925' red: '#D16D7D' green: '#7F974C' yellow: '#D07654' blue: '#4293C2' magenta: '#C873B8' cyan: '#4CA2AC' - white: '#2F2925' + white: '#93999E' diff --git a/extras/kitty/zenbones.conf b/extras/kitty/zenbones.conf index 10ab2e4..c63ff23 100644 --- a/extras/kitty/zenbones.conf +++ b/extras/kitty/zenbones.conf @@ -8,7 +8,7 @@ background #F0EDEC foreground #2C363C selection_background #D2DFE7 selection_foreground #2C363C -url_color #864079 +url_color #1F5A7A cursor #2C363C # Tabs @@ -19,21 +19,21 @@ inactive_tab_foreground #2C363C #tab_bar_background ${tab_bar_background} # normal -color0 #2C363C +color0 #F0EDEC color1 #A8334C color2 #617437 color3 #944927 color4 #286486 color5 #88507D color6 #3B8992 -color7 #F0EDEC +color7 #2C363C # bright -color8 #44525B +color8 #DCD2CE color9 #9C2842 color10 #55672A color11 #87411E color12 #1F5A7A color13 #864079 color14 #2F7C85 -color15 #DCD2CE +color15 #44525B diff --git a/extras/kitty/zenflesh.conf b/extras/kitty/zenflesh.conf index e0c46af..0c4a789 100644 --- a/extras/kitty/zenflesh.conf +++ b/extras/kitty/zenflesh.conf @@ -8,7 +8,7 @@ background #1A1715 foreground #B3BABF selection_background #303B41 selection_foreground #B3BABF -url_color #C873B8 +url_color #4293C2 cursor #B3BABF # Tabs @@ -19,21 +19,21 @@ inactive_tab_foreground #B3BABF #tab_bar_background ${tab_bar_background} # normal -color0 #B3BABF +color0 #1A1715 color1 #BB6572 color2 #75884C color3 #B86E54 color4 #4185AE color5 #AC75A1 color6 #4F969E -color7 #1A1715 +color7 #B3BABF # bright -color8 #93999E +color8 #2F2925 color9 #D16D7D color10 #7F974C color11 #D07654 color12 #4293C2 color13 #C873B8 color14 #4CA2AC -color15 #2F2925 +color15 #93999E diff --git a/extras/tmux/zenbones.tmux b/extras/tmux/zenbones.tmux index 9ecac50..f1aacde 100644 --- a/extras/tmux/zenbones.tmux +++ b/extras/tmux/zenbones.tmux @@ -1,17 +1,17 @@ set -g status-left ' #[fg=#88507D,bold]#{s/root//:client_key_table} ' set -g status-right '#[fg=#88507D,bold] [#S]#[fg=#88507D,bold] [%d/%m] #[fg=#88507D,bold][%I:%M%p] ' -set -g status-style fg='#88507D',bg='#F0EDEC' +set -g status-style fg='#88507D',bg='#2C363C' -set -g window-status-current-style fg='#88507D',bg='#F0EDEC',bold +set -g window-status-current-style fg='#88507D',bg='#2C363C',bold set -g pane-border-style fg='#88507D' set -g pane-active-border-style fg='#88507D' -set -g message-style fg='#2C363C',bg='#D2DFE7' +set -g message-style fg='#F0EDEC',bg='#D2DFE7' set -g display-panes-active-colour '#88507D' set -g display-panes-colour '#88507D' set -g clock-mode-colour '#88507D' -set -g mode-style fg='#2C363C',bg='#D2DFE7' +set -g mode-style fg='#F0EDEC',bg='#D2DFE7' diff --git a/extras/tmux/zenflesh.tmux b/extras/tmux/zenflesh.tmux index 2f2169b..bdb8db6 100644 --- a/extras/tmux/zenflesh.tmux +++ b/extras/tmux/zenflesh.tmux @@ -1,17 +1,17 @@ set -g status-left ' #[fg=#AC75A1,bold]#{s/root//:client_key_table} ' set -g status-right '#[fg=#AC75A1,bold] [#S]#[fg=#AC75A1,bold] [%d/%m] #[fg=#AC75A1,bold][%I:%M%p] ' -set -g status-style fg='#AC75A1',bg='#1A1715' +set -g status-style fg='#AC75A1',bg='#B3BABF' -set -g window-status-current-style fg='#AC75A1',bg='#1A1715',bold +set -g window-status-current-style fg='#AC75A1',bg='#B3BABF',bold set -g pane-border-style fg='#AC75A1' set -g pane-active-border-style fg='#AC75A1' -set -g message-style fg='#B3BABF',bg='#303B41' +set -g message-style fg='#1A1715',bg='#303B41' set -g display-panes-active-colour '#AC75A1' set -g display-panes-colour '#AC75A1' set -g clock-mode-colour '#AC75A1' -set -g mode-style fg='#B3BABF',bg='#303B41' +set -g mode-style fg='#1A1715',bg='#303B41' diff --git a/extras/wezterm/Zenbones.toml b/extras/wezterm/Zenbones.toml index d239a7e..f0f3355 100644 --- a/extras/wezterm/Zenbones.toml +++ b/extras/wezterm/Zenbones.toml @@ -8,5 +8,5 @@ cursor_fg = "#F2F0EF" selection_bg = "#D2DFE7" selection_fg = "#2C363C" -ansi = ["#2C363C", "#A8334C", "#617437", "#944927", "#286486", "#88507D", "#3B8992", "#F0EDEC"] -brights = ["#44525B", "#9C2842", "#55672A", "#87411E", "#1F5A7A", "#864079", "#2F7C85", "#DCD2CE"] +ansi = ["#F0EDEC", "#A8334C", "#617437", "#944927", "#286486", "#88507D", "#3B8992", "#2C363C"] +brights = ["#DCD2CE", "#9C2842", "#55672A", "#87411E", "#1F5A7A", "#864079", "#2F7C85", "#44525B"] diff --git a/extras/wezterm/Zenflesh.toml b/extras/wezterm/Zenflesh.toml index 8f2794b..c44a7c8 100644 --- a/extras/wezterm/Zenflesh.toml +++ b/extras/wezterm/Zenflesh.toml @@ -8,5 +8,5 @@ cursor_fg = "#161311" selection_bg = "#303B41" selection_fg = "#B3BABF" -ansi = ["#B3BABF", "#BB6572", "#75884C", "#B86E54", "#4185AE", "#AC75A1", "#4F969E", "#1A1715"] -brights = ["#93999E", "#D16D7D", "#7F974C", "#D07654", "#4293C2", "#C873B8", "#4CA2AC", "#2F2925"] +ansi = ["#1A1715", "#BB6572", "#75884C", "#B86E54", "#4185AE", "#AC75A1", "#4F969E", "#B3BABF"] +brights = ["#2F2925", "#D16D7D", "#7F974C", "#D07654", "#4293C2", "#C873B8", "#4CA2AC", "#93999E"] diff --git a/lua/zenbones/build/kitty.lua b/lua/zenbones/build/kitty.lua index 02693ed..6c52c6b 100644 --- a/lua/zenbones/build/kitty.lua +++ b/lua/zenbones/build/kitty.lua @@ -48,7 +48,7 @@ return function(name, theme, palette, terminal) foreground = fg, selection_background = theme.Visual.bg.hex, selection_foreground = fg, - url_color = terminal.colors[14].hex, + url_color = terminal.colors[13].hex, cursor = fg, active_tab_background = theme.Search.bg.hex, active_tab_foreground = fg, diff --git a/lua/zenbones/terminal.lua b/lua/zenbones/terminal.lua index af8b446..2bb43a1 100644 --- a/lua/zenbones/terminal.lua +++ b/lua/zenbones/terminal.lua @@ -2,22 +2,22 @@ local lush = require "lush" local p = require "zenbones.palette" local colors = { - p.stone, + p.sand, p.rose, p.leaf, p.wood, p.water, p.blossom, p.sky, - p.sand, - p.stone.li(16), + p.stone, + p.sand.sa(4).da(10), p.rose.sa(20).da(10), p.leaf.sa(20).da(10), p.wood.sa(18).da(10), p.water.sa(20).da(10), p.blossom.sa(24).da(10), p.sky.sa(20).da(10), - p.sand.sa(4).da(10), + p.stone.li(16), } local M = {} diff --git a/lua/zenflesh/terminal.lua b/lua/zenflesh/terminal.lua index 10814fa..a04e5fd 100644 --- a/lua/zenflesh/terminal.lua +++ b/lua/zenflesh/terminal.lua @@ -2,22 +2,22 @@ local lush = require "lush" local p = require "zenflesh.palette" local colors = { - p.stone, + p.sand, p.rose, p.leaf, p.wood, p.water, p.blossom, p.sky, - p.sand, - p.stone.da(16), + p.stone, + p.sand.sa(4).li(10), p.rose.sa(20).li(10), p.leaf.sa(20).li(10), p.wood.sa(18).li(10), p.water.sa(20).li(10), p.blossom.sa(24).li(10), p.sky.sa(20).li(10), - p.sand.sa(4).li(10), + p.stone.da(16), } local M = {} From 6b8e787088a90d441534292a198740bda3780cca Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Tue, 14 Sep 2021 16:38:15 +0800 Subject: [PATCH 37/53] coc highlight lsp --- colors/zenbones.vim | 8 ++++---- lua/zenbones/init.lua | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 197fab2..57fa40a 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -49,11 +49,7 @@ highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold highlight BufferVisible guifg=#596A76 guibg=NONE guisp=NONE gui=NONE highlight BufferVisibleIndex guifg=#596A76 guibg=NONE guisp=NONE gui=NONE highlight BufferVisibleSign guifg=#596A76 guibg=NONE guisp=NONE gui=NONE -highlight CocErrorHighlight guifg=#A8334C guibg=NONE guisp=NONE gui=underline -highlight CocHintHighlight guifg=#88507D guibg=NONE guisp=NONE gui=underline -highlight CocInfoHighlight guifg=#286486 guibg=NONE guisp=NONE gui=underline highlight CocMarkdownLink guifg=#3B8992 guibg=NONE guisp=NONE gui=underline -highlight CocWarningHighlight guifg=#944927 guibg=NONE guisp=NONE gui=underline highlight ColorColumn guifg=NONE guibg=#EFD8D3 guisp=NONE gui=NONE highlight Comment guifg=#948985 guibg=NONE guisp=NONE gui=italic highlight Conceal guifg=#4D5C65 guibg=NONE guisp=NONE gui=bold,italic @@ -142,11 +138,15 @@ highlight markdownH1 guifg=#2C363C guibg=NONE guisp=NONE gui=bold,underline highlight! link Boolean Number highlight! link BufferCurrent TabLineSel highlight! link CocCodeLens LineNr +highlight! link CocErrorHighlight LspDiagnosticsUnderlineError highlight! link CocErrorSign LspDiagnosticsDefaultError highlight! link CocErrorVirtualText LspDiagnosticsVirtualTextError +highlight! link CocHintHighlight LspDiagnosticsUnderlineHint highlight! link CocHintSign LspDiagnosticsDefaultHint +highlight! link CocInfoHighlight LspDiagnosticsUnderlineInformation highlight! link CocInfoSign LspDiagnosticsDefaultInformation highlight! link CocSelectedText SpellBad +highlight! link CocWarningHighlight LspDiagnosticsUnderlineWarning highlight! link CocWarningSign LspDiagnosticsDefaultWarning highlight! link CocWarningVitualText LspDiagnosticsVirtualTextWarning highlight! link CursorColumn CursorLine diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index f337ec4..00ceefe 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -324,10 +324,10 @@ local theme = lush(function() CocWarningSign { LspDiagnosticsDefaultWarning }, CocInfoSign { LspDiagnosticsDefaultInformation }, CocHintSign { LspDiagnosticsDefaultHint }, - CocErrorHighlight { CocErrorSign, gui = "underline" }, - CocWarningHighlight { CocWarningSign, gui = "underline" }, - CocInfoHighlight { CocInfoSign, gui = "underline" }, - CocHintHighlight { CocHintSign, gui = "underline" }, + CocErrorHighlight { LspDiagnosticsUnderlineError }, + CocWarningHighlight { LspDiagnosticsUnderlineWarning }, + CocInfoHighlight { LspDiagnosticsUnderlineInformation }, + CocHintHighlight { LspDiagnosticsUnderlineHint }, CocErrorVirtualText { LspDiagnosticsVirtualTextError }, CocWarningVitualText { LspDiagnosticsVirtualTextWarning }, CocSelectedText { SpellBad }, From 1f6ca701bda40be5fb6871e6812f18492a62e87b Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 16:25:20 +0800 Subject: [PATCH 38/53] wip --- lua/zenflesh/init.lua | 83 ++++++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 1ca65de..3ea044b 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -1,7 +1,24 @@ local lush = require "lush" -local p = require "zenflesh.palette" +-- local p = require "zenflesh.palette" -local normal_bg = p.sand +local hsluv = lush.hsluv + +local p = { + -- bg = hsluv(230, 18, 10), -- stone + -- fg = hsluv(39, 6, 78), -- sand + + bg = hsluv(39, 10, 8), -- sand + fg = hsluv(230, 8, 78), -- stone + + rose = hsluv(4, 60, 61), + leaf = hsluv(111, 46, 62), + wood = hsluv(26, 43, 56), + water = hsluv(236, 64, 60), + blossom = hsluv(318, 32, 57), + sky = hsluv(204, 61, 64), +} + +local normal_bg = p.bg local diff_bg_l = 0 local darkness = vim.g.zenflesh_darkness @@ -33,7 +50,7 @@ local theme = lush(function() -- styling for that group (meaning they mostly get styled as Normal) -- or leave them commented to apply vims default colouring or linking. - Normal { bg = normal_bg, fg = p.stone }, -- normal text + Normal { bg = normal_bg, fg = p.fg }, -- normal text Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links Bold { gui = "bold" }, @@ -43,10 +60,10 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = p.wood }, -- warning messages - Comment { fg = p.sand.li(32).de(48), gui = (italic_comments and "italic" or "NONE") }, -- any comment - Conceal { fg = p.stone.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Comment { fg = p.bg.li(38).de(34), gui = (italic_comments and "italic" or "NONE") }, -- any comment + Conceal { fg = p.fg.da(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor { bg = p.stone.li(20), fg = p.sand.da(20) }, -- character under the cursor + Cursor { bg = p.fg.li(20), fg = p.bg.da(20) }, -- character under the cursor lCursor { Cursor, bg = Cursor.bg.da(35) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| TermCursor { Cursor }, -- cursor in a focused terminal @@ -54,18 +71,18 @@ local theme = lush(function() CursorLine { bg = Normal.bg.li(4) }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. CursorColumn { CursorLine }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - ColorColumn { bg = p.wood.de(40).da(32) }, -- used for the columns set with 'colorcolumn' + ColorColumn { bg = p.wood.de(40).da(38) }, -- used for the columns set with 'colorcolumn' - DiffAdd { bg = p.leaf.de(14).da(52).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| - DiffChange { bg = p.water.de(20).da(45).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| - DiffDelete { bg = p.rose.de(26).da(47).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = p.water.de(22).da(28).abs_da(diff_bg_l), fg = p.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd { bg = p.leaf.de(28).da(60).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| + DiffChange { bg = p.water.de(24).da(58).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| + DiffDelete { bg = p.rose.de(40).da(58).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| + DiffText { bg = p.water.de(28).da(38).abs_da(diff_bg_l), fg = p.fg }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.li(30) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' - Folded { bg = Normal.bg.li(14), fg = Normal.bg.li(58) }, -- line used for closed folds - CursorLineNr { LineNr, fg = p.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + Folded { bg = Normal.bg.li(16), fg = Normal.bg.li(58) }, -- line used for closed folds + CursorLineNr { LineNr, fg = p.fg, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") -- MsgArea { }, -- Area for messages and cmdline @@ -79,8 +96,8 @@ local theme = lush(function() PmenuSbar { bg = Normal.bg.li(26) }, -- Popup menu: scrollbar. PmenuThumb { bg = Normal.bg.li(50) }, -- Popup menu: Thumb of the scrollbar. - Search { bg = p.blossom.de(12).da(32), fg = p.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch { bg = p.blossom, fg = p.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + Search { bg = p.blossom.de(12).da(32), fg = p.fg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch { bg = p.blossom, fg = p.bg, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" -- Substitute { }, -- |:substitute| replacement text highlighting MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| -- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. @@ -90,14 +107,14 @@ local theme = lush(function() SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare { SpellBad, guisp = p.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine { bg = p.sand.li(16), fg = p.stone }, -- status line of current window - StatusLineNC { bg = p.sand.li(11), fg = p.stone.li(28) }, -- 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 { bg = p.bg.li(16), fg = p.fg }, -- status line of current window + StatusLineNC { bg = p.bg.li(11), fg = p.fg.li(28) }, -- 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 { StatusLine, gui = "italic" }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label VertSplit { LineNr }, -- the column separating vertically split windows - Visual { bg = p.stone.sa(24).da(68) }, -- Visual mode selection + Visual { bg = p.fg.de(18).da(68) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". NonText { fg = Normal.bg.li(26) }, -- '@' 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|. @@ -105,7 +122,7 @@ local theme = lush(function() Whitespace { NonText }, -- "nbsp", "space", "tab" and "trail" in 'listchars' EndOfBuffer { NonText }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. - WildMenu { bg = p.blossom, fg = p.sand }, -- current match in 'wildmenu' completion + WildMenu { bg = p.blossom, fg = p.bg }, -- current match in 'wildmenu' completion Directory { gui = "bold" }, -- directory names (and other special names in listings) Question { MoreMsg }, -- |hit-enter| prompt and yes/no questions Title { gui = "bold" }, -- titles for output from ":set all", ":autocmd" etc. @@ -117,17 +134,17 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = p.stone.da(27), gui = "italic" }, -- (preferred) any constant + Constant { fg = p.fg.da(24), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' Number { gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 - Identifier { fg = p.stone.da(16) }, -- (preferred) any variable name - Function { fg = p.stone }, -- function name (also: methods for classes) + Identifier { fg = p.fg.da(14) }, -- (preferred) any variable name + Function { fg = p.fg }, -- function name (also: methods for classes) - Statement { fg = p.stone, gui = "bold" }, -- (preferred) any statement + Statement { fg = p.fg, gui = "bold" }, -- (preferred) any statement -- Conditional { }, -- if, then, else, endif, switch, etc. -- Repeat { }, -- for, do, while, etc. -- Label { }, -- case, default, etc. @@ -141,15 +158,15 @@ local theme = lush(function() -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - Type { fg = p.sand.de(29).li(56) }, -- (preferred) int, long, char, etc. + Type { fg = p.bg.li(60) }, -- (preferred) int, long, char, etc. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = p.stone.da(18), gui = "bold" }, -- (preferred) any special symbol + Special { fg = p.fg.da(12), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = p.sand.de(20).li(42) }, -- character that needs attention + Delimiter { fg = p.bg.li(54) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements @@ -264,6 +281,8 @@ local theme = lush(function() diffFile { fg = p.wood, gui = "bold" }, diffLine { fg = p.blossom, gui = "bold" }, diffIndexLine { fg = p.wood }, + + gitcommitOverflow { WarningMsg }, markdownH1 { Statement, gui = "bold,underline" }, markdownH2 { Statement }, @@ -288,7 +307,7 @@ local theme = lush(function() GitGutterChange { GitSignsChange }, GitGutterDelete { GitSignsDelete }, - IndentBlanklineChar { fg = p.sand.li(14).de(22) }, + IndentBlanklineChar { fg = p.bg.li(14).de(22) }, TelescopeSelection { CursorLine }, TelescopeSelectionCaret { TelescopeSelection, fg = p.rose }, @@ -325,10 +344,10 @@ local theme = lush(function() CocWarningSign { LspDiagnosticsDefaultWarning }, CocInfoSign { LspDiagnosticsDefaultInformation }, CocHintSign { LspDiagnosticsDefaultHint }, - CocErrorHighlight { CocErrorSign, gui = "underline" }, - CocWarningHighlight { CocWarningSign, gui = "underline" }, - CocInfoHighlight { CocInfoSign, gui = "underline" }, - CocHintHighlight { CocHintSign, gui = "underline" }, + CocErrorHighlight { LspDiagnosticsUnderlineError }, + CocWarningHighlight { LspDiagnosticsUnderlineWarning }, + CocInfoHighlight { LspDiagnosticsUnderlineInformation }, + CocHintHighlight { LspDiagnosticsUnderlineHint }, CocErrorVirtualText { LspDiagnosticsVirtualTextError }, CocWarningVitualText { LspDiagnosticsVirtualTextWarning }, CocSelectedText { SpellBad }, @@ -343,7 +362,7 @@ local theme = lush(function() NeogitDiffDeleteHighlight { DiffDelete }, NeogitDiffAddHighlight { DiffAdd }, NeogitHunkHeader { LineNr }, - NeogitHunkHeaderHighlight { CursorLine, fg = p.stone, gui = "bold" }, + NeogitHunkHeaderHighlight { CursorLine, fg = p.fg, gui = "bold" }, WhichKey { Statement }, WhichKeyGroup { Special }, From a727321b1aed115ff4e3dfc06910ebc24eee99b8 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 19:20:44 +0800 Subject: [PATCH 39/53] breaking: adjust terminal colors --- lua/zenbones/terminal.lua | 20 ++++++++++---------- lua/zenflesh/terminal.lua | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lua/zenbones/terminal.lua b/lua/zenbones/terminal.lua index 2bb43a1..f02239f 100644 --- a/lua/zenbones/terminal.lua +++ b/lua/zenbones/terminal.lua @@ -2,22 +2,22 @@ local lush = require "lush" local p = require "zenbones.palette" local colors = { - p.sand, + p.bg, p.rose, p.leaf, p.wood, p.water, p.blossom, p.sky, - p.stone, - p.sand.sa(4).da(10), - p.rose.sa(20).da(10), - p.leaf.sa(20).da(10), - p.wood.sa(18).da(10), - p.water.sa(20).da(10), - p.blossom.sa(24).da(10), - p.sky.sa(20).da(10), - p.stone.li(16), + p.fg, + p.bg.sa(4).da(16), + p.rose.sa(20).da(16), + p.leaf.sa(20).da(16), + p.wood.sa(18).da(16), + p.water.sa(20).da(16), + p.blossom.sa(24).da(16), + p.sky.sa(20).da(16), + p.fg.li(22), } local M = {} diff --git a/lua/zenflesh/terminal.lua b/lua/zenflesh/terminal.lua index a04e5fd..00021c1 100644 --- a/lua/zenflesh/terminal.lua +++ b/lua/zenflesh/terminal.lua @@ -2,22 +2,22 @@ local lush = require "lush" local p = require "zenflesh.palette" local colors = { - p.sand, + p.bg, p.rose, p.leaf, p.wood, p.water, p.blossom, p.sky, - p.stone, - p.sand.sa(4).li(10), - p.rose.sa(20).li(10), - p.leaf.sa(20).li(10), - p.wood.sa(18).li(10), - p.water.sa(20).li(10), - p.blossom.sa(24).li(10), - p.sky.sa(20).li(10), - p.stone.da(16), + p.fg, + p.bg.sa(4).li(16), + p.rose.sa(20).li(16), + p.leaf.sa(20).li(16), + p.wood.sa(18).li(16), + p.water.sa(20).li(16), + p.blossom.sa(24).li(16), + p.sky.sa(20).li(16), + p.fg.da(22), } local M = {} From 45d4fa638f6c041ac2eafe800b54584550d66ccc Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 19:21:43 +0800 Subject: [PATCH 40/53] rename sand/stone -> bg/fg --- lua/zenbones/init.lua | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 00ceefe..61951b1 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -1,7 +1,7 @@ local lush = require "lush" local p = require "zenbones.palette" -local normal_bg = p.sand +local normal_bg = p.bg local diff_bg_l = 0 local lightness = vim.g.zenbones_lightness @@ -33,7 +33,7 @@ local theme = lush(function() -- styling for that group (meaning they mostly get styled as Normal) -- or leave them commented to apply vims default colouring or linking. - Normal { bg = normal_bg, fg = p.stone }, -- normal text + Normal { bg = normal_bg, fg = p.fg }, -- normal text Underlined { gui = "underline" }, -- (preferred) text that stands out, HTML links Bold { gui = "bold" }, @@ -43,10 +43,10 @@ local theme = lush(function() ErrorMsg { Error }, -- error messages on the command line WarningMsg { fg = p.wood }, -- warning messages - Comment { fg = p.sand.da(38).de(28), gui = (italic_comments and "italic" or "NONE") }, -- any comment - Conceal { fg = p.stone.li(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Comment { fg = p.bg.da(38).de(28), gui = (italic_comments and "italic" or "NONE") }, -- any comment + Conceal { fg = p.fg.li(20), gui = "bold,italic" }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor { bg = p.stone, fg = p.sand.li(20) }, -- character under the cursor + Cursor { bg = p.fg, fg = p.bg.li(20) }, -- character under the cursor lCursor { Cursor, bg = Cursor.bg.li(20) }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| TermCursor { Cursor }, -- cursor in a focused terminal @@ -58,13 +58,13 @@ local theme = lush(function() DiffAdd { bg = p.leaf.de(77).li(82).abs_da(diff_bg_l) }, -- diff mode: Added line |diff.txt| DiffChange { bg = p.water.de(22).li(76).abs_da(diff_bg_l) }, -- diff mode: Changed line |diff.txt| DiffDelete { bg = p.rose.de(37).li(74).abs_da(diff_bg_l) }, -- diff mode: Deleted line |diff.txt| - DiffText { bg = p.water.de(24).li(64).abs_da(diff_bg_l), fg = p.stone }, -- diff mode: Changed text within a changed line |diff.txt| + DiffText { bg = p.water.de(24).li(64).abs_da(diff_bg_l), fg = p.fg }, -- diff mode: Changed text within a changed line |diff.txt| LineNr { fg = Normal.bg.da(32) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' Folded { bg = Normal.bg.da(16), fg = Normal.bg.da(64) }, -- line used for closed folds - CursorLineNr { LineNr, fg = p.stone, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + CursorLineNr { LineNr, fg = p.fg, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") -- MsgArea { }, -- Area for messages and cmdline @@ -78,8 +78,8 @@ local theme = lush(function() PmenuSbar { bg = Normal.bg.da(28) }, -- Popup menu: scrollbar. PmenuThumb { bg = Normal.bg.li(58) }, -- Popup menu: Thumb of the scrollbar. - Search { bg = p.blossom.de(10).li(54), fg = p.stone }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch { bg = p.blossom, fg = p.sand, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + Search { bg = p.blossom.de(10).li(54), fg = p.fg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch { bg = p.blossom, fg = p.bg, gui = "bold" }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" -- Substitute { }, -- |:substitute| replacement text highlighting MatchParen { Search }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| -- QuickFixLine { }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. @@ -89,14 +89,14 @@ local theme = lush(function() SpellLocal { SpellCap }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare { SpellBad, guisp = p.wood }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine { bg = p.sand.da(14), fg = p.stone }, -- status line of current window - StatusLineNC { bg = p.sand.da(10), fg = p.stone.li(28) }, -- 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 { bg = p.bg.da(14), fg = p.fg }, -- status line of current window + StatusLineNC { bg = p.bg.da(10), fg = p.fg.li(28) }, -- 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 { StatusLine, gui = "italic" }, -- tab pages line, not active tab page label TabLineFill { StatusLineNC }, -- tab pages line, where there are no labels TabLineSel { gui = "bold" }, -- tab pages line, active tab page label VertSplit { LineNr }, -- the column separating vertically split windows - Visual { bg = p.stone.li(84) }, -- Visual mode selection + Visual { bg = p.fg.li(84) }, -- Visual mode selection -- VisualNOS { }, -- Visual mode selection when vim is "Not Owning the Selection". NonText { fg = Normal.bg.da(22) }, -- '@' 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|. @@ -104,7 +104,7 @@ local theme = lush(function() Whitespace { NonText }, -- "nbsp", "space", "tab" and "trail" in 'listchars' EndOfBuffer { NonText }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. - WildMenu { bg = p.blossom, fg = p.sand }, -- current match in 'wildmenu' completion + WildMenu { bg = p.blossom, fg = p.bg }, -- current match in 'wildmenu' completion Directory { gui = "bold" }, -- directory names (and other special names in listings) Question { MoreMsg }, -- |hit-enter| prompt and yes/no questions Title { gui = "bold" }, -- titles for output from ":set all", ":autocmd" etc. @@ -116,17 +116,17 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = p.stone.li(25), gui = "italic" }, -- (preferred) any constant + Constant { fg = p.fg.li(25), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' Number { gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 - Identifier { fg = p.stone.li(15) }, -- (preferred) any variable name - Function { fg = p.stone }, -- function name (also: methods for classes) + Identifier { fg = p.fg.li(15) }, -- (preferred) any variable name + Function { fg = p.fg }, -- function name (also: methods for classes) - Statement { fg = p.stone, gui = "bold" }, -- (preferred) any statement + Statement { fg = p.fg, gui = "bold" }, -- (preferred) any statement -- Conditional { }, -- if, then, else, endif, switch, etp. -- Repeat { }, -- for, do, while, etp. -- Label { }, -- case, default, etp. @@ -140,15 +140,15 @@ local theme = lush(function() -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etp. - Type { fg = p.sand.da(62) }, -- (preferred) int, long, char, etp. + Type { fg = p.bg.da(62) }, -- (preferred) int, long, char, etp. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = p.stone.li(21), gui = "bold" }, -- (preferred) any special symbol + Special { fg = p.fg.li(21), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = p.sand.da(42) }, -- character that needs attention + Delimiter { fg = p.bg.da(42) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements @@ -287,7 +287,7 @@ local theme = lush(function() GitGutterChange { GitSignsChange }, GitGutterDelete { GitSignsDelete }, - IndentBlanklineChar { fg = p.sand.da(12).de(20) }, + IndentBlanklineChar { fg = p.bg.da(12).de(20) }, TelescopeSelection { CursorLine }, TelescopeSelectionCaret { TelescopeSelection, fg = p.rose }, @@ -342,7 +342,7 @@ local theme = lush(function() NeogitDiffDeleteHighlight { DiffDelete }, NeogitDiffAddHighlight { DiffAdd }, NeogitHunkHeader { LineNr }, - NeogitHunkHeaderHighlight { CursorLine, fg = p.stone, gui = "bold" }, + NeogitHunkHeaderHighlight { CursorLine, fg = p.fg, gui = "bold" }, WhichKey { Statement }, WhichKeyGroup { Special }, From 98ad267fc8c20622cd2d95bc3fa9acc7232cf8a4 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 19:22:49 +0800 Subject: [PATCH 41/53] breaking: adjust leaf colors --- lua/zenbones/palette.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/zenbones/palette.lua b/lua/zenbones/palette.lua index b738e11..46e85e7 100644 --- a/lua/zenbones/palette.lua +++ b/lua/zenbones/palette.lua @@ -2,9 +2,9 @@ local lush = require "lush" local hsluv = lush.hsluv return { - sand = hsluv(39, 12, 94), - stone = hsluv(230, 30, 22), - leaf = hsluv(103, 72, 46), + bg = hsluv(39, 12, 94), -- sand + fg = hsluv(230, 30, 22), -- stone + leaf = hsluv(112, 72, 42), water = hsluv(236, 84, 40), rose = hsluv(4, 70, 40), wood = hsluv(26, 80, 40), From dae9b1ded11d01bf43e07bf3b471f0459423a42f Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 19:23:31 +0800 Subject: [PATCH 42/53] breaking: update generated themes make sure to copy the new configs --- autoload/lightline/colorscheme/zenbones.vim | 2 +- colors/zenbones.vim | 28 ++++++++++----------- extras/alacritty/zenbones.yml | 18 ++++++------- extras/kitty/zenbones.conf | 20 +++++++-------- extras/wezterm/Zenbones.toml | 4 +-- lua/lualine/themes/zenbones.lua | 2 +- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/autoload/lightline/colorscheme/zenbones.vim b/autoload/lightline/colorscheme/zenbones.vim index 53cb6de..b7f1229 100644 --- a/autoload/lightline/colorscheme/zenbones.vim +++ b/autoload/lightline/colorscheme/zenbones.vim @@ -10,7 +10,7 @@ let s:p.inactive.left = [ [ "#596A76", "#DAD3CF" ], [ "#596A76", "#DAD3CF" ] ] let s:p.inactive.middle = [ [ "#596A76", "#DAD3CF" ] ] let s:p.inactive.right = [ [ "#596A76", "#DAD3CF" ] ] -let s:p.insert.left = [ [ "#564E4A", "#DDE6CD", "bold" ], [ "#564E4A", "#C4B6AF" ] ] +let s:p.insert.left = [ [ "#564E4A", "#D8E7CD", "bold" ], [ "#564E4A", "#C4B6AF" ] ] let s:p.replace.left = [ [ "#564E4A", "#E7CBCE", "bold" ], [ "#564E4A", "#C4B6AF" ] ] let s:p.visual.left = [ [ "#564E4A", "#D2DFE7", "bold" ], [ "#564E4A", "#C4B6AF" ] ] diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 57fa40a..eda4275 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -9,20 +9,20 @@ let g:colors_name = 'zenbones' let g:terminal_color_0 = '#F0EDEC' let g:terminal_color_1 = '#A8334C' -let g:terminal_color_2 = '#617437' +let g:terminal_color_2 = '#4F6C31' let g:terminal_color_3 = '#944927' let g:terminal_color_4 = '#286486' let g:terminal_color_5 = '#88507D' let g:terminal_color_6 = '#3B8992' let g:terminal_color_7 = '#2C363C' -let g:terminal_color_8 = '#DCD2CE' -let g:terminal_color_9 = '#9C2842' -let g:terminal_color_10 = '#55672A' -let g:terminal_color_11 = '#87411E' -let g:terminal_color_12 = '#1F5A7A' -let g:terminal_color_13 = '#864079' -let g:terminal_color_14 = '#2F7C85' -let g:terminal_color_15 = '#44525B' +let g:terminal_color_8 = '#CFC1BA' +let g:terminal_color_9 = '#94253E' +let g:terminal_color_10 = '#3F5A22' +let g:terminal_color_11 = '#803D1C' +let g:terminal_color_12 = '#1D5573' +let g:terminal_color_13 = '#7B3B70' +let g:terminal_color_14 = '#2B747C' +let g:terminal_color_15 = '#4F5E68' if has('terminal') let g:terminal_ansi_colors = [ @@ -58,7 +58,7 @@ highlight Cursor guifg=#F2F0EF guibg=#2C363C guisp=NONE gui=NONE highlight CursorLine guifg=NONE guibg=#E6E1DF guisp=NONE gui=NONE highlight CursorLineNr guifg=#2C363C guibg=NONE guisp=NONE gui=bold highlight Delimiter guifg=#8E817B guibg=NONE guisp=NONE gui=NONE -highlight DiffAdd guifg=NONE guibg=#DDE6CD guisp=NONE gui=NONE +highlight DiffAdd guifg=NONE guibg=#D8E7CD guisp=NONE gui=NONE highlight DiffChange guifg=NONE guibg=#C0DAF2 guisp=NONE gui=NONE highlight DiffDelete guifg=NONE guibg=#E7CBCE guisp=NONE gui=NONE highlight DiffText guifg=#2C363C guibg=#99C6E9 guisp=NONE gui=NONE @@ -68,7 +68,7 @@ highlight FloatBorder guifg=#786D68 guibg=NONE guisp=NONE gui=NONE highlight FoldColumn guifg=#A79891 guibg=NONE guisp=NONE gui=bold highlight Folded guifg=#564E4A guibg=#CDC2BC guisp=NONE gui=NONE highlight Function guifg=#2C363C guibg=NONE guisp=NONE gui=NONE -highlight GitSignsAdd guifg=#617437 guibg=NONE guisp=NONE gui=NONE +highlight GitSignsAdd guifg=#4F6C31 guibg=NONE guisp=NONE gui=NONE highlight GitSignsChange guifg=#286486 guibg=NONE guisp=NONE gui=NONE highlight GitSignsDelete guifg=#A8334C guibg=NONE guisp=NONE gui=NONE highlight HopNextKey2 guifg=#286486 guibg=NONE guisp=NONE gui=NONE @@ -93,7 +93,7 @@ highlight LspDiagnosticsUnderlineInformation guifg=#286486 guibg=NONE guisp=NONE highlight LspDiagnosticsUnderlineWarning guifg=#944927 guibg=NONE guisp=NONE gui=undercurl highlight LspDiagnosticsVirtualTextError guifg=#A8334C guibg=#E7DDDE guisp=NONE gui=NONE highlight LspDiagnosticsVirtualTextWarning guifg=#944927 guibg=#F0E6E4 guisp=NONE gui=NONE -highlight MoreMsg guifg=#617437 guibg=NONE guisp=NONE gui=bold +highlight MoreMsg guifg=#4F6C31 guibg=NONE guisp=NONE gui=bold highlight NeogitHunkHeaderHighlight guifg=#2C363C guibg=#E6E1DF guisp=NONE gui=bold highlight NonText guifg=#C0B0A8 guibg=NONE guisp=NONE gui=NONE highlight Normal guifg=#2C363C guibg=#F0EDEC guisp=NONE gui=NONE @@ -125,12 +125,12 @@ highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline highlight Visual guifg=NONE guibg=#D2DFE7 guisp=NONE gui=NONE highlight WarningMsg guifg=#944927 guibg=NONE guisp=NONE gui=NONE highlight WildMenu guifg=#F0EDEC guibg=#88507D guisp=NONE gui=NONE -highlight diffAdded guifg=#617437 guibg=NONE guisp=NONE gui=NONE +highlight diffAdded guifg=#4F6C31 guibg=NONE guisp=NONE gui=NONE highlight diffChanged guifg=#286486 guibg=NONE guisp=NONE gui=NONE highlight diffFile guifg=#944927 guibg=NONE guisp=NONE gui=bold highlight diffIndexLine guifg=#944927 guibg=NONE guisp=NONE gui=NONE highlight diffLine guifg=#88507D guibg=NONE guisp=NONE gui=bold -highlight diffNewFile guifg=#617437 guibg=NONE guisp=NONE gui=italic +highlight diffNewFile guifg=#4F6C31 guibg=NONE guisp=NONE gui=italic highlight diffOldFile guifg=#A8334C guibg=NONE guisp=NONE gui=italic highlight diffRemoved guifg=#A8334C guibg=NONE guisp=NONE gui=NONE highlight lCursor guifg=#F2F0EF guibg=#4D5C65 guisp=NONE gui=NONE diff --git a/extras/alacritty/zenbones.yml b/extras/alacritty/zenbones.yml index b3c9056..a33ef17 100644 --- a/extras/alacritty/zenbones.yml +++ b/extras/alacritty/zenbones.yml @@ -8,7 +8,7 @@ colors: normal: black: '#F0EDEC' red: '#A8334C' - green: '#617437' + green: '#4F6C31' yellow: '#944927' blue: '#286486' magenta: '#88507D' @@ -16,11 +16,11 @@ colors: white: '#2C363C' # Bright colors bright: - black: '#DCD2CE' - red: '#9C2842' - green: '#55672A' - yellow: '#87411E' - blue: '#1F5A7A' - magenta: '#864079' - cyan: '#2F7C85' - white: '#44525B' + black: '#CFC1BA' + red: '#94253E' + green: '#3F5A22' + yellow: '#803D1C' + blue: '#1D5573' + magenta: '#7B3B70' + cyan: '#2B747C' + white: '#4F5E68' diff --git a/extras/kitty/zenbones.conf b/extras/kitty/zenbones.conf index c63ff23..b38e779 100644 --- a/extras/kitty/zenbones.conf +++ b/extras/kitty/zenbones.conf @@ -8,7 +8,7 @@ background #F0EDEC foreground #2C363C selection_background #D2DFE7 selection_foreground #2C363C -url_color #1F5A7A +url_color #1D5573 cursor #2C363C # Tabs @@ -21,7 +21,7 @@ inactive_tab_foreground #2C363C # normal color0 #F0EDEC color1 #A8334C -color2 #617437 +color2 #4F6C31 color3 #944927 color4 #286486 color5 #88507D @@ -29,11 +29,11 @@ color6 #3B8992 color7 #2C363C # bright -color8 #DCD2CE -color9 #9C2842 -color10 #55672A -color11 #87411E -color12 #1F5A7A -color13 #864079 -color14 #2F7C85 -color15 #44525B +color8 #CFC1BA +color9 #94253E +color10 #3F5A22 +color11 #803D1C +color12 #1D5573 +color13 #7B3B70 +color14 #2B747C +color15 #4F5E68 diff --git a/extras/wezterm/Zenbones.toml b/extras/wezterm/Zenbones.toml index f0f3355..ee28513 100644 --- a/extras/wezterm/Zenbones.toml +++ b/extras/wezterm/Zenbones.toml @@ -8,5 +8,5 @@ cursor_fg = "#F2F0EF" selection_bg = "#D2DFE7" selection_fg = "#2C363C" -ansi = ["#F0EDEC", "#A8334C", "#617437", "#944927", "#286486", "#88507D", "#3B8992", "#2C363C"] -brights = ["#DCD2CE", "#9C2842", "#55672A", "#87411E", "#1F5A7A", "#864079", "#2F7C85", "#44525B"] +ansi = ["#F0EDEC", "#A8334C", "#4F6C31", "#944927", "#286486", "#88507D", "#3B8992", "#2C363C"] +brights = ["#CFC1BA", "#94253E", "#3F5A22", "#803D1C", "#1D5573", "#7B3B70", "#2B747C", "#4F5E68"] diff --git a/lua/lualine/themes/zenbones.lua b/lua/lualine/themes/zenbones.lua index ddbbb51..bed4cf3 100644 --- a/lua/lualine/themes/zenbones.lua +++ b/lua/lualine/themes/zenbones.lua @@ -10,7 +10,7 @@ return { }, insert = { - a = { bg = "#DDE6CD", fg = common_fg, gui = "bold" }, + a = { bg = "#D8E7CD", fg = common_fg, gui = "bold" }, }, command = { From 93c3df6685530ca641d9aa518db2b59916a802e1 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 19:24:32 +0800 Subject: [PATCH 43/53] adjust zenflesh palette again --- lua/zenflesh/init.lua | 23 +++-------------------- lua/zenflesh/palette.lua | 16 ++++++++-------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 3ea044b..229251d 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -1,22 +1,5 @@ local lush = require "lush" --- local p = require "zenflesh.palette" - -local hsluv = lush.hsluv - -local p = { - -- bg = hsluv(230, 18, 10), -- stone - -- fg = hsluv(39, 6, 78), -- sand - - bg = hsluv(39, 10, 8), -- sand - fg = hsluv(230, 8, 78), -- stone - - rose = hsluv(4, 60, 61), - leaf = hsluv(111, 46, 62), - wood = hsluv(26, 43, 56), - water = hsluv(236, 64, 60), - blossom = hsluv(318, 32, 57), - sky = hsluv(204, 61, 64), -} +local p = require "zenflesh.palette" local normal_bg = p.bg local diff_bg_l = 0 @@ -158,7 +141,7 @@ local theme = lush(function() -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etc. - Type { fg = p.bg.li(60) }, -- (preferred) int, long, char, etc. + Type { fg = p.bg.li(58) }, -- (preferred) int, long, char, etc. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef @@ -166,7 +149,7 @@ local theme = lush(function() Special { fg = p.fg.da(12), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this - Delimiter { fg = p.bg.li(54) }, -- character that needs attention + Delimiter { fg = p.bg.li(52) }, -- character that needs attention SpecialComment { Comment, gui = "bold" }, -- special things inside a comment -- Debug { }, -- debugging statements diff --git a/lua/zenflesh/palette.lua b/lua/zenflesh/palette.lua index 06cf72b..7c21764 100644 --- a/lua/zenflesh/palette.lua +++ b/lua/zenflesh/palette.lua @@ -2,12 +2,12 @@ local lush = require "lush" local hsluv = lush.hsluv return { - sand = hsluv(39, 12, 8), - stone = hsluv(230, 8, 75), - leaf = hsluv(103, 63, 54), - water = hsluv(236, 78, 53), - rose = hsluv(4, 38, 53), - wood = hsluv(26, 56, 54), - blossom = hsluv(318, 32, 56), - sky = hsluv(204, 71, 58), + bg = hsluv(39, 9, 9), -- sand + fg = hsluv(230, 10, 76), -- stone + rose = hsluv(6, 62, 60), + leaf = hsluv(111, 47, 61), + wood = hsluv(32, 47, 58), + water = hsluv(236, 64, 61), + blossom = hsluv(318, 32, 58), + sky = hsluv(204, 61, 64), } From a405fe14bee58625a334600434d0fcca7a188959 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 19:25:12 +0800 Subject: [PATCH 44/53] update generated zenflesh theme --- autoload/lightline/colorscheme/zenflesh.vim | 30 +-- colors/zenflesh.vim | 205 ++++++++++---------- extras/alacritty/zenflesh.yml | 36 ++-- extras/kitty/zenflesh.conf | 52 ++--- extras/tmux/zenflesh.tmux | 22 +-- extras/wezterm/Zenflesh.toml | 18 +- lua/lualine/themes/zenflesh.lua | 20 +- 7 files changed, 192 insertions(+), 191 deletions(-) diff --git a/autoload/lightline/colorscheme/zenflesh.vim b/autoload/lightline/colorscheme/zenflesh.vim index 8d81f29..a9556ce 100644 --- a/autoload/lightline/colorscheme/zenflesh.vim +++ b/autoload/lightline/colorscheme/zenflesh.vim @@ -1,22 +1,22 @@ let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -let s:p.normal.left = [ [ "#9E918A", "#514A46", "bold" ], [ "#9E918A", "#403A37" ] ] -let s:p.normal.middle = [ [ "#B3BABF", "#3C3633" ] ] -let s:p.normal.right = [ [ "#9E918A", "#403A37" ], [ "#9E918A", "#403A37" ] ] -let s:p.normal.warning = [ [ "#B86E54", "#352723" ] ] -let s:p.normal.error = [ [ "#BB6572", "#2A2A2A" ] ] +let s:p.normal.left = [ [ "#9E948F", "#524C4A", "bold" ], [ "#9E948F", "#3F3A38" ] ] +let s:p.normal.middle = [ [ "#B4BDC3", "#3D3836" ] ] +let s:p.normal.right = [ [ "#9E948F", "#3F3A38" ], [ "#9E948F", "#3F3A38" ] ] +let s:p.normal.warning = [ [ "#B77E64", "#362C28" ] ] +let s:p.normal.error = [ [ "#DE6E7C", "#3A2A2C" ] ] -let s:p.inactive.left = [ [ "#C8CDD0", "#302B29" ], [ "#C8CDD0", "#302B29" ] ] -let s:p.inactive.middle = [ [ "#C8CDD0", "#302B29" ] ] -let s:p.inactive.right = [ [ "#C8CDD0", "#302B29" ] ] +let s:p.inactive.left = [ [ "#CAD0D4", "#312D2B" ], [ "#CAD0D4", "#312D2B" ] ] +let s:p.inactive.middle = [ [ "#CAD0D4", "#312D2B" ] ] +let s:p.inactive.right = [ [ "#CAD0D4", "#312D2B" ] ] -let s:p.insert.left = [ [ "#9E918A", "#384126", "bold" ], [ "#9E918A", "#403A37" ] ] -let s:p.replace.left = [ [ "#9E918A", "#5D383D", "bold" ], [ "#9E918A", "#403A37" ] ] -let s:p.visual.left = [ [ "#9E918A", "#303B41", "bold" ], [ "#9E918A", "#403A37" ] ] +let s:p.insert.left = [ [ "#9E948F", "#333C2C", "bold" ], [ "#9E948F", "#3F3A38" ] ] +let s:p.replace.left = [ [ "#9E948F", "#5B2E33", "bold" ], [ "#9E948F", "#3F3A38" ] ] +let s:p.visual.left = [ [ "#9E948F", "#37393B", "bold" ], [ "#9E948F", "#3F3A38" ] ] -let s:p.tabline.left = [ [ "#B3BABF", "#403A37", "italic" ] ] -let s:p.tabline.middle = [ [ "#C8CDD0", "#302B29" ] ] -let s:p.tabline.right = [ [ "#B3BABF", "#403A37" ] ] -let s:p.tabline.tabsel = [ [ "#B3BABF", "#1A1715", "bold" ] ] +let s:p.tabline.left = [ [ "#B4BDC3", "#3F3A38", "italic" ] ] +let s:p.tabline.middle = [ [ "#CAD0D4", "#312D2B" ] ] +let s:p.tabline.right = [ [ "#B4BDC3", "#3F3A38" ] ] +let s:p.tabline.tabsel = [ [ "#B4BDC3", "#1C1918", "bold" ] ] let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p) diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index 09f310a..be5f6a9 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -7,22 +7,22 @@ endif set background=dark let g:colors_name = 'zenflesh' -let g:terminal_color_0 = '#1A1715' -let g:terminal_color_1 = '#BB6572' -let g:terminal_color_2 = '#75884C' -let g:terminal_color_3 = '#B86E54' -let g:terminal_color_4 = '#4185AE' -let g:terminal_color_5 = '#AC75A1' -let g:terminal_color_6 = '#4F969E' -let g:terminal_color_7 = '#B3BABF' -let g:terminal_color_8 = '#2F2925' -let g:terminal_color_9 = '#D16D7D' -let g:terminal_color_10 = '#7F974C' -let g:terminal_color_11 = '#D07654' -let g:terminal_color_12 = '#4293C2' -let g:terminal_color_13 = '#C873B8' -let g:terminal_color_14 = '#4CA2AC' -let g:terminal_color_15 = '#93999E' +let g:terminal_color_0 = '#1C1918' +let g:terminal_color_1 = '#DE6E7C' +let g:terminal_color_2 = '#819B69' +let g:terminal_color_3 = '#B77E64' +let g:terminal_color_4 = '#6099C0' +let g:terminal_color_5 = '#B279A7' +let g:terminal_color_6 = '#66A5AD' +let g:terminal_color_7 = '#B4BDC3' +let g:terminal_color_8 = '#3E3834' +let g:terminal_color_9 = '#E8838F' +let g:terminal_color_10 = '#8BAE68' +let g:terminal_color_11 = '#D68C67' +let g:terminal_color_12 = '#61ABDA' +let g:terminal_color_13 = '#CF86C1' +let g:terminal_color_14 = '#65B8C1' +let g:terminal_color_15 = '#888F94' if has('terminal') let g:terminal_ansi_colors = [ @@ -46,107 +46,107 @@ if has('terminal') endif highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight BufferVisible guifg=#C8CDD0 guibg=NONE guisp=NONE gui=NONE -highlight BufferVisibleIndex guifg=#C8CDD0 guibg=NONE guisp=NONE gui=NONE -highlight BufferVisibleSign guifg=#C8CDD0 guibg=NONE guisp=NONE gui=NONE -highlight CocErrorHighlight guifg=#BB6572 guibg=NONE guisp=NONE gui=underline -highlight CocHintHighlight guifg=#AC75A1 guibg=NONE guisp=NONE gui=underline -highlight CocInfoHighlight guifg=#4185AE guibg=NONE guisp=NONE gui=underline -highlight CocMarkdownLink guifg=#4F969E guibg=NONE guisp=NONE gui=underline -highlight CocWarningHighlight guifg=#B86E54 guibg=NONE guisp=NONE gui=underline -highlight ColorColumn guifg=NONE guibg=#714F45 guisp=NONE gui=NONE -highlight Comment guifg=#5B5654 guibg=NONE guisp=NONE gui=italic -highlight Conceal guifg=#8C9196 guibg=NONE guisp=NONE gui=bold,italic -highlight Constant guifg=#7F8488 guibg=NONE guisp=NONE gui=italic -highlight Cursor guifg=#161311 guibg=#C2C7CB guisp=NONE gui=NONE -highlight CursorLine guifg=NONE guibg=#231F1D guisp=NONE gui=NONE -highlight CursorLineNr guifg=#B3BABF guibg=NONE guisp=NONE gui=bold -highlight Delimiter guifg=#776E69 guibg=NONE guisp=NONE gui=NONE -highlight DiffAdd guifg=NONE guibg=#384126 guisp=NONE gui=NONE -highlight DiffChange guifg=NONE guibg=#2C475B guisp=NONE gui=NONE -highlight DiffDelete guifg=NONE guibg=#5D383D guisp=NONE gui=NONE -highlight DiffText guifg=#B3BABF guibg=#3B5D75 guisp=NONE gui=NONE +highlight BufferVisible guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE +highlight BufferVisibleIndex guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE +highlight BufferVisibleSign guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE +highlight CocMarkdownLink guifg=#66A5AD guibg=NONE guisp=NONE gui=underline +highlight ColorColumn guifg=NONE guibg=#675047 guisp=NONE gui=NONE +highlight Comment guifg=#6C6765 guibg=NONE guisp=NONE gui=italic +highlight Conceal guifg=#8D9499 guibg=NONE guisp=NONE gui=bold,italic +highlight Constant guifg=#868C91 guibg=NONE guisp=NONE gui=italic +highlight Cursor guifg=#171514 guibg=#C4CACF guisp=NONE gui=NONE +highlight CursorLine guifg=NONE guibg=#24211F guisp=NONE gui=NONE +highlight CursorLineNr guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold +highlight Delimiter guifg=#8E8480 guibg=NONE guisp=NONE gui=NONE +highlight DiffAdd guifg=NONE guibg=#333C2C guisp=NONE gui=NONE +highlight DiffChange guifg=NONE guibg=#2D404E guisp=NONE gui=NONE +highlight DiffDelete guifg=NONE guibg=#5B2E33 guisp=NONE gui=NONE +highlight DiffText guifg=#B4BDC3 guibg=#455C6F guisp=NONE gui=NONE highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight Error guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE -highlight FloatBorder guifg=#80756F guibg=NONE guisp=NONE gui=NONE -highlight FoldColumn guifg=#5C534F guibg=NONE guisp=NONE gui=bold -highlight Folded guifg=#9E918A guibg=#37312F guisp=NONE gui=NONE -highlight Function guifg=#B3BABF guibg=NONE guisp=NONE gui=NONE -highlight GitSignsAdd guifg=#75884C guibg=NONE guisp=NONE gui=NONE -highlight GitSignsChange guifg=#4185AE guibg=NONE guisp=NONE gui=NONE -highlight GitSignsDelete guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE -highlight HopNextKey2 guifg=#4185AE guibg=NONE guisp=NONE gui=NONE -highlight Identifier guifg=#93999E guibg=NONE guisp=NONE gui=NONE -highlight IncSearch guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold -highlight IndentBlanklineChar guifg=#363230 guibg=NONE guisp=NONE gui=NONE +highlight Error guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE +highlight FloatBorder guifg=#817873 guibg=NONE guisp=NONE gui=NONE +highlight FoldColumn guifg=#5A5350 guibg=NONE guisp=NONE gui=bold +highlight Folded guifg=#9E948F guibg=#3D3836 guisp=NONE gui=NONE +highlight Function guifg=#B4BDC3 guibg=NONE guisp=NONE gui=NONE +highlight GitSignsAdd guifg=#819B69 guibg=NONE guisp=NONE gui=NONE +highlight GitSignsChange guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE +highlight GitSignsDelete guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE +highlight HopNextKey2 guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE +highlight Identifier guifg=#979FA4 guibg=NONE guisp=NONE gui=NONE +highlight IncSearch guifg=#1C1918 guibg=#B279A7 guisp=NONE gui=bold +highlight IndentBlanklineChar guifg=#373432 guibg=NONE guisp=NONE gui=NONE highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic -highlight LightspeedGreyWash guifg=#5B5654 guibg=NONE guisp=NONE gui=NONE -highlight LightspeedLabel guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold,underline -highlight LightspeedLabelDistant guifg=#4F969E guibg=NONE guisp=NONE gui=bold,underline -highlight LightspeedLabelDistantOverlapped guifg=#4F969E guibg=NONE guisp=NONE gui=underline -highlight LightspeedLabelOverlapped guifg=#AC75A1 guibg=NONE guisp=NONE gui=underline -highlight LightspeedOneCharMatch guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold -highlight LightspeedPendingChangeOpArea guifg=#AC75A1 guibg=NONE guisp=NONE gui=NONE -highlight LightspeedShortcut guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=bold,underline -highlight LineNr guifg=#5C534F guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsDefaultHint guifg=#AC75A1 guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsDefaultInformation guifg=#4185AE guibg=NONE guisp=NONE gui=NONE -highlight LspDiagnosticsUnderlineError guifg=#BB6572 guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineHint guifg=#AC75A1 guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineInformation guifg=#4185AE guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsUnderlineWarning guifg=#B86E54 guibg=NONE guisp=NONE gui=undercurl -highlight LspDiagnosticsVirtualTextError guifg=#BB6572 guibg=#2A2A2A guisp=NONE gui=NONE -highlight LspDiagnosticsVirtualTextWarning guifg=#B86E54 guibg=#352723 guisp=NONE gui=NONE -highlight MoreMsg guifg=#75884C guibg=NONE guisp=NONE gui=bold -highlight NeogitHunkHeaderHighlight guifg=#B3BABF guibg=#231F1D guisp=NONE gui=bold -highlight NonText guifg=#514A46 guibg=NONE guisp=NONE gui=NONE -highlight Normal guifg=#B3BABF guibg=#1A1715 guisp=NONE gui=NONE -highlight NormalFloat guifg=NONE guibg=#292523 guisp=NONE gui=NONE +highlight LightspeedGreyWash guifg=#6C6765 guibg=NONE guisp=NONE gui=NONE +highlight LightspeedLabel guifg=#B279A7 guibg=NONE guisp=NONE gui=bold,underline +highlight LightspeedLabelDistant guifg=#66A5AD guibg=NONE guisp=NONE gui=bold,underline +highlight LightspeedLabelDistantOverlapped guifg=#66A5AD guibg=NONE guisp=NONE gui=underline +highlight LightspeedLabelOverlapped guifg=#B279A7 guibg=NONE guisp=NONE gui=underline +highlight LightspeedOneCharMatch guifg=#1C1918 guibg=#B279A7 guisp=NONE gui=bold +highlight LightspeedPendingChangeOpArea guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE +highlight LightspeedShortcut guifg=#1C1918 guibg=#B279A7 guisp=NONE gui=bold,underline +highlight LineNr guifg=#5A5350 guibg=NONE guisp=NONE gui=NONE +highlight LspDiagnosticsDefaultHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE +highlight LspDiagnosticsDefaultInformation guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE +highlight LspDiagnosticsUnderlineError guifg=#DE6E7C guibg=NONE guisp=NONE gui=undercurl +highlight LspDiagnosticsUnderlineHint guifg=#B279A7 guibg=NONE guisp=NONE gui=undercurl +highlight LspDiagnosticsUnderlineInformation guifg=#6099C0 guibg=NONE guisp=NONE gui=undercurl +highlight LspDiagnosticsUnderlineWarning guifg=#B77E64 guibg=NONE guisp=NONE gui=undercurl +highlight LspDiagnosticsVirtualTextError guifg=#DE6E7C guibg=#3A2A2C guisp=NONE gui=NONE +highlight LspDiagnosticsVirtualTextWarning guifg=#B77E64 guibg=#362C28 guisp=NONE gui=NONE +highlight MoreMsg guifg=#819B69 guibg=NONE guisp=NONE gui=bold +highlight NeogitHunkHeaderHighlight guifg=#B4BDC3 guibg=#24211F guisp=NONE gui=bold +highlight NonText guifg=#524C4A guibg=NONE guisp=NONE gui=NONE +highlight Normal guifg=#B4BDC3 guibg=#1C1918 guisp=NONE gui=NONE +highlight NormalFloat guifg=NONE guibg=#2B2725 guisp=NONE gui=NONE highlight Number guifg=NONE guibg=NONE guisp=NONE gui=italic -highlight Pmenu guifg=NONE guibg=#322D2B guisp=NONE gui=NONE -highlight PmenuSbar guifg=NONE guibg=#514A46 guisp=NONE gui=NONE -highlight PmenuSel guifg=NONE guibg=#403A37 guisp=NONE gui=NONE -highlight PmenuThumb guifg=NONE guibg=#8B7F79 guisp=NONE gui=NONE -highlight Search guifg=#B3BABF guibg=#714F6A guisp=NONE gui=NONE -highlight SneakLabelMask guifg=#AC75A1 guibg=#AC75A1 guisp=NONE gui=NONE -highlight Special guifg=#91979B guibg=NONE guisp=NONE gui=bold -highlight SpecialComment guifg=#5B5654 guibg=NONE guisp=NONE gui=bold -highlight SpecialKey guifg=#514A46 guibg=NONE guisp=NONE gui=italic -highlight SpellBad guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl -highlight SpellCap guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl -highlight SpellRare guifg=#AD6D76 guibg=NONE guisp=NONE gui=undercurl -highlight Statement guifg=#B3BABF guibg=NONE guisp=NONE gui=bold -highlight StatusLine guifg=#B3BABF guibg=#3C3633 guisp=NONE gui=NONE -highlight StatusLineNC guifg=#C8CDD0 guibg=#302B29 guisp=NONE gui=NONE -highlight TabLine guifg=#B3BABF guibg=#3C3633 guisp=NONE gui=italic +highlight Pmenu guifg=NONE guibg=#34302E guisp=NONE gui=NONE +highlight PmenuSbar guifg=NONE guibg=#524C4A guisp=NONE gui=NONE +highlight PmenuSel guifg=NONE guibg=#3F3A38 guisp=NONE gui=NONE +highlight PmenuThumb guifg=NONE guibg=#8B827D guisp=NONE gui=NONE +highlight Search guifg=#B4BDC3 guibg=#73516C guisp=NONE gui=NONE +highlight SneakLabelMask guifg=#B279A7 guibg=#B279A7 guisp=NONE gui=NONE +highlight Special guifg=#9CA4AA guibg=NONE guisp=NONE gui=bold +highlight SpecialComment guifg=#6C6765 guibg=NONE guisp=NONE gui=bold +highlight SpecialKey guifg=#524C4A guibg=NONE guisp=NONE gui=italic +highlight SpellBad guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl +highlight SpellCap guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl +highlight SpellRare guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl +highlight Statement guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold +highlight StatusLine guifg=#B4BDC3 guibg=#3D3836 guisp=NONE gui=NONE +highlight StatusLineNC guifg=#CAD0D4 guibg=#312D2B guisp=NONE gui=NONE +highlight TabLine guifg=#B4BDC3 guibg=#3D3836 guisp=NONE gui=italic highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight TelescopeMatching guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold -highlight TelescopeSelectionCaret guifg=#BB6572 guibg=#231F1D guisp=NONE gui=NONE +highlight TelescopeMatching guifg=#B279A7 guibg=NONE guisp=NONE gui=bold +highlight TelescopeSelectionCaret guifg=#DE6E7C guibg=#24211F guisp=NONE gui=NONE highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline -highlight Type guifg=#998F8A guibg=NONE guisp=NONE gui=NONE +highlight Type guifg=#9E948F guibg=NONE guisp=NONE gui=NONE highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline -highlight Visual guifg=NONE guibg=#303B41 guisp=NONE gui=NONE -highlight WarningMsg guifg=#B86E54 guibg=NONE guisp=NONE gui=NONE -highlight WildMenu guifg=#1A1715 guibg=#AC75A1 guisp=NONE gui=NONE -highlight diffAdded guifg=#75884C guibg=NONE guisp=NONE gui=NONE -highlight diffChanged guifg=#4185AE guibg=NONE guisp=NONE gui=NONE -highlight diffFile guifg=#B86E54 guibg=NONE guisp=NONE gui=bold -highlight diffIndexLine guifg=#B86E54 guibg=NONE guisp=NONE gui=NONE -highlight diffLine guifg=#AC75A1 guibg=NONE guisp=NONE gui=bold -highlight diffNewFile guifg=#75884C guibg=NONE guisp=NONE gui=italic -highlight diffOldFile guifg=#BB6572 guibg=NONE guisp=NONE gui=italic -highlight diffRemoved guifg=#BB6572 guibg=NONE guisp=NONE gui=NONE -highlight lCursor guifg=#161311 guibg=#787D80 guisp=NONE gui=NONE -highlight markdownH1 guifg=#B3BABF guibg=NONE guisp=NONE gui=bold,underline +highlight Visual guifg=NONE guibg=#37393B guisp=NONE gui=NONE +highlight WarningMsg guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE +highlight WildMenu guifg=#1C1918 guibg=#B279A7 guisp=NONE gui=NONE +highlight diffAdded guifg=#819B69 guibg=NONE guisp=NONE gui=NONE +highlight diffChanged guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE +highlight diffFile guifg=#B77E64 guibg=NONE guisp=NONE gui=bold +highlight diffIndexLine guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE +highlight diffLine guifg=#B279A7 guibg=NONE guisp=NONE gui=bold +highlight diffNewFile guifg=#819B69 guibg=NONE guisp=NONE gui=italic +highlight diffOldFile guifg=#DE6E7C guibg=NONE guisp=NONE gui=italic +highlight diffRemoved guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE +highlight lCursor guifg=#171514 guibg=#797F84 guisp=NONE gui=NONE +highlight markdownH1 guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold,underline highlight! link Boolean Number highlight! link BufferCurrent TabLineSel highlight! link CocCodeLens LineNr +highlight! link CocErrorHighlight LspDiagnosticsUnderlineError highlight! link CocErrorSign LspDiagnosticsDefaultError highlight! link CocErrorVirtualText LspDiagnosticsVirtualTextError +highlight! link CocHintHighlight LspDiagnosticsUnderlineHint highlight! link CocHintSign LspDiagnosticsDefaultHint +highlight! link CocInfoHighlight LspDiagnosticsUnderlineInformation highlight! link CocInfoSign LspDiagnosticsDefaultInformation highlight! link CocSelectedText SpellBad +highlight! link CocWarningHighlight LspDiagnosticsUnderlineWarning highlight! link CocWarningSign LspDiagnosticsDefaultWarning highlight! link CocWarningVitualText LspDiagnosticsVirtualTextWarning highlight! link CursorColumn CursorLine @@ -200,6 +200,7 @@ highlight! link WhichKeyGroup Special highlight! link WhichKeySeparator LineNr highlight! link WhichKeyValue Constant highlight! link Whitespace NonText +highlight! link gitcommitOverflow WarningMsg highlight! link helpHyperTextEntry Special highlight! link helpHyperTextJump Constant highlight! link helpOption Constant diff --git a/extras/alacritty/zenflesh.yml b/extras/alacritty/zenflesh.yml index 2a50e4c..f734588 100644 --- a/extras/alacritty/zenflesh.yml +++ b/extras/alacritty/zenflesh.yml @@ -2,25 +2,25 @@ colors: # Default colors primary: - background: '#1A1715' - foreground: '#B3BABF' + background: '#1C1918' + foreground: '#B4BDC3' # Normal colors normal: - black: '#1A1715' - red: '#BB6572' - green: '#75884C' - yellow: '#B86E54' - blue: '#4185AE' - magenta: '#AC75A1' - cyan: '#4F969E' - white: '#B3BABF' + black: '#1C1918' + red: '#DE6E7C' + green: '#819B69' + yellow: '#B77E64' + blue: '#6099C0' + magenta: '#B279A7' + cyan: '#66A5AD' + white: '#B4BDC3' # Bright colors bright: - black: '#2F2925' - red: '#D16D7D' - green: '#7F974C' - yellow: '#D07654' - blue: '#4293C2' - magenta: '#C873B8' - cyan: '#4CA2AC' - white: '#93999E' + black: '#3E3834' + red: '#E8838F' + green: '#8BAE68' + yellow: '#D68C67' + blue: '#61ABDA' + magenta: '#CF86C1' + cyan: '#65B8C1' + white: '#888F94' diff --git a/extras/kitty/zenflesh.conf b/extras/kitty/zenflesh.conf index 0c4a789..5790ff8 100644 --- a/extras/kitty/zenflesh.conf +++ b/extras/kitty/zenflesh.conf @@ -4,36 +4,36 @@ ## author: Michael Chris Lopez ## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenflesh.conf -background #1A1715 -foreground #B3BABF -selection_background #303B41 -selection_foreground #B3BABF -url_color #4293C2 -cursor #B3BABF +background #1C1918 +foreground #B4BDC3 +selection_background #37393B +selection_foreground #B4BDC3 +url_color #61ABDA +cursor #B4BDC3 # Tabs -active_tab_background #714F6A -active_tab_foreground #B3BABF -inactive_tab_background #3C3633 -inactive_tab_foreground #B3BABF +active_tab_background #73516C +active_tab_foreground #B4BDC3 +inactive_tab_background #3D3836 +inactive_tab_foreground #B4BDC3 #tab_bar_background ${tab_bar_background} # normal -color0 #1A1715 -color1 #BB6572 -color2 #75884C -color3 #B86E54 -color4 #4185AE -color5 #AC75A1 -color6 #4F969E -color7 #B3BABF +color0 #1C1918 +color1 #DE6E7C +color2 #819B69 +color3 #B77E64 +color4 #6099C0 +color5 #B279A7 +color6 #66A5AD +color7 #B4BDC3 # bright -color8 #2F2925 -color9 #D16D7D -color10 #7F974C -color11 #D07654 -color12 #4293C2 -color13 #C873B8 -color14 #4CA2AC -color15 #93999E +color8 #3E3834 +color9 #E8838F +color10 #8BAE68 +color11 #D68C67 +color12 #61ABDA +color13 #CF86C1 +color14 #65B8C1 +color15 #888F94 diff --git a/extras/tmux/zenflesh.tmux b/extras/tmux/zenflesh.tmux index bdb8db6..5b3ef18 100644 --- a/extras/tmux/zenflesh.tmux +++ b/extras/tmux/zenflesh.tmux @@ -1,17 +1,17 @@ -set -g status-left ' #[fg=#AC75A1,bold]#{s/root//:client_key_table} ' -set -g status-right '#[fg=#AC75A1,bold] [#S]#[fg=#AC75A1,bold] [%d/%m] #[fg=#AC75A1,bold][%I:%M%p] ' -set -g status-style fg='#AC75A1',bg='#B3BABF' +set -g status-left ' #[fg=#B279A7,bold]#{s/root//:client_key_table} ' +set -g status-right '#[fg=#B279A7,bold] [#S]#[fg=#B279A7,bold] [%d/%m] #[fg=#B279A7,bold][%I:%M%p] ' +set -g status-style fg='#B279A7',bg='#B4BDC3' -set -g window-status-current-style fg='#AC75A1',bg='#B3BABF',bold +set -g window-status-current-style fg='#B279A7',bg='#B4BDC3',bold -set -g pane-border-style fg='#AC75A1' -set -g pane-active-border-style fg='#AC75A1' +set -g pane-border-style fg='#B279A7' +set -g pane-active-border-style fg='#B279A7' -set -g message-style fg='#1A1715',bg='#303B41' +set -g message-style fg='#1C1918',bg='#37393B' -set -g display-panes-active-colour '#AC75A1' -set -g display-panes-colour '#AC75A1' +set -g display-panes-active-colour '#B279A7' +set -g display-panes-colour '#B279A7' -set -g clock-mode-colour '#AC75A1' +set -g clock-mode-colour '#B279A7' -set -g mode-style fg='#1A1715',bg='#303B41' +set -g mode-style fg='#1C1918',bg='#37393B' diff --git a/extras/wezterm/Zenflesh.toml b/extras/wezterm/Zenflesh.toml index c44a7c8..01c70b4 100644 --- a/extras/wezterm/Zenflesh.toml +++ b/extras/wezterm/Zenflesh.toml @@ -1,12 +1,12 @@ # Zenflesh [colors] -foreground = "#B3BABF" -background = "#1A1715" -cursor_bg = "#C2C7CB" -cursor_border = "#161311" -cursor_fg = "#161311" -selection_bg = "#303B41" -selection_fg = "#B3BABF" +foreground = "#B4BDC3" +background = "#1C1918" +cursor_bg = "#C4CACF" +cursor_border = "#171514" +cursor_fg = "#171514" +selection_bg = "#37393B" +selection_fg = "#B4BDC3" -ansi = ["#1A1715", "#BB6572", "#75884C", "#B86E54", "#4185AE", "#AC75A1", "#4F969E", "#B3BABF"] -brights = ["#2F2925", "#D16D7D", "#7F974C", "#D07654", "#4293C2", "#C873B8", "#4CA2AC", "#93999E"] +ansi = ["#1C1918", "#DE6E7C", "#819B69", "#B77E64", "#6099C0", "#B279A7", "#66A5AD", "#B4BDC3"] +brights = ["#3E3834", "#E8838F", "#8BAE68", "#D68C67", "#61ABDA", "#CF86C1", "#65B8C1", "#888F94"] diff --git a/lua/lualine/themes/zenflesh.lua b/lua/lualine/themes/zenflesh.lua index dedb902..835865c 100644 --- a/lua/lualine/themes/zenflesh.lua +++ b/lua/lualine/themes/zenflesh.lua @@ -1,28 +1,28 @@ -local common_fg = "#9E918A" -local inactive_bg = "#302B29" -local inactive_fg = "#C8CDD0" +local common_fg = "#9E948F" +local inactive_bg = "#312D2B" +local inactive_fg = "#CAD0D4" return { normal = { - a = { bg = "#514A46", fg = common_fg, gui = "bold" }, - b = { bg = "#403A37", fg = common_fg }, - c = { bg = "#3C3633", fg = "#B3BABF" }, + a = { bg = "#524C4A", fg = common_fg, gui = "bold" }, + b = { bg = "#3F3A38", fg = common_fg }, + c = { bg = "#3D3836", fg = "#B4BDC3" }, }, insert = { - a = { bg = "#384126", fg = common_fg, gui = "bold" }, + a = { bg = "#333C2C", fg = common_fg, gui = "bold" }, }, command = { - a = { bg = "#714F6A", fg = common_fg, gui = "bold" }, + a = { bg = "#73516C", fg = common_fg, gui = "bold" }, }, visual = { - a = { bg = "#303B41", fg = common_fg, gui = "bold" }, + a = { bg = "#37393B", fg = common_fg, gui = "bold" }, }, replace = { - a = { bg = "#5D383D", fg = common_fg, gui = "bold" }, + a = { bg = "#5B2E33", fg = common_fg, gui = "bold" }, }, inactive = { From 25c36a2289d48231acf475c424722396efc1a2d1 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 19:40:44 +0800 Subject: [PATCH 45/53] adjust warm saturation --- lua/zenflesh/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 229251d..9e7a294 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -9,7 +9,7 @@ if darkness == "stark" then normal_bg = normal_bg.abs_da(3).sa(8) diff_bg_l = -3 elseif darkness == "warm" then - normal_bg = normal_bg.abs_li(3).de(16) + normal_bg = normal_bg.abs_li(3).de(12) diff_bg_l = 3 elseif darkness ~= nil then local error_msg = "Unknown zenflesh_darkness value: " .. vim.inspect(darkness) From 04b3d58d9fe4122d61c5ca09056bda124e6ef2e5 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 20:04:11 +0800 Subject: [PATCH 46/53] breaking: adjust statusline theme colors --- lua/zenbones/build/lightline.lua | 2 +- lua/zenbones/build/lualine.lua | 2 +- lua/zenflesh/init.lua | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/zenbones/build/lightline.lua b/lua/zenbones/build/lightline.lua index 686a775..d6b83ac 100644 --- a/lua/zenbones/build/lightline.lua +++ b/lua/zenbones/build/lightline.lua @@ -34,7 +34,7 @@ return function(name, theme, palette, terminal) normal_b_bg = theme.PmenuSel.bg.hex, normal_c_bg = theme.StatusLine.bg.hex, normal_c_fg = theme.StatusLine.fg.hex, - insert_a_bg = theme.DiffAdd.bg.hex, + insert_a_bg = theme.DiffText.bg.hex, visual_a_bg = theme.Visual.bg.hex, replace_a_bg = theme.DiffDelete.bg.hex, tabline_left_bg = theme.PmenuSel.bg.hex, diff --git a/lua/zenbones/build/lualine.lua b/lua/zenbones/build/lualine.lua index d474e20..8a24b63 100644 --- a/lua/zenbones/build/lualine.lua +++ b/lua/zenbones/build/lualine.lua @@ -45,7 +45,7 @@ return function(name, theme, palette, terminal) normal_b_bg = theme.PmenuSel.bg.hex, normal_c_bg = theme.StatusLine.bg.hex, normal_c_fg = theme.StatusLine.fg.hex, - insert_a_bg = theme.DiffAdd.bg.hex, + insert_a_bg = theme.DiffText.bg.hex, command_a_bg = theme.Search.bg.hex, visual_a_bg = theme.Visual.bg.hex, replace_a_bg = theme.DiffDelete.bg.hex, diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 9e7a294..b97e493 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -64,7 +64,7 @@ local theme = lush(function() LineNr { fg = Normal.bg.li(30) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. SignColumn { LineNr }, -- column where |signs| are displayed FoldColumn { LineNr, gui = "bold" }, -- 'foldcolumn' - Folded { bg = Normal.bg.li(16), fg = Normal.bg.li(58) }, -- line used for closed folds + Folded { bg = Normal.bg.li(16), fg = Normal.bg.li(69) }, -- line used for closed folds CursorLineNr { LineNr, fg = p.fg, gui = "bold" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. -- ModeMsg { }, -- 'showmode' message (e.g., "-- INSERT -- ") @@ -75,8 +75,8 @@ local theme = lush(function() FloatBorder { fg = Normal.bg.li(46) }, -- Normal text in floating windows. Pmenu { bg = Normal.bg.li(12) }, -- Popup menu: normal item. - PmenuSel { bg = Normal.bg.li(18) }, -- Popup menu: selected item. - PmenuSbar { bg = Normal.bg.li(26) }, -- Popup menu: scrollbar. + PmenuSel { bg = Normal.bg.li(24) }, -- Popup menu: selected item. + PmenuSbar { bg = Normal.bg.li(40) }, -- Popup menu: scrollbar. PmenuThumb { bg = Normal.bg.li(50) }, -- Popup menu: Thumb of the scrollbar. Search { bg = p.blossom.de(12).da(32), fg = p.fg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. From a36f1aee31c7269b4b734145e5550b3fa6f6d3ad Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 20:04:50 +0800 Subject: [PATCH 47/53] regenerate colors --- autoload/lightline/colorscheme/zenbones.vim | 2 +- autoload/lightline/colorscheme/zenflesh.vim | 14 +++++++------- colors/zenflesh.vim | 6 +++--- lua/lualine/themes/zenbones.lua | 2 +- lua/lualine/themes/zenflesh.lua | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/autoload/lightline/colorscheme/zenbones.vim b/autoload/lightline/colorscheme/zenbones.vim index b7f1229..95eb89f 100644 --- a/autoload/lightline/colorscheme/zenbones.vim +++ b/autoload/lightline/colorscheme/zenbones.vim @@ -10,7 +10,7 @@ let s:p.inactive.left = [ [ "#596A76", "#DAD3CF" ], [ "#596A76", "#DAD3CF" ] ] let s:p.inactive.middle = [ [ "#596A76", "#DAD3CF" ] ] let s:p.inactive.right = [ [ "#596A76", "#DAD3CF" ] ] -let s:p.insert.left = [ [ "#564E4A", "#D8E7CD", "bold" ], [ "#564E4A", "#C4B6AF" ] ] +let s:p.insert.left = [ [ "#564E4A", "#99C6E9", "bold" ], [ "#564E4A", "#C4B6AF" ] ] let s:p.replace.left = [ [ "#564E4A", "#E7CBCE", "bold" ], [ "#564E4A", "#C4B6AF" ] ] let s:p.visual.left = [ [ "#564E4A", "#D2DFE7", "bold" ], [ "#564E4A", "#C4B6AF" ] ] diff --git a/autoload/lightline/colorscheme/zenflesh.vim b/autoload/lightline/colorscheme/zenflesh.vim index a9556ce..7d1fb15 100644 --- a/autoload/lightline/colorscheme/zenflesh.vim +++ b/autoload/lightline/colorscheme/zenflesh.vim @@ -1,8 +1,8 @@ let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -let s:p.normal.left = [ [ "#9E948F", "#524C4A", "bold" ], [ "#9E948F", "#3F3A38" ] ] +let s:p.normal.left = [ [ "#BBAEA8", "#716965", "bold" ], [ "#BBAEA8", "#4E4845" ] ] let s:p.normal.middle = [ [ "#B4BDC3", "#3D3836" ] ] -let s:p.normal.right = [ [ "#9E948F", "#3F3A38" ], [ "#9E948F", "#3F3A38" ] ] +let s:p.normal.right = [ [ "#BBAEA8", "#4E4845" ], [ "#BBAEA8", "#4E4845" ] ] let s:p.normal.warning = [ [ "#B77E64", "#362C28" ] ] let s:p.normal.error = [ [ "#DE6E7C", "#3A2A2C" ] ] @@ -10,13 +10,13 @@ let s:p.inactive.left = [ [ "#CAD0D4", "#312D2B" ], [ "#CAD0D4", "#312D2B" ] ] let s:p.inactive.middle = [ [ "#CAD0D4", "#312D2B" ] ] let s:p.inactive.right = [ [ "#CAD0D4", "#312D2B" ] ] -let s:p.insert.left = [ [ "#9E948F", "#333C2C", "bold" ], [ "#9E948F", "#3F3A38" ] ] -let s:p.replace.left = [ [ "#9E948F", "#5B2E33", "bold" ], [ "#9E948F", "#3F3A38" ] ] -let s:p.visual.left = [ [ "#9E948F", "#37393B", "bold" ], [ "#9E948F", "#3F3A38" ] ] +let s:p.insert.left = [ [ "#BBAEA8", "#455C6F", "bold" ], [ "#BBAEA8", "#4E4845" ] ] +let s:p.replace.left = [ [ "#BBAEA8", "#5B2E33", "bold" ], [ "#BBAEA8", "#4E4845" ] ] +let s:p.visual.left = [ [ "#BBAEA8", "#37393B", "bold" ], [ "#BBAEA8", "#4E4845" ] ] -let s:p.tabline.left = [ [ "#B4BDC3", "#3F3A38", "italic" ] ] +let s:p.tabline.left = [ [ "#B4BDC3", "#4E4845", "italic" ] ] let s:p.tabline.middle = [ [ "#CAD0D4", "#312D2B" ] ] -let s:p.tabline.right = [ [ "#B4BDC3", "#3F3A38" ] ] +let s:p.tabline.right = [ [ "#B4BDC3", "#4E4845" ] ] let s:p.tabline.tabsel = [ [ "#B4BDC3", "#1C1918", "bold" ] ] let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p) diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index be5f6a9..281fd99 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -66,7 +66,7 @@ highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold highlight Error guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE highlight FloatBorder guifg=#817873 guibg=NONE guisp=NONE gui=NONE highlight FoldColumn guifg=#5A5350 guibg=NONE guisp=NONE gui=bold -highlight Folded guifg=#9E948F guibg=#3D3836 guisp=NONE gui=NONE +highlight Folded guifg=#BBAEA8 guibg=#3D3836 guisp=NONE gui=NONE highlight Function guifg=#B4BDC3 guibg=NONE guisp=NONE gui=NONE highlight GitSignsAdd guifg=#819B69 guibg=NONE guisp=NONE gui=NONE highlight GitSignsChange guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE @@ -100,8 +100,8 @@ highlight Normal guifg=#B4BDC3 guibg=#1C1918 guisp=NONE gui=NONE highlight NormalFloat guifg=NONE guibg=#2B2725 guisp=NONE gui=NONE highlight Number guifg=NONE guibg=NONE guisp=NONE gui=italic highlight Pmenu guifg=NONE guibg=#34302E guisp=NONE gui=NONE -highlight PmenuSbar guifg=NONE guibg=#524C4A guisp=NONE gui=NONE -highlight PmenuSel guifg=NONE guibg=#3F3A38 guisp=NONE gui=NONE +highlight PmenuSbar guifg=NONE guibg=#716965 guisp=NONE gui=NONE +highlight PmenuSel guifg=NONE guibg=#4E4845 guisp=NONE gui=NONE highlight PmenuThumb guifg=NONE guibg=#8B827D guisp=NONE gui=NONE highlight Search guifg=#B4BDC3 guibg=#73516C guisp=NONE gui=NONE highlight SneakLabelMask guifg=#B279A7 guibg=#B279A7 guisp=NONE gui=NONE diff --git a/lua/lualine/themes/zenbones.lua b/lua/lualine/themes/zenbones.lua index bed4cf3..b403f96 100644 --- a/lua/lualine/themes/zenbones.lua +++ b/lua/lualine/themes/zenbones.lua @@ -10,7 +10,7 @@ return { }, insert = { - a = { bg = "#D8E7CD", fg = common_fg, gui = "bold" }, + a = { bg = "#99C6E9", fg = common_fg, gui = "bold" }, }, command = { diff --git a/lua/lualine/themes/zenflesh.lua b/lua/lualine/themes/zenflesh.lua index 835865c..a8f17b8 100644 --- a/lua/lualine/themes/zenflesh.lua +++ b/lua/lualine/themes/zenflesh.lua @@ -1,16 +1,16 @@ -local common_fg = "#9E948F" +local common_fg = "#BBAEA8" local inactive_bg = "#312D2B" local inactive_fg = "#CAD0D4" return { normal = { - a = { bg = "#524C4A", fg = common_fg, gui = "bold" }, - b = { bg = "#3F3A38", fg = common_fg }, + a = { bg = "#716965", fg = common_fg, gui = "bold" }, + b = { bg = "#4E4845", fg = common_fg }, c = { bg = "#3D3836", fg = "#B4BDC3" }, }, insert = { - a = { bg = "#333C2C", fg = common_fg, gui = "bold" }, + a = { bg = "#455C6F", fg = common_fg, gui = "bold" }, }, command = { From 22ba80e08c63f88e0cc9014f4e47212ddd1a4107 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 20:19:48 +0800 Subject: [PATCH 48/53] update config --- README.md | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index ca28499..86acdfa 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # Zenflesh, Zenbones -Zenbones is a light vim/neovim -[colorscheme](https://neovim.io/doc/user/syntax.html#:colorscheme) designed to -highlight code using contrasts and font variations. Colors are tasked only for -other roles such as diagnostics, diffs, search matches. +Zenbones is a vim/neovim colorscheme designed to highlight code using contrasts +and font variations. Colors are tasked only for other roles such as diagnostics, +diffs, search matches. @@ -43,7 +42,10 @@ use "rktjmp/lush.nvim" Just apply the colorscheme as usual: ```vim +" light colorscheme zenbones +" dark +colorscheme zenflesh ``` If you want to make use of the lua version: @@ -51,6 +53,7 @@ If you want to make use of the lua version: ```vim " Requires `neovim` and `rktjmp/lush.nvim` installed colorscheme zenbones-lush +colorscheme zenflesh-lush ``` It works pretty much the same as the first one but pretty handy when extending @@ -58,23 +61,17 @@ or customizing the colors to your likings. ## Configuration -Configuration is only available for `zenbones-lush`. +Configuration is only available for `zenbones-lush` and `zenflesh-lush`. #### g:zenbones_lightness Change background colors lightness. -**'bright'** +| 'bright' | _(unset)_ | 'dim' | +| :-----------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: | +| ![Bright lightness](https://user-images.githubusercontent.com/7200153/131272384-710e253f-059d-46fd-bf0e-7d82f62d62cd.png) | ![Default lightness](https://user-images.githubusercontent.com/7200153/131272333-3fb67e68-fcd2-48ae-b8c4-ab24b701ed5e.png) | ![Dim lightness](https://user-images.githubusercontent.com/7200153/131272410-329636bb-fd8e-42fb-83aa-f436d211b5ed.png) | -Bright lightness - -**Default** _(unset)_ - -Default lightness - -**'dim'** - -Dim lightness +#### g:zenflesh_lightness #### g:zenbones_solid_vert_split @@ -99,7 +96,7 @@ local theme = require "zenbones" local palette = require "zenbones.palette" print(theme.StatusLine.bg.hex) -print(palette.sand.darken(20).hex) +print(palette.blossom.darken(20).hex) ``` See also From f30815edd111279eac7405c532da3e7a9a380370 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 20:25:05 +0800 Subject: [PATCH 49/53] document zenflesh config --- README.md | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 86acdfa..d75b8b2 100644 --- a/README.md +++ b/README.md @@ -71,19 +71,31 @@ Change background colors lightness. | :-----------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: | | ![Bright lightness](https://user-images.githubusercontent.com/7200153/131272384-710e253f-059d-46fd-bf0e-7d82f62d62cd.png) | ![Default lightness](https://user-images.githubusercontent.com/7200153/131272333-3fb67e68-fcd2-48ae-b8c4-ab24b701ed5e.png) | ![Dim lightness](https://user-images.githubusercontent.com/7200153/131272410-329636bb-fd8e-42fb-83aa-f436d211b5ed.png) | -#### g:zenflesh_lightness +#### g:zenflesh_darkness + +Change background colors darkness. + +| 'stark' | _(unset)_ | 'warm' | +| :-----------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: | +| ![Bright lightness](https://user-images.githubusercontent.com/7200153/131272384-710e253f-059d-46fd-bf0e-7d82f62d62cd.png) | ![Default lightness](https://user-images.githubusercontent.com/7200153/131272333-3fb67e68-fcd2-48ae-b8c4-ab24b701ed5e.png) | ![Dim lightness](https://user-images.githubusercontent.com/7200153/131272410-329636bb-fd8e-42fb-83aa-f436d211b5ed.png) | #### g:zenbones_solid_vert_split +#### g:zenflesh_solid_vert_split + Set to `v:true` to make vertical split more visible with a dimmer background highlight. #### g:zenbones_dim_noncurrent_window +#### g:zenflesh_dim_noncurrent_window + Set to `v:true` to make non-current window background dimmer than _Normal_. #### g:zenbones_italic_comments +#### g:zenflesh_italic_comments + Set to `v:false` to make comments not italicize. ## Advanced Usage @@ -92,7 +104,7 @@ Zenbones is pretty extensible thanks to Lush. You can easily retrieve the colors in lua: ```lua -local theme = require "zenbones" +local theme = require "zenbones" -- or zenflesh local palette = require "zenbones.palette" print(theme.StatusLine.bg.hex) @@ -135,26 +147,6 @@ It's also possible to generate color configuration files using a template, [this one for Kitty](lua/zenbones/build/kitty.lua) for example. Please feel free to submit a PR if you want to add some more. - - -## Showcase - -**Diff highlights** - -Vim diff - -**Search matches** - -Search matches - -**LSP diagnostics** - -LSP diagnostics - -_Font used is [Iosevka Curly Slab](https://typeof.net/Iosevka/)_. - - - ## Inspirations Zenbones is heavily inspired by From 86e4df9beb2965571cd68ffbb5691b7c09d4a1af Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 16 Sep 2021 20:32:07 +0800 Subject: [PATCH 50/53] update config desc --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d75b8b2..d28d64b 100644 --- a/README.md +++ b/README.md @@ -83,15 +83,17 @@ Change background colors darkness. #### g:zenflesh_solid_vert_split -Set to `v:true` to make vertical split more visible with a dimmer background +Set to `v:true` to make vertical split more distinguishable background highlight. #### g:zenbones_dim_noncurrent_window -#### g:zenflesh_dim_noncurrent_window - Set to `v:true` to make non-current window background dimmer than _Normal_. +#### g:zenflesh_lighten_noncurrent_window + +Set to `v:true` to make non-current window background warmer than _Normal_. + #### g:zenbones_italic_comments #### g:zenflesh_italic_comments From c5fc9dfe6cf077f4426b59b269f8156df6ef9c98 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 17 Sep 2021 18:25:23 +0800 Subject: [PATCH 51/53] update iterm colors --- extras/iterm/zenbones.itermcolors | 72 +++--- extras/iterm/zenflesh.itermcolors | 357 ++++++++++++++++++++++++++++++ 2 files changed, 393 insertions(+), 36 deletions(-) create mode 100644 extras/iterm/zenflesh.itermcolors diff --git a/extras/iterm/zenbones.itermcolors b/extras/iterm/zenbones.itermcolors index f245547..169af5f 100644 --- a/extras/iterm/zenbones.itermcolors +++ b/extras/iterm/zenbones.itermcolors @@ -7,13 +7,13 @@ Alpha Component 1 Blue Component - 0.23529411852359772 + 0.92549020051956177 Color Space sRGB Green Component - 0.21176470816135406 + 0.92941176891326904 Red Component - 0.17254902422428131 + 0.94117647409439087 Ansi 1 Color @@ -33,91 +33,91 @@ Alpha Component 1 Blue Component - 0.16470588743686676 + 0.13333334028720856 Color Space sRGB Green Component - 0.40392157435417175 + 0.35294118523597717 Red Component - 0.3333333432674408 + 0.24705882370471954 Ansi 11 Color Alpha Component 1 Blue Component - 0.11764705926179886 + 0.10980392247438431 Color Space sRGB Green Component - 0.25490197539329529 + 0.23921568691730499 Red Component - 0.52941179275512695 + 0.50196081399917603 Ansi 12 Color Alpha Component 1 Blue Component - 0.47843137383460999 + 0.45098039507865906 Color Space sRGB Green Component - 0.35294118523597717 + 0.3333333432674408 Red Component - 0.12156862765550613 + 0.11372549086809158 Ansi 13 Color Alpha Component 1 Blue Component - 0.47450980544090271 + 0.43921568989753723 Color Space sRGB Green Component - 0.25098040699958801 + 0.23137255012989044 Red Component - 0.52549022436141968 + 0.48235294222831726 Ansi 14 Color Alpha Component 1 Blue Component - 0.5215686559677124 + 0.48627451062202454 Color Space sRGB Green Component - 0.48627451062202454 + 0.45490196347236633 Red Component - 0.18431372940540314 + 0.16862745583057404 Ansi 15 Color Alpha Component 1 Blue Component - 0.80784314870834351 + 0.40784314274787903 Color Space sRGB Green Component - 0.82352942228317261 + 0.36862745881080627 Red Component - 0.86274510622024536 + 0.30980393290519714 Ansi 2 Color Alpha Component 1 Blue Component - 0.21568627655506134 + 0.19215686619281769 Color Space sRGB Green Component - 0.45490196347236633 + 0.42352941632270813 Red Component - 0.3803921639919281 + 0.30980393290519714 Ansi 3 Color @@ -176,39 +176,39 @@ Alpha Component 1 Blue Component - 0.92549020051956177 + 0.23529411852359772 Color Space sRGB Green Component - 0.92941176891326904 + 0.21176470816135406 Red Component - 0.94117647409439087 + 0.17254902422428131 Ansi 8 Color Alpha Component 1 Blue Component - 0.35686275362968445 + 0.729411780834198 Color Space sRGB Green Component - 0.32156863808631897 + 0.75686275959014893 Red Component - 0.26666668057441711 + 0.81176471710205078 Ansi 9 Color Alpha Component 1 Blue Component - 0.25882354378700256 + 0.24313725531101227 Color Space sRGB Green Component - 0.15686275064945221 + 0.14509804546833038 Red Component - 0.61176472902297974 + 0.58039218187332153 Background Color @@ -345,13 +345,13 @@ Alpha Component 1 Blue Component - 0.96956521272659302 + 0.92549020051956177 Color Space sRGB Green Component - 0.97826087474822998 + 0.92941176891326904 Red Component - 1 + 0.94117647409439087 diff --git a/extras/iterm/zenflesh.itermcolors b/extras/iterm/zenflesh.itermcolors new file mode 100644 index 0000000..cf305ff --- /dev/null +++ b/extras/iterm/zenflesh.itermcolors @@ -0,0 +1,357 @@ + + + + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.094117648899555206 + Color Space + sRGB + Green Component + 0.098039217293262482 + Red Component + 0.10980392247438431 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.48627451062202454 + Color Space + sRGB + Green Component + 0.43137255311012268 + Red Component + 0.87058824300765991 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.40784314274787903 + Color Space + sRGB + Green Component + 0.68235296010971069 + Red Component + 0.54509806632995605 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.40392157435417175 + Color Space + sRGB + Green Component + 0.54901963472366333 + Red Component + 0.83921569585800171 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 0.85490196943283081 + Color Space + sRGB + Green Component + 0.67058825492858887 + Red Component + 0.3803921639919281 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.75686275959014893 + Color Space + sRGB + Green Component + 0.52549022436141968 + Red Component + 0.81176471710205078 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.75686275959014893 + Color Space + sRGB + Green Component + 0.72156864404678345 + Red Component + 0.3960784375667572 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.58039218187332153 + Color Space + sRGB + Green Component + 0.56078433990478516 + Red Component + 0.53333336114883423 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.4117647111415863 + Color Space + sRGB + Green Component + 0.60784316062927246 + Red Component + 0.5058823823928833 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.39215686917304993 + Color Space + sRGB + Green Component + 0.49411764740943909 + Red Component + 0.71764707565307617 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.75294119119644165 + Color Space + sRGB + Green Component + 0.60000002384185791 + Red Component + 0.37647059559822083 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.65490198135375977 + Color Space + sRGB + Green Component + 0.47450980544090271 + Red Component + 0.69803923368453979 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.67843139171600342 + Color Space + sRGB + Green Component + 0.64705884456634521 + Red Component + 0.40000000596046448 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.76470589637756348 + Color Space + sRGB + Green Component + 0.74117648601531982 + Red Component + 0.70588237047195435 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.20392157137393951 + Color Space + sRGB + Green Component + 0.21960784494876862 + Red Component + 0.24313725531101227 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.56078433990478516 + Color Space + sRGB + Green Component + 0.51372551918029785 + Red Component + 0.90980392694473267 + + Background Color + + Alpha Component + 1 + Blue Component + 0.094117648899555206 + Color Space + sRGB + Green Component + 0.098039217293262482 + Red Component + 0.10980392247438431 + + Badge Color + + Alpha Component + 0.7057952880859375 + Blue Component + 0.36862742900848389 + Color Space + sRGB + Green Component + 0.29803919792175293 + Red Component + 0.26274508237838745 + + Bold Color + + Alpha Component + 1 + Blue Component + 0.150177001953125 + Color Space + sRGB + Green Component + 0.12776593863964081 + Red Component + 0.10535489022731781 + + Cursor Color + + Alpha Component + 1 + Blue Component + 0.79607844352722168 + Color Space + sRGB + Green Component + 0.78039216995239258 + Red Component + 0.7607843279838562 + + Cursor Guide Color + + Alpha Component + 1 + Blue Component + 0.32156860828399658 + Color Space + sRGB + Green Component + 0.25882357358932495 + Red Component + 0.23137256503105164 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.066666670143604279 + Color Space + sRGB + Green Component + 0.074509806931018829 + Red Component + 0.086274512112140656 + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.76470589637756348 + Color Space + sRGB + Green Component + 0.74117648601531982 + Red Component + 0.70588237047195435 + + Link Color + + Alpha Component + 1 + Blue Component + 0.7607843279838562 + Color Space + sRGB + Green Component + 0.57647061347961426 + Red Component + 0.25882354378700256 + + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.74901962280273438 + Color Space + sRGB + Green Component + 0.729411780834198 + Red Component + 0.70196080207824707 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.25490197539329529 + Color Space + sRGB + Green Component + 0.23137255012989044 + Red Component + 0.18823529779911041 + + Tab Color + + Alpha Component + 1 + Blue Component + 0.094117648899555206 + Color Space + sRGB + Green Component + 0.098039217293262482 + Red Component + 0.10980392247438431 + + + From 5123fda18df093503bc56802aa2416b396d034f8 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 17 Sep 2021 19:42:21 +0800 Subject: [PATCH 52/53] update screenshots --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d28d64b..0bf9b45 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ diffs, search matches. -![Zenbones main image](https://user-images.githubusercontent.com/7200153/131045472-05c76909-0071-4c24-bd30-f15da3ae4e82.jpg) +![Zenbones main image](https://user-images.githubusercontent.com/7200153/133774819-32b4e18b-6af7-48ac-91d5-16c4f413ad20.jpg)

A rock garden in Ryōan-ji. @@ -69,7 +69,7 @@ Change background colors lightness. | 'bright' | _(unset)_ | 'dim' | | :-----------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: | -| ![Bright lightness](https://user-images.githubusercontent.com/7200153/131272384-710e253f-059d-46fd-bf0e-7d82f62d62cd.png) | ![Default lightness](https://user-images.githubusercontent.com/7200153/131272333-3fb67e68-fcd2-48ae-b8c4-ab24b701ed5e.png) | ![Dim lightness](https://user-images.githubusercontent.com/7200153/131272410-329636bb-fd8e-42fb-83aa-f436d211b5ed.png) | +| ![Bright lightness](https://user-images.githubusercontent.com/7200153/133776552-5919f664-17d9-4d96-bf44-d587f20b01dc.png) | ![Default lightness](https://user-images.githubusercontent.com/7200153/133776625-d8e9dd88-13b3-4362-9cad-2031ef6ccf7d.png) | ![Dim lightness](https://user-images.githubusercontent.com/7200153/133776674-ff7d15e9-52e3-4a27-9099-722ffcbe1cb8.png) | #### g:zenflesh_darkness @@ -77,7 +77,7 @@ Change background colors darkness. | 'stark' | _(unset)_ | 'warm' | | :-----------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: | -| ![Bright lightness](https://user-images.githubusercontent.com/7200153/131272384-710e253f-059d-46fd-bf0e-7d82f62d62cd.png) | ![Default lightness](https://user-images.githubusercontent.com/7200153/131272333-3fb67e68-fcd2-48ae-b8c4-ab24b701ed5e.png) | ![Dim lightness](https://user-images.githubusercontent.com/7200153/131272410-329636bb-fd8e-42fb-83aa-f436d211b5ed.png) | +| ![Stark darkness](https://user-images.githubusercontent.com/7200153/133776839-4b12c3dd-233f-47d1-9740-006bf50e812a.png) | ![Default darkness](https://user-images.githubusercontent.com/7200153/133776882-26d006b4-50db-49ad-bd79-3bec327a95fc.png) | ![Warm darkness](https://user-images.githubusercontent.com/7200153/133776957-3d2949c9-51b6-4537-aca4-6ced80113b91.png) | #### g:zenbones_solid_vert_split From a96459a9739d8fc02093bf54e242ef4c5e34fb7d Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 17 Sep 2021 19:44:55 +0800 Subject: [PATCH 53/53] update links --- README.md | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0bf9b45..6f59db2 100644 --- a/README.md +++ b/README.md @@ -42,10 +42,8 @@ use "rktjmp/lush.nvim" Just apply the colorscheme as usual: ```vim -" light -colorscheme zenbones -" dark -colorscheme zenflesh +colorscheme zenbones " light +colorscheme zenflesh " dark ``` If you want to make use of the lua version: @@ -75,8 +73,8 @@ Change background colors lightness. Change background colors darkness. -| 'stark' | _(unset)_ | 'warm' | -| :-----------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: | +| 'stark' | _(unset)_ | 'warm' | +| :---------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: | | ![Stark darkness](https://user-images.githubusercontent.com/7200153/133776839-4b12c3dd-233f-47d1-9740-006bf50e812a.png) | ![Default darkness](https://user-images.githubusercontent.com/7200153/133776882-26d006b4-50db-49ad-bd79-3bec327a95fc.png) | ![Warm darkness](https://user-images.githubusercontent.com/7200153/133776957-3d2949c9-51b6-4537-aca4-6ced80113b91.png) | #### g:zenbones_solid_vert_split @@ -139,11 +137,11 @@ currently supported. ## Other implementations -- [iTerm2](extras/iterm/zenbones.itermcolors) -- [Kitty](extras/kitty/zenbones.conf) -- [Alacritty](extras/alacritty/zenbones.yml) -- [WezTerm](extras/wezterm/Zenbones.toml) -- [Tmux](extras/tmux/zenbones.tmux) +- [iTerm2](extras/iterm) +- [Kitty](extras/kitty) +- [Alacritty](extras/alacritty) +- [WezTerm](extras/wezterm) +- [Tmux](extras/tmux) It's also possible to generate color configuration files using a template, [this one for Kitty](lua/zenbones/build/kitty.lua) for example. Please feel free