From a78b161bcdb09e49b45bd8ca3ca871022a08054b Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 1 Nov 2021 08:46:10 +0800 Subject: [PATCH 01/31] breaking: deprecate zenflesh in favor of zenbones bg=dark --- README.md | 3 +-- doc/zenbones.md | 7 +++---- lua/zenflesh/init.lua | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f96b45f..0939707 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ Just apply the colorscheme as usual: set termguicolors colorscheme zenbones " light -colorscheme zenflesh " dark colorscheme zenwritten " Zero hue and saturation version colorscheme neobones " https://neovim.io flavor @@ -59,7 +58,7 @@ See [documentations](doc/zenbones.md) or `:help zenbones.txt`. ## Showcase -| Zenbones | Zenflesh | +| light | dark | | :------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------: | | ![diff](https://user-images.githubusercontent.com/7200153/133882734-de14cbb7-2faa-431b-9cb4-d674bf0f1d6a.png) | ![diff](https://user-images.githubusercontent.com/7200153/133882728-69abeca4-65d2-44e9-bddb-955e871c3143.png) | | ![diagnostics](https://user-images.githubusercontent.com/7200153/133882735-974ce339-1d5e-4bc0-9a95-82d21934222b.png) | ![diagnostics](https://user-images.githubusercontent.com/7200153/133882738-1b11be5f-5885-4ff9-9670-7e0bacbb6dd8.png) | diff --git a/doc/zenbones.md b/doc/zenbones.md index d9a4c3f..ad6ff46 100644 --- a/doc/zenbones.md +++ b/doc/zenbones.md @@ -12,7 +12,6 @@ Just apply the colorscheme as usual: set termguicolors colorscheme zenbones " light -colorscheme zenflesh " dark colorscheme zenwritten " Zero hue and saturation version colorscheme neobones " https://neovim.io flavor @@ -82,14 +81,14 @@ Set to `1` to enable compatibility mode. Enable in vim. ### lightline ```vim -let g:lightline = #{ colorscheme: 'zenbones' } " or zenflesh +let g:lightline = #{ colorscheme: 'zenbones' } " or any other flavor ``` ### lualine ```lua require("lualine").setup { - options = { theme = "zenbones" }, -- or zenflesh + options = { theme = "zenbones" }, -- or any other flavor } ``` @@ -99,7 +98,7 @@ Zenbones is pretty extensible thanks to Lush. You can easily retrieve the colors in lua: ```lua -local theme = require "zenbones" -- or zenflesh +local theme = require "zenbones" -- or any other flavor local palette = require "zenbones.palette" print(theme.StatusLine.bg.hex) diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index f31a5c0..8064208 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -1,4 +1,5 @@ local generator = require "zenbones.specs" local p = require "zenflesh.palette" +vim.notify("zenflesh is deprecated. Please use zenbones and set background=dark.", vim.log.levels.WARN, { title = "zenbones" }) return generator.generate(p, "dark", generator.get_global_config "zenflesh") From 71aa08560954f5b84ee4589a35ad232577d46cbc Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 1 Nov 2021 09:05:40 +0800 Subject: [PATCH 02/31] breaking: remove all zenflesh artifacts --- autoload/lightline/colorscheme/zenflesh.vim | 23 -- colors/zenflesh.vim | 263 -------------- extras/alacritty/zenflesh.yml | 27 -- extras/alacritty/zenflesh_stark.yml | 27 -- extras/alacritty/zenflesh_warm.yml | 27 -- extras/iterm/zenflesh.itermcolors | 357 -------------------- extras/iterm/zenflesh_stark.itermcolors | 357 -------------------- extras/iterm/zenflesh_warm.itermcolors | 357 -------------------- extras/kitty/zenflesh.conf | 40 --- extras/kitty/zenflesh_stark.conf | 40 --- extras/kitty/zenflesh_warm.conf | 40 --- extras/tmux/zenflesh.tmux | 18 - extras/tmux/zenflesh_stark.tmux | 18 - extras/tmux/zenflesh_warm.tmux | 18 - extras/wezterm/Zenflesh.toml | 13 - extras/wezterm/Zenflesh_stark.toml | 13 - extras/wezterm/Zenflesh_warm.toml | 13 - lua/zenflesh/init.lua | 5 - lua/zenflesh/palette.lua | 3 - 19 files changed, 1659 deletions(-) delete mode 100644 autoload/lightline/colorscheme/zenflesh.vim delete mode 100644 colors/zenflesh.vim delete mode 100644 extras/alacritty/zenflesh.yml delete mode 100644 extras/alacritty/zenflesh_stark.yml delete mode 100644 extras/alacritty/zenflesh_warm.yml delete mode 100644 extras/iterm/zenflesh.itermcolors delete mode 100644 extras/iterm/zenflesh_stark.itermcolors delete mode 100644 extras/iterm/zenflesh_warm.itermcolors delete mode 100644 extras/kitty/zenflesh.conf delete mode 100644 extras/kitty/zenflesh_stark.conf delete mode 100644 extras/kitty/zenflesh_warm.conf delete mode 100644 extras/tmux/zenflesh.tmux delete mode 100644 extras/tmux/zenflesh_stark.tmux delete mode 100644 extras/tmux/zenflesh_warm.tmux delete mode 100644 extras/wezterm/Zenflesh.toml delete mode 100644 extras/wezterm/Zenflesh_stark.toml delete mode 100644 extras/wezterm/Zenflesh_warm.toml delete mode 100644 lua/zenflesh/init.lua delete mode 100644 lua/zenflesh/palette.lua diff --git a/autoload/lightline/colorscheme/zenflesh.vim b/autoload/lightline/colorscheme/zenflesh.vim deleted file mode 100644 index f89c73f..0000000 --- a/autoload/lightline/colorscheme/zenflesh.vim +++ /dev/null @@ -1,23 +0,0 @@ -" This file is auto-generated from lua/zenbones/template/lightline.lua -let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} - -let s:p.normal.left = [ [ "#AFA099", "#736863", "bold" ], [ "#AFA099", "#4F4844" ] ] -let s:p.normal.middle = [ [ "#B4BDC3", "#3E3835" ] ] -let s:p.normal.right = [ [ "#AFA099", "#4F4844" ], [ "#AFA099", "#4F4844" ] ] -let s:p.normal.warning = [ [ "#B77E64", "#211D1B" ] ] -let s:p.normal.error = [ [ "#DE6E7C", "#251B1C" ] ] - -let s:p.inactive.left = [ [ "#CAD0D4", "#322D2B" ], [ "#CAD0D4", "#322D2B" ] ] -let s:p.inactive.middle = [ [ "#CAD0D4", "#322D2B" ] ] -let s:p.inactive.right = [ [ "#CAD0D4", "#322D2B" ] ] - -let s:p.insert.left = [ [ "#AFA099", "#324757", "bold" ], [ "#AFA099", "#4F4844" ] ] -let s:p.replace.left = [ [ "#AFA099", "#3E2225", "bold" ], [ "#AFA099", "#4F4844" ] ] -let s:p.visual.left = [ [ "#AFA099", "#3D4042", "bold" ], [ "#AFA099", "#4F4844" ] ] - -let s:p.tabline.left = [ [ "#B4BDC3", "#4F4844", "italic" ] ] -let s:p.tabline.middle = [ [ "#CAD0D4", "#322D2B" ] ] -let s:p.tabline.right = [ [ "#B4BDC3", "#4F4844" ] ] -let s:p.tabline.tabsel = [ [ "#B4BDC3", "#1C1917", "bold" ] ] - -let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p) diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim deleted file mode 100644 index 5353e26..0000000 --- a/colors/zenflesh.vim +++ /dev/null @@ -1,263 +0,0 @@ -" This file is auto-generated from lua/zenbones/template/vim.lua -if exists('g:colors_name') - highlight clear -endif - -set background=dark -let g:colors_name = 'zenflesh' - -let g:terminal_color_0 = '#1C1917' -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 = '#403833' -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('nvim') && (!exists('g:zenbones_compat') || g:zenbones_compat == 0) - lua package.loaded["zenflesh"] = nil - lua require "lush"(require "zenflesh", { force_clean = false }) - finish -else -highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold -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 CmpItemAbbr guifg=#979FA4 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbrDeprecated guifg=#64696D guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbrMatch guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold -highlight CmpItemAbbrMatchFuzzy guifg=#9FA7AD guibg=NONE guisp=NONE gui=bold -highlight CmpItemKind guifg=#868C91 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemMenu guifg=#797F84 guibg=NONE guisp=NONE gui=NONE -highlight CocMarkdownLink guifg=#66A5AD guibg=NONE guisp=NONE gui=underline -highlight ColorColumn guifg=NONE guibg=#55392C guisp=NONE gui=NONE -highlight Comment guifg=#6E6763 guibg=NONE guisp=NONE gui=italic -highlight Conceal guifg=#797F84 guibg=NONE guisp=NONE gui=bold,italic -highlight Constant guifg=#868C91 guibg=NONE guisp=NONE gui=italic -highlight Cursor guifg=#1C1917 guibg=#C4CACF guisp=NONE gui=NONE -highlight CursorLine guifg=NONE guibg=#25211F guisp=NONE gui=NONE -highlight CursorLineNr guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold -highlight Delimiter guifg=#867A74 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignError guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignWarn guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticUnderlineError guifg=#DE6E7C guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineHint guifg=#B279A7 guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineWarn guifg=#B77E64 guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticVirtualTextError guifg=#DE6E7C guibg=#251B1C guisp=NONE gui=NONE -highlight DiagnosticVirtualTextWarn guifg=#B77E64 guibg=#211D1B guisp=NONE gui=NONE -highlight DiffAdd guifg=NONE guibg=#232D1A guisp=NONE gui=NONE -highlight DiffChange guifg=NONE guibg=#1D2C36 guisp=NONE gui=NONE -highlight DiffDelete guifg=NONE guibg=#3E2225 guisp=NONE gui=NONE -highlight DiffText guifg=#B4BDC3 guibg=#324757 guisp=NONE gui=NONE -highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight Error guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE -highlight FloatBorder guifg=#837771 guibg=NONE guisp=NONE gui=NONE -highlight FoldColumn guifg=#685F5A guibg=NONE guisp=NONE gui=bold -highlight Folded guifg=#AFA099 guibg=#3E3835 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=#1C1917 guibg=#BF8FB5 guisp=NONE gui=bold -highlight IndentBlanklineChar guifg=#383432 guibg=NONE guisp=NONE gui=NONE -highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic -highlight LightspeedGreyWash guifg=#6E6763 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=#1C1917 guibg=#B279A7 guisp=NONE gui=bold -highlight LightspeedPendingChangeOpArea guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE -highlight LightspeedShortcut guifg=#1C1917 guibg=#B279A7 guisp=NONE gui=bold,underline -highlight LineNr guifg=#685F5A guibg=NONE guisp=NONE gui=NONE -highlight MoreMsg guifg=#819B69 guibg=NONE guisp=NONE gui=bold -highlight NeogitHunkHeaderHighlight guifg=#B4BDC3 guibg=#25211F guisp=NONE gui=bold -highlight NnnNormal guifg=#B4BDC3 guibg=#231F1D guisp=NONE gui=NONE -highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE -highlight NonText guifg=#5C534F guibg=NONE guisp=NONE gui=NONE -highlight Normal guifg=#B4BDC3 guibg=#1C1917 guisp=NONE gui=NONE -highlight NormalFloat guifg=NONE guibg=#2C2725 guisp=NONE gui=NONE -highlight Number guifg=#B4BDC3 guibg=NONE guisp=NONE gui=italic -highlight NvimTreeCursorLine guifg=NONE guibg=#322D2B guisp=NONE gui=NONE -highlight NvimTreeNormal guifg=#B4BDC3 guibg=#231F1D guisp=NONE gui=NONE -highlight NvimTreeRootFolder guifg=#6099C0 guibg=NONE guisp=NONE gui=bold -highlight NvimTreeSpecialFile guifg=#B279A7 guibg=NONE guisp=NONE gui=underline -highlight NvimTreeSymlink guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE -highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE -highlight Pmenu guifg=NONE guibg=#352F2D guisp=NONE gui=NONE -highlight PmenuSbar guifg=NONE guibg=#736863 guisp=NONE gui=NONE -highlight PmenuSel guifg=NONE guibg=#4F4844 guisp=NONE gui=NONE -highlight PmenuThumb guifg=NONE guibg=#8E817B guisp=NONE gui=NONE -highlight Search guifg=#B4BDC3 guibg=#65435E guisp=NONE gui=NONE -highlight SneakLabelMask guifg=#B279A7 guibg=#B279A7 guisp=NONE gui=NONE -highlight Special guifg=#8D9499 guibg=NONE guisp=NONE gui=bold -highlight SpecialComment guifg=#6E6763 guibg=NONE guisp=NONE gui=bold -highlight SpecialKey guifg=#5C534F 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=#3E3835 guisp=NONE gui=NONE -highlight StatusLineNC guifg=#CAD0D4 guibg=#322D2B guisp=NONE gui=NONE -highlight TSConstant guifg=#979FA4 guibg=NONE guisp=NONE gui=bold -highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight TelescopeBorder guifg=#837771 guibg=NONE guisp=NONE gui=NONE -highlight TelescopeMatching guifg=#B279A7 guibg=NONE guisp=NONE gui=bold -highlight TelescopeSelectionCaret guifg=#DE6E7C guibg=#25211F 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=#A1938C guibg=NONE guisp=NONE gui=NONE -highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline -highlight VertSplit guifg=#685F5A guibg=NONE guisp=NONE gui=NONE -highlight Visual guifg=NONE guibg=#3D4042 guisp=NONE gui=NONE -highlight WarningMsg guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE -highlight WildMenu guifg=#1C1917 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=#1C1917 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 DiagnosticUnderlineError -highlight! link CocErrorSign DiagnosticSignError -highlight! link CocErrorVirtualText DiagnosticVirtualTextError -highlight! link CocHintHighlight DiagnosticUnderlineHint -highlight! link CocHintSign DiagnosticSignHint -highlight! link CocInfoHighlight DiagnosticUnderlineInfo -highlight! link CocInfoSign DiagnosticSignInfo -highlight! link CocSelectedText SpellBad -highlight! link CocWarningHighlight DiagnosticUnderlineWarn -highlight! link CocWarningSign DiagnosticSignWarn -highlight! link CocWarningVitualText DiagnosticVirtualTextWarn -highlight! link CursorColumn CursorLine -highlight! link DiagnosticError Error -highlight! link DiagnosticWarn WarningMsg -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 DiagnosticError -highlight! link LspDiagnosticsDefaultHint DiagnosticHint -highlight! link LspDiagnosticsDefaultInformation DiagnosticInfo -highlight! link LspDiagnosticsDefaultWarning DiagnosticWarn -highlight! link LspDiagnosticsSignError DiagnosticSignError -highlight! link LspDiagnosticsSignHint DiagnosticSignHint -highlight! link LspDiagnosticsSignInformation DiagnosticSignInfo -highlight! link LspDiagnosticsSignWarning DiagnosticSignWarn -highlight! link LspDiagnosticsUnderlineError DiagnosticUnderlineError -highlight! link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint -highlight! link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo -highlight! link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn -highlight! link LspDiagnosticsVirtualTextError DiagnosticVirtualTextError -highlight! link LspDiagnosticsVirtualTextWarning DiagnosticVirtualTextWarn -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 DiagnosticError -highlight! link NeogitNotificationInfo DiagnosticInfo -highlight! link NeogitNotificationWarning DiagnosticWarn -highlight! link NnnNormalNC NnnNormal -highlight! link NvimTreeCursorColumn NvimTreeCursorLine -highlight! link NvimTreeGitDeleted diffRemoved -highlight! link NvimTreeGitDirty diffChanged -highlight! link NvimTreeGitNew diffAdded -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 TSConstBuiltin Number -highlight! link TSConstMacro Number -highlight! link TSDanger Error -highlight! link TSNamespace Special -highlight! link TSNote DiagnosticInfo -highlight! link TSTag Special -highlight! link TSVariable Identifier -highlight! link TSVariableBuiltin Number -highlight! link TSWarning WarningMsg -highlight! link TabLine StatusLine -highlight! link TabLineFill StatusLineNC -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 WhichKey Statement -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 -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 -highlight! link StatusLineTerm StatusLine -highlight! link StatusLineTermNC StatusLineNC -endif - -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 diff --git a/extras/alacritty/zenflesh.yml b/extras/alacritty/zenflesh.yml deleted file mode 100644 index 3b88e7e..0000000 --- a/extras/alacritty/zenflesh.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# zenflesh alacritty colors -colors: - # Default colors - primary: - background: '#1C1917' - foreground: '#B4BDC3' - # Normal colors - normal: - black: '#1C1917' - red: '#DE6E7C' - green: '#819B69' - yellow: '#B77E64' - blue: '#6099C0' - magenta: '#B279A7' - cyan: '#66A5AD' - white: '#B4BDC3' - # Bright colors - bright: - black: '#403833' - red: '#E8838F' - green: '#8BAE68' - yellow: '#D68C67' - blue: '#61ABDA' - magenta: '#CF86C1' - cyan: '#65B8C1' - white: '#888F94' diff --git a/extras/alacritty/zenflesh_stark.yml b/extras/alacritty/zenflesh_stark.yml deleted file mode 100644 index 9d81e4e..0000000 --- a/extras/alacritty/zenflesh_stark.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# zenflesh_stark alacritty colors -colors: - # Default colors - primary: - background: '#171210' - foreground: '#B4BDC3' - # Normal colors - normal: - black: '#1C1917' - red: '#DE6E7C' - green: '#819B69' - yellow: '#B77E64' - blue: '#6099C0' - magenta: '#B279A7' - cyan: '#66A5AD' - white: '#B4BDC3' - # Bright colors - bright: - black: '#403833' - red: '#E8838F' - green: '#8BAE68' - yellow: '#D68C67' - blue: '#61ABDA' - magenta: '#CF86C1' - cyan: '#65B8C1' - white: '#888F94' diff --git a/extras/alacritty/zenflesh_warm.yml b/extras/alacritty/zenflesh_warm.yml deleted file mode 100644 index e8b6931..0000000 --- a/extras/alacritty/zenflesh_warm.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# zenflesh_warm alacritty colors -colors: - # Default colors - primary: - background: '#221F1D' - foreground: '#B4BDC3' - # Normal colors - normal: - black: '#1C1917' - red: '#DE6E7C' - green: '#819B69' - yellow: '#B77E64' - blue: '#6099C0' - magenta: '#B279A7' - cyan: '#66A5AD' - white: '#B4BDC3' - # Bright colors - bright: - black: '#403833' - red: '#E8838F' - green: '#8BAE68' - yellow: '#D68C67' - blue: '#61ABDA' - magenta: '#CF86C1' - cyan: '#65B8C1' - white: '#888F94' diff --git a/extras/iterm/zenflesh.itermcolors b/extras/iterm/zenflesh.itermcolors deleted file mode 100644 index e66b5cb..0000000 --- a/extras/iterm/zenflesh.itermcolors +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.4862745098039216 - Color Space - sRGB - Green Component - 0.4313725490196079 - Red Component - 0.8705882352941177 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.4078431372549020 - Color Space - sRGB - Green Component - 0.6823529411764706 - Red Component - 0.5450980392156862 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.4039215686274510 - Color Space - sRGB - Green Component - 0.5490196078431373 - Red Component - 0.8392156862745098 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 0.8549019607843137 - Color Space - sRGB - Green Component - 0.6705882352941176 - Red Component - 0.3803921568627451 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.7568627450980392 - Color Space - sRGB - Green Component - 0.5254901960784314 - Red Component - 0.8117647058823529 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.7568627450980392 - Color Space - sRGB - Green Component - 0.7215686274509804 - Red Component - 0.3960784313725490 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.5803921568627451 - Color Space - sRGB - Green Component - 0.5607843137254902 - Red Component - 0.5333333333333333 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.4117647058823529 - Color Space - sRGB - Green Component - 0.6078431372549019 - Red Component - 0.5058823529411764 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.3921568627450980 - Color Space - sRGB - Green Component - 0.4941176470588236 - Red Component - 0.7176470588235294 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.7529411764705882 - Color Space - sRGB - Green Component - 0.6000000000000000 - Red Component - 0.3764705882352941 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.6549019607843137 - Color Space - sRGB - Green Component - 0.4745098039215686 - Red Component - 0.6980392156862745 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.6784313725490196 - Color Space - sRGB - Green Component - 0.6470588235294118 - Red Component - 0.4000000000000000 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.2000000000000000 - Color Space - sRGB - Green Component - 0.2196078431372549 - Red Component - 0.2509803921568627 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.5607843137254902 - Color Space - sRGB - Green Component - 0.5137254901960784 - Red Component - 0.9098039215686274 - - Background Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - Badge Color - - Alpha Component - 1 - Blue Component - 0.3882352941176471 - Color Space - sRGB - Green Component - 0.4039215686274510 - Red Component - 0.4313725490196079 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.2000000000000000 - Color Space - sRGB - Green Component - 0.2196078431372549 - Red Component - 0.2509803921568627 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.8117647058823529 - Color Space - sRGB - Green Component - 0.7921568627450980 - Red Component - 0.7686274509803922 - - Cursor Guide Color - - Alpha Component - 1 - Blue Component - 0.1215686274509804 - Color Space - sRGB - Green Component - 0.1294117647058824 - Red Component - 0.1450980392156863 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Link Color - - Alpha Component - 1 - Blue Component - 0.8549019607843137 - Color Space - sRGB - Green Component - 0.6705882352941176 - Red Component - 0.3803921568627451 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.2588235294117647 - Color Space - sRGB - Green Component - 0.2509803921568627 - Red Component - 0.2392156862745098 - - Tab Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - - \ No newline at end of file diff --git a/extras/iterm/zenflesh_stark.itermcolors b/extras/iterm/zenflesh_stark.itermcolors deleted file mode 100644 index 272db0f..0000000 --- a/extras/iterm/zenflesh_stark.itermcolors +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.4862745098039216 - Color Space - sRGB - Green Component - 0.4313725490196079 - Red Component - 0.8705882352941177 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.4078431372549020 - Color Space - sRGB - Green Component - 0.6823529411764706 - Red Component - 0.5450980392156862 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.4039215686274510 - Color Space - sRGB - Green Component - 0.5490196078431373 - Red Component - 0.8392156862745098 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 0.8549019607843137 - Color Space - sRGB - Green Component - 0.6705882352941176 - Red Component - 0.3803921568627451 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.7568627450980392 - Color Space - sRGB - Green Component - 0.5254901960784314 - Red Component - 0.8117647058823529 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.7568627450980392 - Color Space - sRGB - Green Component - 0.7215686274509804 - Red Component - 0.3960784313725490 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.5803921568627451 - Color Space - sRGB - Green Component - 0.5607843137254902 - Red Component - 0.5333333333333333 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.4117647058823529 - Color Space - sRGB - Green Component - 0.6078431372549019 - Red Component - 0.5058823529411764 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.3921568627450980 - Color Space - sRGB - Green Component - 0.4941176470588236 - Red Component - 0.7176470588235294 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.7529411764705882 - Color Space - sRGB - Green Component - 0.6000000000000000 - Red Component - 0.3764705882352941 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.6549019607843137 - Color Space - sRGB - Green Component - 0.4745098039215686 - Red Component - 0.6980392156862745 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.6784313725490196 - Color Space - sRGB - Green Component - 0.6470588235294118 - Red Component - 0.4000000000000000 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.2000000000000000 - Color Space - sRGB - Green Component - 0.2196078431372549 - Red Component - 0.2509803921568627 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.5607843137254902 - Color Space - sRGB - Green Component - 0.5137254901960784 - Red Component - 0.9098039215686274 - - Background Color - - Alpha Component - 1 - Blue Component - 0.0627450980392157 - Color Space - sRGB - Green Component - 0.0705882352941176 - Red Component - 0.0901960784313725 - - Badge Color - - Alpha Component - 1 - Blue Component - 0.3568627450980392 - Color Space - sRGB - Green Component - 0.3803921568627451 - Red Component - 0.4235294117647059 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.2000000000000000 - Color Space - sRGB - Green Component - 0.2196078431372549 - Red Component - 0.2509803921568627 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.8117647058823529 - Color Space - sRGB - Green Component - 0.7921568627450980 - Red Component - 0.7686274509803922 - - Cursor Guide Color - - Alpha Component - 1 - Blue Component - 0.0941176470588235 - Color Space - sRGB - Green Component - 0.1019607843137255 - Red Component - 0.1254901960784314 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.0627450980392157 - Color Space - sRGB - Green Component - 0.0705882352941176 - Red Component - 0.0901960784313725 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Link Color - - Alpha Component - 1 - Blue Component - 0.8549019607843137 - Color Space - sRGB - Green Component - 0.6705882352941176 - Red Component - 0.3803921568627451 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.2313725490196079 - Color Space - sRGB - Green Component - 0.2235294117647059 - Red Component - 0.2156862745098039 - - Tab Color - - Alpha Component - 1 - Blue Component - 0.0627450980392157 - Color Space - sRGB - Green Component - 0.0705882352941176 - Red Component - 0.0901960784313725 - - - \ No newline at end of file diff --git a/extras/iterm/zenflesh_warm.itermcolors b/extras/iterm/zenflesh_warm.itermcolors deleted file mode 100644 index f8211b3..0000000 --- a/extras/iterm/zenflesh_warm.itermcolors +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.4862745098039216 - Color Space - sRGB - Green Component - 0.4313725490196079 - Red Component - 0.8705882352941177 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.4078431372549020 - Color Space - sRGB - Green Component - 0.6823529411764706 - Red Component - 0.5450980392156862 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.4039215686274510 - Color Space - sRGB - Green Component - 0.5490196078431373 - Red Component - 0.8392156862745098 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 0.8549019607843137 - Color Space - sRGB - Green Component - 0.6705882352941176 - Red Component - 0.3803921568627451 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.7568627450980392 - Color Space - sRGB - Green Component - 0.5254901960784314 - Red Component - 0.8117647058823529 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.7568627450980392 - Color Space - sRGB - Green Component - 0.7215686274509804 - Red Component - 0.3960784313725490 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.5803921568627451 - Color Space - sRGB - Green Component - 0.5607843137254902 - Red Component - 0.5333333333333333 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.4117647058823529 - Color Space - sRGB - Green Component - 0.6078431372549019 - Red Component - 0.5058823529411764 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.3921568627450980 - Color Space - sRGB - Green Component - 0.4941176470588236 - Red Component - 0.7176470588235294 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.7529411764705882 - Color Space - sRGB - Green Component - 0.6000000000000000 - Red Component - 0.3764705882352941 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.6549019607843137 - Color Space - sRGB - Green Component - 0.4745098039215686 - Red Component - 0.6980392156862745 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.6784313725490196 - Color Space - sRGB - Green Component - 0.6470588235294118 - Red Component - 0.4000000000000000 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.2000000000000000 - Color Space - sRGB - Green Component - 0.2196078431372549 - Red Component - 0.2509803921568627 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.5607843137254902 - Color Space - sRGB - Green Component - 0.5137254901960784 - Red Component - 0.9098039215686274 - - Background Color - - Alpha Component - 1 - Blue Component - 0.1137254901960784 - Color Space - sRGB - Green Component - 0.1215686274509804 - Red Component - 0.1333333333333333 - - Badge Color - - Alpha Component - 1 - Blue Component - 0.4000000000000000 - Color Space - sRGB - Green Component - 0.4117647058823529 - Red Component - 0.4392156862745098 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.2000000000000000 - Color Space - sRGB - Green Component - 0.2196078431372549 - Red Component - 0.2509803921568627 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.8117647058823529 - Color Space - sRGB - Green Component - 0.7921568627450980 - Red Component - 0.7686274509803922 - - Cursor Guide Color - - Alpha Component - 1 - Blue Component - 0.1450980392156863 - Color Space - sRGB - Green Component - 0.1529411764705882 - Red Component - 0.1686274509803922 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.1137254901960784 - Color Space - sRGB - Green Component - 0.1215686274509804 - Red Component - 0.1333333333333333 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Link Color - - Alpha Component - 1 - Blue Component - 0.8549019607843137 - Color Space - sRGB - Green Component - 0.6705882352941176 - Red Component - 0.3803921568627451 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.2862745098039216 - Color Space - sRGB - Green Component - 0.2784313725490196 - Red Component - 0.2666666666666667 - - Tab Color - - Alpha Component - 1 - Blue Component - 0.1137254901960784 - Color Space - sRGB - Green Component - 0.1215686274509804 - Red Component - 0.1333333333333333 - - - \ No newline at end of file diff --git a/extras/kitty/zenflesh.conf b/extras/kitty/zenflesh.conf deleted file mode 100644 index 62f5bbd..0000000 --- a/extras/kitty/zenflesh.conf +++ /dev/null @@ -1,40 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua -# 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 #1C1917 -foreground #B4BDC3 -selection_background #3D4042 -selection_foreground #B4BDC3 -url_color #61ABDA -cursor #B4BDC3 - -# Tabs -active_tab_background #65435E -active_tab_foreground #B4BDC3 -inactive_tab_background #3E3835 -inactive_tab_foreground #B4BDC3 -#tab_bar_background ${tab_bar_background} - -# normal -color0 #1C1917 -color1 #DE6E7C -color2 #819B69 -color3 #B77E64 -color4 #6099C0 -color5 #B279A7 -color6 #66A5AD -color7 #B4BDC3 - -# bright -color8 #403833 -color9 #E8838F -color10 #8BAE68 -color11 #D68C67 -color12 #61ABDA -color13 #CF86C1 -color14 #65B8C1 -color15 #888F94 diff --git a/extras/kitty/zenflesh_stark.conf b/extras/kitty/zenflesh_stark.conf deleted file mode 100644 index 082698c..0000000 --- a/extras/kitty/zenflesh_stark.conf +++ /dev/null @@ -1,40 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua -# vim:ft=kitty -## name: zenflesh_stark -## license: MIT -## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenflesh_stark.conf - -background #171210 -foreground #B4BDC3 -selection_background #37393B -selection_foreground #B4BDC3 -url_color #61ABDA -cursor #B4BDC3 - -# Tabs -active_tab_background #5C3D56 -active_tab_foreground #B4BDC3 -inactive_tab_background #39312C -inactive_tab_foreground #B4BDC3 -#tab_bar_background ${tab_bar_background} - -# normal -color0 #1C1917 -color1 #DE6E7C -color2 #819B69 -color3 #B77E64 -color4 #6099C0 -color5 #B279A7 -color6 #66A5AD -color7 #B4BDC3 - -# bright -color8 #403833 -color9 #E8838F -color10 #8BAE68 -color11 #D68C67 -color12 #61ABDA -color13 #CF86C1 -color14 #65B8C1 -color15 #888F94 diff --git a/extras/kitty/zenflesh_warm.conf b/extras/kitty/zenflesh_warm.conf deleted file mode 100644 index 620f783..0000000 --- a/extras/kitty/zenflesh_warm.conf +++ /dev/null @@ -1,40 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua -# vim:ft=kitty -## name: zenflesh_warm -## license: MIT -## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenflesh_warm.conf - -background #221F1D -foreground #B4BDC3 -selection_background #444749 -selection_foreground #B4BDC3 -url_color #61ABDA -cursor #B4BDC3 - -# Tabs -active_tab_background #6E4966 -active_tab_foreground #B4BDC3 -inactive_tab_background #423C39 -inactive_tab_foreground #B4BDC3 -#tab_bar_background ${tab_bar_background} - -# normal -color0 #1C1917 -color1 #DE6E7C -color2 #819B69 -color3 #B77E64 -color4 #6099C0 -color5 #B279A7 -color6 #66A5AD -color7 #B4BDC3 - -# bright -color8 #403833 -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 deleted file mode 100644 index 07af8ae..0000000 --- a/extras/tmux/zenflesh.tmux +++ /dev/null @@ -1,18 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/tmux.lua -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='#B279A7',bg='#B4BDC3',bold - -set -g pane-border-style fg='#B279A7' -set -g pane-active-border-style fg='#B279A7' - -set -g message-style fg='#1C1917',bg='#3D4042' - -set -g display-panes-active-colour '#B279A7' -set -g display-panes-colour '#B279A7' - -set -g clock-mode-colour '#B279A7' - -set -g mode-style fg='#1C1917',bg='#3D4042' diff --git a/extras/tmux/zenflesh_stark.tmux b/extras/tmux/zenflesh_stark.tmux deleted file mode 100644 index b11a5e5..0000000 --- a/extras/tmux/zenflesh_stark.tmux +++ /dev/null @@ -1,18 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/tmux.lua -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='#B279A7',bg='#B4BDC3',bold - -set -g pane-border-style fg='#B279A7' -set -g pane-active-border-style fg='#B279A7' - -set -g message-style fg='#1C1917',bg='#37393B' - -set -g display-panes-active-colour '#B279A7' -set -g display-panes-colour '#B279A7' - -set -g clock-mode-colour '#B279A7' - -set -g mode-style fg='#1C1917',bg='#37393B' diff --git a/extras/tmux/zenflesh_warm.tmux b/extras/tmux/zenflesh_warm.tmux deleted file mode 100644 index b9549b6..0000000 --- a/extras/tmux/zenflesh_warm.tmux +++ /dev/null @@ -1,18 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/tmux.lua -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='#B279A7',bg='#B4BDC3',bold - -set -g pane-border-style fg='#B279A7' -set -g pane-active-border-style fg='#B279A7' - -set -g message-style fg='#1C1917',bg='#444749' - -set -g display-panes-active-colour '#B279A7' -set -g display-panes-colour '#B279A7' - -set -g clock-mode-colour '#B279A7' - -set -g mode-style fg='#1C1917',bg='#444749' diff --git a/extras/wezterm/Zenflesh.toml b/extras/wezterm/Zenflesh.toml deleted file mode 100644 index 4657541..0000000 --- a/extras/wezterm/Zenflesh.toml +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/wezterm.lua -# Zenflesh -[colors] -foreground = "#B4BDC3" -background = "#1C1917" -cursor_bg = "#C4CACF" -cursor_border = "#1C1917" -cursor_fg = "#1C1917" -selection_bg = "#3D4042" -selection_fg = "#B4BDC3" - -ansi = ["#1C1917", "#DE6E7C", "#819B69", "#B77E64", "#6099C0", "#B279A7", "#66A5AD", "#B4BDC3"] -brights = ["#403833", "#E8838F", "#8BAE68", "#D68C67", "#61ABDA", "#CF86C1", "#65B8C1", "#888F94"] diff --git a/extras/wezterm/Zenflesh_stark.toml b/extras/wezterm/Zenflesh_stark.toml deleted file mode 100644 index 3f80563..0000000 --- a/extras/wezterm/Zenflesh_stark.toml +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/wezterm.lua -# Zenflesh_stark -[colors] -foreground = "#B4BDC3" -background = "#171210" -cursor_bg = "#C4CACF" -cursor_border = "#171210" -cursor_fg = "#171210" -selection_bg = "#37393B" -selection_fg = "#B4BDC3" - -ansi = ["#1C1917", "#DE6E7C", "#819B69", "#B77E64", "#6099C0", "#B279A7", "#66A5AD", "#B4BDC3"] -brights = ["#403833", "#E8838F", "#8BAE68", "#D68C67", "#61ABDA", "#CF86C1", "#65B8C1", "#888F94"] diff --git a/extras/wezterm/Zenflesh_warm.toml b/extras/wezterm/Zenflesh_warm.toml deleted file mode 100644 index ed9f050..0000000 --- a/extras/wezterm/Zenflesh_warm.toml +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/wezterm.lua -# Zenflesh_warm -[colors] -foreground = "#B4BDC3" -background = "#221F1D" -cursor_bg = "#C4CACF" -cursor_border = "#221F1D" -cursor_fg = "#221F1D" -selection_bg = "#444749" -selection_fg = "#B4BDC3" - -ansi = ["#1C1917", "#DE6E7C", "#819B69", "#B77E64", "#6099C0", "#B279A7", "#66A5AD", "#B4BDC3"] -brights = ["#403833", "#E8838F", "#8BAE68", "#D68C67", "#61ABDA", "#CF86C1", "#65B8C1", "#888F94"] diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua deleted file mode 100644 index 8064208..0000000 --- a/lua/zenflesh/init.lua +++ /dev/null @@ -1,5 +0,0 @@ -local generator = require "zenbones.specs" -local p = require "zenflesh.palette" - -vim.notify("zenflesh is deprecated. Please use zenbones and set background=dark.", vim.log.levels.WARN, { title = "zenbones" }) -return generator.generate(p, "dark", generator.get_global_config "zenflesh") diff --git a/lua/zenflesh/palette.lua b/lua/zenflesh/palette.lua deleted file mode 100644 index 06341dc..0000000 --- a/lua/zenflesh/palette.lua +++ /dev/null @@ -1,3 +0,0 @@ -local util = require "zenbones.util" - -return util.palette_extend {} From 0b00f673b7d5667890afe4377805e479d3a6157a Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 1 Nov 2021 10:10:49 +0800 Subject: [PATCH 03/31] wip: overhaul vim template --- lua/zenbones/build.lua | 91 ++++++++++++++++++----------------- lua/zenbones/init.lua | 5 +- lua/zenbones/palette.lua | 7 ++- lua/zenbones/template/vim.lua | 22 +++------ 4 files changed, 62 insertions(+), 63 deletions(-) diff --git a/lua/zenbones/build.lua b/lua/zenbones/build.lua index 55ad332..a4919b3 100644 --- a/lua/zenbones/build.lua +++ b/lua/zenbones/build.lua @@ -22,19 +22,27 @@ end local config_set = { { - name = "zenbones", - palette = require "zenbones.palette", - opt = { - template_opt = { - vim = { bg = "light" }, - }, - }, + name = "zenbones_light", + specs = "zenbones", + palette = require("zenbones.palette").light, + setup = function() + vim.opt.background = "light" + end, + }, + + { + name = "zenbones_dark", + specs = "zenbones", + palette = require("zenbones.palette").dark, + setup = function() + vim.opt.background = "dark" + end, }, { name = "zenbones_bright", specs = "zenbones", - palette = require "zenbones.palette", + palette = require("zenbones.palette").light, setup = function() vim.g.zenbones_lightness = "bright" end, @@ -49,7 +57,7 @@ local config_set = { { name = "zenbones_dim", specs = "zenbones", - palette = require "zenbones.palette", + palette = require("zenbones.palette").light, setup = function() vim.g.zenbones_lightness = "dim" end, @@ -61,40 +69,35 @@ local config_set = { }, }, - { - name = "zenflesh", - palette = require "zenflesh.palette", - }, - - { - name = "zenflesh_stark", - specs = "zenflesh", - palette = require "zenflesh.palette", - setup = function() - vim.g.zenflesh_darkness = "stark" - end, - cleanup = function() - vim.api.nvim_del_var "zenflesh_darkness" - end, - opt = { - exclude = { "vim", "lightline", "lualine" }, - }, - }, - - { - name = "zenflesh_warm", - specs = "zenflesh", - palette = require "zenflesh.palette", - setup = function() - vim.g.zenflesh_darkness = "warm" - end, - cleanup = function() - vim.api.nvim_del_var "zenflesh_darkness" - end, - opt = { - exclude = { "vim", "lightline", "lualine" }, - }, - }, + -- { + -- name = "zenflesh_stark", + -- specs = "zenflesh", + -- palette = require "zenflesh.palette", + -- setup = function() + -- vim.g.zenflesh_darkness = "stark" + -- end, + -- cleanup = function() + -- vim.api.nvim_del_var "zenflesh_darkness" + -- end, + -- opt = { + -- exclude = { "vim", "lightline", "lualine" }, + -- }, + -- }, + -- + -- { + -- name = "zenflesh_warm", + -- specs = "zenflesh", + -- palette = require "zenflesh.palette", + -- setup = function() + -- vim.g.zenflesh_darkness = "warm" + -- end, + -- cleanup = function() + -- vim.api.nvim_del_var "zenflesh_darkness" + -- end, + -- opt = { + -- exclude = { "vim", "lightline", "lualine" }, + -- }, + -- }, { name = "neobones_light", @@ -218,7 +221,7 @@ local config_set = { { name = "nordbones", - palette = require("nordbones.palette").derived, + palette = require("nordbones.palette").dark, opt = { exclude = { "alacritty", "iterm", "kitty", "tmux", "wezterm" }, }, diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 4d63812..fb12a3e 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -1,4 +1,5 @@ local generator = require "zenbones.specs" -local p = require "zenbones.palette" +local bg = vim.opt.background:get() +local p = require("zenbones.palette")[bg] -return generator.generate(p, "light", generator.get_global_config("zenbones", "light")) +return generator.generate(p, bg, generator.get_global_config("zenbones", bg)) diff --git a/lua/zenbones/palette.lua b/lua/zenbones/palette.lua index bc69c42..568ae55 100644 --- a/lua/zenbones/palette.lua +++ b/lua/zenbones/palette.lua @@ -1,3 +1,8 @@ local util = require "zenbones.util" -return util.palette_extend({}, "light") +local M = {} + +M.light = util.palette_extend({}, "light") +M.dark = util.palette_extend {} + +return M diff --git a/lua/zenbones/template/vim.lua b/lua/zenbones/template/vim.lua index 91a529c..6d2a99e 100644 --- a/lua/zenbones/template/vim.lua +++ b/lua/zenbones/template/vim.lua @@ -1,21 +1,10 @@ local template = [[" This file is auto-generated from lua/zenbones/template/vim.lua -if exists('g:colors_name') - highlight clear -endif - -set background=${background} -let g:colors_name = '${name}' +function! ${name}#load() ${termcolors} -if has('nvim') && (!exists('g:${name}_compat') || g:${name}_compat == 0) - lua package.loaded["${specs_path}"] = nil - lua require "lush"(require "${specs_path}", { force_clean = false }) - finish -else ${vimcolors} highlight! link StatusLineTerm StatusLine highlight! link StatusLineTermNC StatusLineNC -endif if has('terminal') let g:terminal_ansi_colors = [ @@ -37,10 +26,12 @@ if has('terminal') \ g:terminal_color_15 \ ] endif + +endfunction ]] -local lush = require "lush" -return function(name, specs, p, opt) +return function(name, specs, p) + local lush = require "lush" local term = require("zenbones.term").colors_map(p) local termcolors = "" for i, v in ipairs(term) do @@ -55,12 +46,11 @@ return function(name, specs, p, opt) local vimcolors = table.concat(vim.fn.sort(compiled), "\n") return { - string.format("colors/%s.vim", name), + string.format("autoload/%s.vim", name), template, { name = name, specs_path = name, - background = opt.bg or "dark", termcolors = termcolors, vimcolors = vimcolors, }, From e51f15f12a749404585876ffe306df70852eaba7 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 1 Nov 2021 10:11:37 +0800 Subject: [PATCH 04/31] convert ERROR to WARN --- lua/zenbones/specs/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/zenbones/specs/init.lua b/lua/zenbones/specs/init.lua index 1b37d4d..be5b8c5 100644 --- a/lua/zenbones/specs/init.lua +++ b/lua/zenbones/specs/init.lua @@ -24,7 +24,7 @@ function M.get_global_config(prefix, base_bg) if vim.g[prefix .. "_dim_noncurrent_window"] then vim.notify( prefix .. "_dim_noncurrent_window is replaced by " .. prefix .. "_darken_noncurrent_window", - vim.log.levels.ERROR, + vim.log.levels.WARN, { title = "zenbones" } ) end From b25eeeb9d2e0fa41cf09a58a9a6eefa43ddf6570 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Mon, 1 Nov 2021 10:12:33 +0800 Subject: [PATCH 05/31] use helper to apply colorscheme --- autoload/zenbones_dark.vim | 240 +++++++++++++++++++++++++++++++++ autoload/zenbones_light.vim | 240 +++++++++++++++++++++++++++++++++ colors/zenbones.vim | 258 +----------------------------------- lua/zenbones/util.lua | 8 ++ 4 files changed, 491 insertions(+), 255 deletions(-) create mode 100644 autoload/zenbones_dark.vim create mode 100644 autoload/zenbones_light.vim diff --git a/autoload/zenbones_dark.vim b/autoload/zenbones_dark.vim new file mode 100644 index 0000000..57d73fd --- /dev/null +++ b/autoload/zenbones_dark.vim @@ -0,0 +1,240 @@ +" This file is auto-generated from lua/zenbones/template/vim.lua +function! zenbones_dark#load() + +let g:terminal_color_0 = '#1C1917' +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 = '#403833' +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' + +highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold +highlight BufferVisible guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight BufferVisibleIndex guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight BufferVisibleSign guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CmpItemAbbr guifg=#979FA4 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CmpItemAbbrDeprecated guifg=#64696D guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CmpItemAbbrMatch guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight CmpItemAbbrMatchFuzzy guifg=#9FA7AD guibg=NONE guisp=NONE gui=bold cterm=bold +highlight CmpItemKind guifg=#868C91 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CmpItemMenu guifg=#797F84 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CocMarkdownLink guifg=#66A5AD guibg=NONE guisp=NONE gui=underline cterm=underline +highlight ColorColumn guifg=NONE guibg=#55392C guisp=NONE gui=NONE cterm=NONE +highlight Comment guifg=#6E6763 guibg=NONE guisp=NONE gui=italic cterm=italic +highlight Conceal guifg=#797F84 guibg=NONE guisp=NONE gui=bold,italic cterm=bold,italic +highlight Constant guifg=#868C91 guibg=NONE guisp=NONE gui=italic cterm=italic +highlight Cursor guifg=#1C1917 guibg=#C4CACF guisp=NONE gui=NONE cterm=NONE +highlight CursorLine guifg=NONE guibg=#25211F guisp=NONE gui=NONE cterm=NONE +highlight CursorLineNr guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight Delimiter guifg=#867A74 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticSignError guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticSignHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticSignInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticSignWarn guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticUnderlineError guifg=#DE6E7C guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight DiagnosticUnderlineHint guifg=#B279A7 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight DiagnosticUnderlineInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight DiagnosticUnderlineWarn guifg=#B77E64 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight DiagnosticVirtualTextError guifg=#DE6E7C guibg=#251B1C guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticVirtualTextWarn guifg=#B77E64 guibg=#211D1B guisp=NONE gui=NONE cterm=NONE +highlight DiffAdd guifg=NONE guibg=#232D1A guisp=NONE gui=NONE cterm=NONE +highlight DiffChange guifg=NONE guibg=#1D2C36 guisp=NONE gui=NONE cterm=NONE +highlight DiffDelete guifg=NONE guibg=#3E2225 guisp=NONE gui=NONE cterm=NONE +highlight DiffText guifg=#B4BDC3 guibg=#324757 guisp=NONE gui=NONE cterm=NONE +highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold +highlight Error guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight FloatBorder guifg=#837771 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight FoldColumn guifg=#685F5A guibg=NONE guisp=NONE gui=bold cterm=bold +highlight Folded guifg=#AFA099 guibg=#3E3835 guisp=NONE gui=NONE cterm=NONE +highlight Function guifg=#B4BDC3 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight GitSignsAdd guifg=#819B69 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight GitSignsChange guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight GitSignsDelete guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight HopNextKey2 guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Identifier guifg=#979FA4 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight IncSearch guifg=#1C1917 guibg=#BF8FB5 guisp=NONE gui=bold cterm=bold +highlight IndentBlanklineChar guifg=#383432 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic cterm=italic +highlight LightspeedGreyWash guifg=#6E6763 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight LightspeedLabel guifg=#B279A7 guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline +highlight LightspeedLabelDistant guifg=#66A5AD guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline +highlight LightspeedLabelDistantOverlapped guifg=#66A5AD guibg=NONE guisp=NONE gui=underline cterm=underline +highlight LightspeedLabelOverlapped guifg=#B279A7 guibg=NONE guisp=NONE gui=underline cterm=underline +highlight LightspeedOneCharMatch guifg=#1C1917 guibg=#B279A7 guisp=NONE gui=bold cterm=bold +highlight LightspeedPendingChangeOpArea guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight LightspeedShortcut guifg=#1C1917 guibg=#B279A7 guisp=NONE gui=bold,underline cterm=bold,underline +highlight LineNr guifg=#685F5A guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight MoreMsg guifg=#819B69 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight NeogitHunkHeaderHighlight guifg=#B4BDC3 guibg=#25211F guisp=NONE gui=bold cterm=bold +highlight NnnNormal guifg=#B4BDC3 guibg=#231F1D guisp=NONE gui=NONE cterm=NONE +highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight NonText guifg=#5C534F guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Normal guifg=#B4BDC3 guibg=#1C1917 guisp=NONE gui=NONE cterm=NONE +highlight NormalFloat guifg=NONE guibg=#2C2725 guisp=NONE gui=NONE cterm=NONE +highlight Number guifg=#B4BDC3 guibg=NONE guisp=NONE gui=italic cterm=italic +highlight NvimTreeCursorLine guifg=NONE guibg=#322D2B guisp=NONE gui=NONE cterm=NONE +highlight NvimTreeNormal guifg=#B4BDC3 guibg=#231F1D guisp=NONE gui=NONE cterm=NONE +highlight NvimTreeRootFolder guifg=#6099C0 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight NvimTreeSpecialFile guifg=#B279A7 guibg=NONE guisp=NONE gui=underline cterm=underline +highlight NvimTreeSymlink guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Pmenu guifg=NONE guibg=#352F2D guisp=NONE gui=NONE cterm=NONE +highlight PmenuSbar guifg=NONE guibg=#736863 guisp=NONE gui=NONE cterm=NONE +highlight PmenuSel guifg=NONE guibg=#4F4844 guisp=NONE gui=NONE cterm=NONE +highlight PmenuThumb guifg=NONE guibg=#8E817B guisp=NONE gui=NONE cterm=NONE +highlight Search guifg=#B4BDC3 guibg=#65435E guisp=NONE gui=NONE cterm=NONE +highlight SneakLabelMask guifg=#B279A7 guibg=#B279A7 guisp=NONE gui=NONE cterm=NONE +highlight Special guifg=#8D9499 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight SpecialComment guifg=#6E6763 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight SpecialKey guifg=#5C534F guibg=NONE guisp=NONE gui=italic cterm=italic +highlight SpellBad guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight SpellCap guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight SpellRare guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight Statement guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight StatusLine guifg=#B4BDC3 guibg=#3E3835 guisp=NONE gui=NONE cterm=NONE +highlight StatusLineNC guifg=#CAD0D4 guibg=#322D2B guisp=NONE gui=NONE cterm=NONE +highlight TSConstant guifg=#979FA4 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold +highlight TelescopeBorder guifg=#837771 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight TelescopeMatching guifg=#B279A7 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight TelescopeSelectionCaret guifg=#DE6E7C guibg=#25211F guisp=NONE gui=NONE cterm=NONE +highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold +highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline +highlight Type guifg=#A1938C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline +highlight VertSplit guifg=#685F5A guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Visual guifg=NONE guibg=#3D4042 guisp=NONE gui=NONE cterm=NONE +highlight WarningMsg guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight WildMenu guifg=#1C1917 guibg=#B279A7 guisp=NONE gui=NONE cterm=NONE +highlight diffAdded guifg=#819B69 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight diffChanged guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight diffFile guifg=#B77E64 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight diffIndexLine guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight diffLine guifg=#B279A7 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight diffNewFile guifg=#819B69 guibg=NONE guisp=NONE gui=italic cterm=italic +highlight diffOldFile guifg=#DE6E7C guibg=NONE guisp=NONE gui=italic cterm=italic +highlight diffRemoved guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight lCursor guifg=#1C1917 guibg=#797F84 guisp=NONE gui=NONE cterm=NONE +highlight markdownH1 guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline +highlight! link Boolean Number +highlight! link BufferCurrent TabLineSel +highlight! link CocCodeLens LineNr +highlight! link CocErrorHighlight DiagnosticUnderlineError +highlight! link CocErrorSign DiagnosticSignError +highlight! link CocErrorVirtualText DiagnosticVirtualTextError +highlight! link CocHintHighlight DiagnosticUnderlineHint +highlight! link CocHintSign DiagnosticSignHint +highlight! link CocInfoHighlight DiagnosticUnderlineInfo +highlight! link CocInfoSign DiagnosticSignInfo +highlight! link CocSelectedText SpellBad +highlight! link CocWarningHighlight DiagnosticUnderlineWarn +highlight! link CocWarningSign DiagnosticSignWarn +highlight! link CocWarningVitualText DiagnosticVirtualTextWarn +highlight! link CursorColumn CursorLine +highlight! link DiagnosticError Error +highlight! link DiagnosticWarn WarningMsg +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 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 DiagnosticError +highlight! link NeogitNotificationInfo DiagnosticInfo +highlight! link NeogitNotificationWarning DiagnosticWarn +highlight! link NnnNormalNC NnnNormal +highlight! link NvimTreeCursorColumn NvimTreeCursorLine +highlight! link NvimTreeGitDeleted diffRemoved +highlight! link NvimTreeGitDirty diffChanged +highlight! link NvimTreeGitNew diffAdded +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 TSConstBuiltin Number +highlight! link TSConstMacro Number +highlight! link TSDanger Error +highlight! link TSNamespace Special +highlight! link TSNote DiagnosticInfo +highlight! link TSTag Special +highlight! link TSVariable Identifier +highlight! link TSVariableBuiltin Number +highlight! link TSWarning WarningMsg +highlight! link TabLine StatusLine +highlight! link TabLineFill StatusLineNC +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 WhichKey Statement +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 +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 +highlight! link StatusLineTerm StatusLine +highlight! link StatusLineTermNC StatusLineNC + +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 + +endfunction diff --git a/autoload/zenbones_light.vim b/autoload/zenbones_light.vim new file mode 100644 index 0000000..86cda79 --- /dev/null +++ b/autoload/zenbones_light.vim @@ -0,0 +1,240 @@ +" This file is auto-generated from lua/zenbones/template/vim.lua +function! zenbones_light#load() + +let g:terminal_color_0 = '#F0EDEC' +let g:terminal_color_1 = '#A8334C' +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 = '#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' + +highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold +highlight BufferVisible guifg=#596A76 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight BufferVisibleIndex guifg=#596A76 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight BufferVisibleSign guifg=#596A76 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CmpItemAbbr guifg=#44525B guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CmpItemAbbrDeprecated guifg=#728794 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CmpItemAbbrMatch guifg=#2C363C guibg=NONE guisp=NONE gui=bold cterm=bold +highlight CmpItemAbbrMatchFuzzy guifg=#3E4B53 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight CmpItemKind guifg=#556570 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CmpItemMenu guifg=#5E6F7B guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight CocMarkdownLink guifg=#3B8992 guibg=NONE guisp=NONE gui=underline cterm=underline +highlight ColorColumn guifg=NONE guibg=#E6C5BD guisp=NONE gui=NONE cterm=NONE +highlight Comment guifg=#948985 guibg=NONE guisp=NONE gui=italic cterm=italic +highlight Conceal guifg=#4F5E68 guibg=NONE guisp=NONE gui=bold,italic cterm=bold,italic +highlight Constant guifg=#556570 guibg=NONE guisp=NONE gui=italic cterm=italic +highlight Cursor guifg=#F0EDEC guibg=#2C363C guisp=NONE gui=NONE cterm=NONE +highlight CursorLine guifg=NONE guibg=#E9E4E2 guisp=NONE gui=NONE cterm=NONE +highlight CursorLineNr guifg=#2C363C guibg=NONE guisp=NONE gui=bold cterm=bold +highlight Delimiter guifg=#8E817B guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticSignError guifg=#A8334C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticSignHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticSignInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticSignWarn guifg=#944927 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticUnderlineError guifg=#A8334C guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight DiagnosticUnderlineHint guifg=#88507D guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight DiagnosticUnderlineInfo guifg=#286486 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight DiagnosticUnderlineWarn guifg=#944927 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight DiagnosticVirtualTextError guifg=#A8334C guibg=#F2DEE0 guisp=NONE gui=NONE cterm=NONE +highlight DiagnosticVirtualTextWarn guifg=#944927 guibg=#F2DEDA guisp=NONE gui=NONE cterm=NONE +highlight DiffAdd guifg=NONE guibg=#CBE5B8 guisp=NONE gui=NONE cterm=NONE +highlight DiffChange guifg=NONE guibg=#D4DEE7 guisp=NONE gui=NONE cterm=NONE +highlight DiffDelete guifg=NONE guibg=#EBD8DA guisp=NONE gui=NONE cterm=NONE +highlight DiffText guifg=#2C363C guibg=#A9BED1 guisp=NONE gui=NONE cterm=NONE +highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold +highlight Error guifg=#A8334C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight FloatBorder guifg=#786D68 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight FoldColumn guifg=#A4968F guibg=NONE guisp=NONE gui=bold cterm=bold +highlight Folded guifg=#564E4A guibg=#CDC2BC guisp=NONE gui=NONE cterm=NONE +highlight Function guifg=#2C363C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight GitSignsAdd guifg=#4F6C31 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight GitSignsChange guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight GitSignsDelete guifg=#A8334C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight HopNextKey2 guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Identifier guifg=#44525B guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight IncSearch guifg=#F0EDEC guibg=#C074B2 guisp=NONE gui=bold cterm=bold +highlight IndentBlanklineChar guifg=#D4CDCA guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic cterm=italic +highlight LightspeedGreyWash guifg=#948985 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight LightspeedLabel guifg=#88507D guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline +highlight LightspeedLabelDistant guifg=#3B8992 guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline +highlight LightspeedLabelDistantOverlapped guifg=#3B8992 guibg=NONE guisp=NONE gui=underline cterm=underline +highlight LightspeedLabelOverlapped guifg=#88507D guibg=NONE guisp=NONE gui=underline cterm=underline +highlight LightspeedOneCharMatch guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold cterm=bold +highlight LightspeedPendingChangeOpArea guifg=#88507D guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight LightspeedShortcut guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold,underline cterm=bold,underline +highlight LineNr guifg=#A4968F guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight MoreMsg guifg=#4F6C31 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight NeogitHunkHeaderHighlight guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=bold cterm=bold +highlight NnnNormal guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=NONE cterm=NONE +highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight NonText guifg=#BBABA3 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Normal guifg=#2C363C guibg=#F0EDEC guisp=NONE gui=NONE cterm=NONE +highlight NormalFloat guifg=NONE guibg=#E1DCD9 guisp=NONE gui=NONE cterm=NONE +highlight Number guifg=#2C363C guibg=NONE guisp=NONE gui=italic cterm=italic +highlight NvimTreeCursorLine guifg=NONE guibg=#DAD3CF guisp=NONE gui=NONE cterm=NONE +highlight NvimTreeNormal guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=NONE cterm=NONE +highlight NvimTreeRootFolder guifg=#286486 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight NvimTreeSpecialFile guifg=#88507D guibg=NONE guisp=NONE gui=underline cterm=underline +highlight NvimTreeSymlink guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Pmenu guifg=NONE guibg=#DAD3CF guisp=NONE gui=NONE cterm=NONE +highlight PmenuSbar guifg=NONE guibg=#B2A39B guisp=NONE gui=NONE cterm=NONE +highlight PmenuSel guifg=NONE guibg=#C4B6AF guisp=NONE gui=NONE cterm=NONE +highlight PmenuThumb guifg=NONE guibg=#F7F6F5 guisp=NONE gui=NONE cterm=NONE +highlight Search guifg=#2C363C guibg=#DEB9D6 guisp=NONE gui=NONE cterm=NONE +highlight SneakLabelMask guifg=#88507D guibg=#88507D guisp=NONE gui=NONE cterm=NONE +highlight Special guifg=#4F5E68 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight SpecialComment guifg=#948985 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight SpecialKey guifg=#BBABA3 guibg=NONE guisp=NONE gui=italic cterm=italic +highlight SpellBad guifg=#974352 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight SpellCap guifg=#974352 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight SpellRare guifg=#974352 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl +highlight Statement guifg=#2C363C guibg=NONE guisp=NONE gui=bold cterm=bold +highlight StatusLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=NONE cterm=NONE +highlight StatusLineNC guifg=#596A76 guibg=#DAD3CF guisp=NONE gui=NONE cterm=NONE +highlight TSConstant guifg=#44525B guibg=NONE guisp=NONE gui=bold cterm=bold +highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold +highlight TelescopeBorder guifg=#786D68 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight TelescopeMatching guifg=#88507D guibg=NONE guisp=NONE gui=bold cterm=bold +highlight TelescopeSelectionCaret guifg=#A8334C guibg=#E9E4E2 guisp=NONE gui=NONE cterm=NONE +highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold +highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline +highlight Type guifg=#6A5549 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline +highlight VertSplit guifg=#A4968F guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight Visual guifg=NONE guibg=#CBD9E3 guisp=NONE gui=NONE cterm=NONE +highlight WarningMsg guifg=#944927 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight WildMenu guifg=#F0EDEC guibg=#88507D guisp=NONE gui=NONE cterm=NONE +highlight diffAdded guifg=#4F6C31 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight diffChanged guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight diffFile guifg=#944927 guibg=NONE guisp=NONE gui=bold cterm=bold +highlight diffIndexLine guifg=#944927 guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight diffLine guifg=#88507D guibg=NONE guisp=NONE gui=bold cterm=bold +highlight diffNewFile guifg=#4F6C31 guibg=NONE guisp=NONE gui=italic cterm=italic +highlight diffOldFile guifg=#A8334C guibg=NONE guisp=NONE gui=italic cterm=italic +highlight diffRemoved guifg=#A8334C guibg=NONE guisp=NONE gui=NONE cterm=NONE +highlight lCursor guifg=#F0EDEC guibg=#4D5C65 guisp=NONE gui=NONE cterm=NONE +highlight markdownH1 guifg=#2C363C guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline +highlight! link Boolean Number +highlight! link BufferCurrent TabLineSel +highlight! link CocCodeLens LineNr +highlight! link CocErrorHighlight DiagnosticUnderlineError +highlight! link CocErrorSign DiagnosticSignError +highlight! link CocErrorVirtualText DiagnosticVirtualTextError +highlight! link CocHintHighlight DiagnosticUnderlineHint +highlight! link CocHintSign DiagnosticSignHint +highlight! link CocInfoHighlight DiagnosticUnderlineInfo +highlight! link CocInfoSign DiagnosticSignInfo +highlight! link CocSelectedText SpellBad +highlight! link CocWarningHighlight DiagnosticUnderlineWarn +highlight! link CocWarningSign DiagnosticSignWarn +highlight! link CocWarningVitualText DiagnosticVirtualTextWarn +highlight! link CursorColumn CursorLine +highlight! link DiagnosticError Error +highlight! link DiagnosticWarn WarningMsg +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 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 DiagnosticError +highlight! link NeogitNotificationInfo DiagnosticInfo +highlight! link NeogitNotificationWarning DiagnosticWarn +highlight! link NnnNormalNC NnnNormal +highlight! link NvimTreeCursorColumn NvimTreeCursorLine +highlight! link NvimTreeGitDeleted diffRemoved +highlight! link NvimTreeGitDirty diffChanged +highlight! link NvimTreeGitNew diffAdded +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 TSConstBuiltin Number +highlight! link TSConstMacro Number +highlight! link TSDanger Error +highlight! link TSNamespace Special +highlight! link TSNote DiagnosticInfo +highlight! link TSTag Special +highlight! link TSVariable Identifier +highlight! link TSVariableBuiltin Number +highlight! link TSWarning WarningMsg +highlight! link TabLine StatusLine +highlight! link TabLineFill StatusLineNC +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 WhichKey Statement +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 +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 +highlight! link StatusLineTerm StatusLine +highlight! link StatusLineTermNC StatusLineNC + +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 + +endfunction diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 4adebb1..4b4adbc 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -1,263 +1,11 @@ -" This file is auto-generated from lua/zenbones/template/vim.lua if exists('g:colors_name') highlight clear endif -set background=light let g:colors_name = 'zenbones' -let g:terminal_color_0 = '#F0EDEC' -let g:terminal_color_1 = '#A8334C' -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 = '#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('nvim') && (!exists('g:zenbones_compat') || g:zenbones_compat == 0) - lua package.loaded["zenbones"] = nil - lua require "lush"(require "zenbones", { force_clean = false }) - finish +if has('nvim') && (!exists('g:' . g:colors_name . '_compat') || g:{g:colors_name}_compat == 0) + lua require("zenbones.util").apply_colorscheme() else -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 CmpItemAbbr guifg=#44525B guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbrDeprecated guifg=#728794 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbrMatch guifg=#2C363C guibg=NONE guisp=NONE gui=bold -highlight CmpItemAbbrMatchFuzzy guifg=#3E4B53 guibg=NONE guisp=NONE gui=bold -highlight CmpItemKind guifg=#556570 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemMenu guifg=#5E6F7B guibg=NONE guisp=NONE gui=NONE -highlight CocMarkdownLink guifg=#3B8992 guibg=NONE guisp=NONE gui=underline -highlight ColorColumn guifg=NONE guibg=#E6C5BD guisp=NONE gui=NONE -highlight Comment guifg=#948985 guibg=NONE guisp=NONE gui=italic -highlight Conceal guifg=#4F5E68 guibg=NONE guisp=NONE gui=bold,italic -highlight Constant guifg=#556570 guibg=NONE guisp=NONE gui=italic -highlight Cursor guifg=#F0EDEC guibg=#2C363C guisp=NONE gui=NONE -highlight CursorLine guifg=NONE guibg=#E9E4E2 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 DiagnosticHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignError guifg=#A8334C guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignWarn guifg=#944927 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticUnderlineError guifg=#A8334C guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineHint guifg=#88507D guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineInfo guifg=#286486 guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineWarn guifg=#944927 guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticVirtualTextError guifg=#A8334C guibg=#F2DEE0 guisp=NONE gui=NONE -highlight DiagnosticVirtualTextWarn guifg=#944927 guibg=#F2DEDA guisp=NONE gui=NONE -highlight DiffAdd guifg=NONE guibg=#CBE5B8 guisp=NONE gui=NONE -highlight DiffChange guifg=NONE guibg=#D4DEE7 guisp=NONE gui=NONE -highlight DiffDelete guifg=NONE guibg=#EBD8DA guisp=NONE gui=NONE -highlight DiffText guifg=#2C363C guibg=#A9BED1 guisp=NONE gui=NONE -highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight Error guifg=#A8334C guibg=NONE guisp=NONE gui=NONE -highlight FloatBorder guifg=#786D68 guibg=NONE guisp=NONE gui=NONE -highlight FoldColumn guifg=#A4968F 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=#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 -highlight Identifier guifg=#44525B guibg=NONE guisp=NONE gui=NONE -highlight IncSearch guifg=#F0EDEC guibg=#C074B2 guisp=NONE gui=bold -highlight IndentBlanklineChar guifg=#D4CDCA guibg=NONE guisp=NONE gui=NONE -highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic -highlight LightspeedGreyWash guifg=#948985 guibg=NONE guisp=NONE gui=NONE -highlight LightspeedLabel guifg=#88507D guibg=NONE guisp=NONE gui=bold,underline -highlight LightspeedLabelDistant guifg=#3B8992 guibg=NONE guisp=NONE gui=bold,underline -highlight LightspeedLabelDistantOverlapped guifg=#3B8992 guibg=NONE guisp=NONE gui=underline -highlight LightspeedLabelOverlapped guifg=#88507D guibg=NONE guisp=NONE gui=underline -highlight LightspeedOneCharMatch guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold -highlight LightspeedPendingChangeOpArea guifg=#88507D guibg=NONE guisp=NONE gui=NONE -highlight LightspeedShortcut guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold,underline -highlight LineNr guifg=#A4968F guibg=NONE guisp=NONE gui=NONE -highlight MoreMsg guifg=#4F6C31 guibg=NONE guisp=NONE gui=bold -highlight NeogitHunkHeaderHighlight guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=bold -highlight NnnNormal guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=NONE -highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE -highlight NonText guifg=#BBABA3 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=#2C363C guibg=NONE guisp=NONE gui=italic -highlight NvimTreeCursorLine guifg=NONE guibg=#DAD3CF guisp=NONE gui=NONE -highlight NvimTreeNormal guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=NONE -highlight NvimTreeRootFolder guifg=#286486 guibg=NONE guisp=NONE gui=bold -highlight NvimTreeSpecialFile guifg=#88507D guibg=NONE guisp=NONE gui=underline -highlight NvimTreeSymlink guifg=#286486 guibg=NONE guisp=NONE gui=NONE -highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE -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 -highlight PmenuThumb guifg=NONE guibg=#F7F6F5 guisp=NONE gui=NONE -highlight Search guifg=#2C363C guibg=#DEB9D6 guisp=NONE gui=NONE -highlight SneakLabelMask guifg=#88507D guibg=#88507D guisp=NONE gui=NONE -highlight Special guifg=#4F5E68 guibg=NONE guisp=NONE gui=bold -highlight SpecialComment guifg=#948985 guibg=NONE guisp=NONE gui=bold -highlight SpecialKey guifg=#BBABA3 guibg=NONE guisp=NONE gui=italic -highlight SpellBad guifg=#974352 guibg=NONE guisp=NONE gui=undercurl -highlight SpellCap guifg=#974352 guibg=NONE guisp=NONE gui=undercurl -highlight SpellRare guifg=#974352 guibg=NONE guisp=NONE gui=undercurl -highlight Statement guifg=#2C363C guibg=NONE guisp=NONE gui=bold -highlight StatusLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=NONE -highlight StatusLineNC guifg=#596A76 guibg=#DAD3CF guisp=NONE gui=NONE -highlight TSConstant guifg=#44525B guibg=NONE guisp=NONE gui=bold -highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight TelescopeBorder guifg=#786D68 guibg=NONE guisp=NONE gui=NONE -highlight TelescopeMatching guifg=#88507D guibg=NONE guisp=NONE gui=bold -highlight TelescopeSelectionCaret guifg=#A8334C guibg=#E9E4E2 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=#6A5549 guibg=NONE guisp=NONE gui=NONE -highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline -highlight VertSplit guifg=#A4968F guibg=NONE guisp=NONE gui=NONE -highlight Visual guifg=NONE guibg=#CBD9E3 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=#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=#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=#F0EDEC 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 CocErrorHighlight DiagnosticUnderlineError -highlight! link CocErrorSign DiagnosticSignError -highlight! link CocErrorVirtualText DiagnosticVirtualTextError -highlight! link CocHintHighlight DiagnosticUnderlineHint -highlight! link CocHintSign DiagnosticSignHint -highlight! link CocInfoHighlight DiagnosticUnderlineInfo -highlight! link CocInfoSign DiagnosticSignInfo -highlight! link CocSelectedText SpellBad -highlight! link CocWarningHighlight DiagnosticUnderlineWarn -highlight! link CocWarningSign DiagnosticSignWarn -highlight! link CocWarningVitualText DiagnosticVirtualTextWarn -highlight! link CursorColumn CursorLine -highlight! link DiagnosticError Error -highlight! link DiagnosticWarn WarningMsg -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 DiagnosticError -highlight! link LspDiagnosticsDefaultHint DiagnosticHint -highlight! link LspDiagnosticsDefaultInformation DiagnosticInfo -highlight! link LspDiagnosticsDefaultWarning DiagnosticWarn -highlight! link LspDiagnosticsSignError DiagnosticSignError -highlight! link LspDiagnosticsSignHint DiagnosticSignHint -highlight! link LspDiagnosticsSignInformation DiagnosticSignInfo -highlight! link LspDiagnosticsSignWarning DiagnosticSignWarn -highlight! link LspDiagnosticsUnderlineError DiagnosticUnderlineError -highlight! link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint -highlight! link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo -highlight! link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn -highlight! link LspDiagnosticsVirtualTextError DiagnosticVirtualTextError -highlight! link LspDiagnosticsVirtualTextWarning DiagnosticVirtualTextWarn -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 DiagnosticError -highlight! link NeogitNotificationInfo DiagnosticInfo -highlight! link NeogitNotificationWarning DiagnosticWarn -highlight! link NnnNormalNC NnnNormal -highlight! link NvimTreeCursorColumn NvimTreeCursorLine -highlight! link NvimTreeGitDeleted diffRemoved -highlight! link NvimTreeGitDirty diffChanged -highlight! link NvimTreeGitNew diffAdded -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 TSConstBuiltin Number -highlight! link TSConstMacro Number -highlight! link TSDanger Error -highlight! link TSNamespace Special -highlight! link TSNote DiagnosticInfo -highlight! link TSTag Special -highlight! link TSVariable Identifier -highlight! link TSVariableBuiltin Number -highlight! link TSWarning WarningMsg -highlight! link TabLine StatusLine -highlight! link TabLineFill StatusLineNC -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 WhichKey Statement -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 -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 -highlight! link StatusLineTerm StatusLine -highlight! link StatusLineTermNC StatusLineNC -endif - -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 - \ ] + call {g:colors_name . '_' . &background}#load() endif diff --git a/lua/zenbones/util.lua b/lua/zenbones/util.lua index c689502..b14e301 100644 --- a/lua/zenbones/util.lua +++ b/lua/zenbones/util.lua @@ -7,6 +7,14 @@ function M.interp(s, tab) end)) end +function M.apply_colorscheme() + local colors_name = vim.api.nvim_get_var "colors_name" + package.loaded[colors_name] = nil + require "lush"(require(colors_name), { force_clean = false }) + local p = require(colors_name .. ".palette")[vim.opt.background:get()] + require("zenbones.term").apply_colors(p) +end + function M.palette_extend(p, base_bg) local lush = require "lush" local hsluv = lush.hsluv From 28f3bed3f849e4b789a182f51cf983056cd5fa49 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 4 Nov 2021 17:45:06 +0800 Subject: [PATCH 06/31] add zenburned flavor --- README.md | 1 + colors/zenburned.lua | 12 ++++++++++++ doc/showcase.md | 4 ++++ doc/zenbones.md | 1 + lua/zenburned/init.lua | 18 ++++++++++++++++++ lua/zenburned/palette.lua | 13 +++++++++++++ 6 files changed, 49 insertions(+) create mode 100644 colors/zenburned.lua create mode 100644 lua/zenburned/init.lua create mode 100644 lua/zenburned/palette.lua diff --git a/README.md b/README.md index 210c2c4..3f88261 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ colorscheme forestbones " Everforest flavor - https://github.com/sainnhe/everfo colorscheme nordbones " Nord flavor - https://www.nordtheme.com/docs/colors-and-palettes colorscheme tokyobones " Tokyo Night flavor - https://github.com/enkia/tokyo-night-vscode-theme#color-palette colorscheme duckbones " Spaceduck flavor - https://pineapplegiant.github.io/spaceduck +colorscheme zenburned " Zenburn flavor - https://kippura.org/zenburnpage ``` ## [Configuration and other documentations](doc/zenbones.md) diff --git a/colors/zenburned.lua b/colors/zenburned.lua new file mode 100644 index 0000000..f24b570 --- /dev/null +++ b/colors/zenburned.lua @@ -0,0 +1,12 @@ +if vim.g.colors_name then + vim.api.nvim_command "highlight clear" +end + +vim.g.colors_name = "zenburned" +vim.opt.background = "dark" + +package.loaded["zenburned"] = nil +require "lush"(require "zenburned", { force_clean = false }) + +local p = require("zenburned.palette").dark +require("zenbones.term").apply_colors(p) diff --git a/doc/showcase.md b/doc/showcase.md index 1772bdf..c2cf27a 100644 --- a/doc/showcase.md +++ b/doc/showcase.md @@ -36,3 +36,7 @@ ## Duckbones Screen Shot 2021-11-04 at 9 45 11 AM + +## Zenburned + +Screen Shot 2021-11-04 at 9 45 11 AM diff --git a/doc/zenbones.md b/doc/zenbones.md index 70bb714..8636a93 100644 --- a/doc/zenbones.md +++ b/doc/zenbones.md @@ -22,6 +22,7 @@ colorscheme forestbones " Everforest flavor - https://github.com/sainnhe/everfo colorscheme nordbones " Nord flavor - https://www.nordtheme.com/docs/colors-and-palettes colorscheme tokyobones " Tokyo Night flavor - https://github.com/enkia/tokyo-night-vscode-theme#color-palette colorscheme duckbones " Spaceduck flavor - https://pineapplegiant.github.io/spaceduck +colorscheme zenburned " Zenburn flavor - https://kippura.org/zenburnpage ``` It works pretty much the same as the first one but pretty handy when extending diff --git a/lua/zenburned/init.lua b/lua/zenburned/init.lua new file mode 100644 index 0000000..a021733 --- /dev/null +++ b/lua/zenburned/init.lua @@ -0,0 +1,18 @@ +local lush = require "lush" +local hsluv = lush.hsluv +local generator = require "zenbones.specs" +local p = require("zenburned.palette").dark + +local specs = generator.generate(p, "dark", generator.get_global_config("zenburned", "dark")) + +return lush.extends({ specs }).with(function() + ---@diagnostic disable: undefined-global + -- selene: allow(undefined_variable) + return { + Statement { specs.Statement, fg = hsluv "#dca3a3" }, + Special { fg = hsluv "#efef8f" }, + PreProc { fg = hsluv "#ffcfaf" }, + } + -- selene: deny(undefined_variable) + ---@diagnostic enable: undefined-global +end) diff --git a/lua/zenburned/palette.lua b/lua/zenburned/palette.lua new file mode 100644 index 0000000..b818939 --- /dev/null +++ b/lua/zenburned/palette.lua @@ -0,0 +1,13 @@ +local util = require "zenbones.util" +local lush = require "lush" +local hsluv = lush.hsluv + +local M = {} + +M.dark = util.palette_extend { + bg = hsluv "#3f3f3f", + fg = hsluv("#efdcbc").de(14).li(20), + rose = hsluv "#e37170", +} + +return M From 265ab617dec5bd9bab1b8a24012fee7c76ac9788 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 4 Nov 2021 18:06:47 +0800 Subject: [PATCH 07/31] document collection as table --- README.md | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 3f88261..8265d4e 100644 --- a/README.md +++ b/README.md @@ -43,18 +43,22 @@ set termguicolors set background=light " or dark colorscheme zenbones - -colorscheme zenwritten " Zero hue and saturation version -colorscheme neobones " https://neovim.io flavor -colorscheme vimbones " https://www.vim.org flavor -colorscheme rosebones " Rosé Pine flavor - https://rosepinetheme.com -colorscheme forestbones " Everforest flavor - https://github.com/sainnhe/everforest -colorscheme nordbones " Nord flavor - https://www.nordtheme.com/docs/colors-and-palettes -colorscheme tokyobones " Tokyo Night flavor - https://github.com/enkia/tokyo-night-vscode-theme#color-palette -colorscheme duckbones " Spaceduck flavor - https://pineapplegiant.github.io/spaceduck -colorscheme zenburned " Zenburn flavor - https://kippura.org/zenburnpage ``` +Or choose from the collection: + +| colorscheme | description | +| ------------- | ------------------------------------------------------------------------------------------ | +| `zenwritten` | Zero hue and saturation version | +| `neobones` | Inspired by [neovim.io](https://neovim.io) | +| `vimbones` | Inspired by [vim.org](https://www.vim.org) | +| `rosebones` | Inspired by [Rosé Pine](https://rosepinetheme.com) | +| `forestbones` | Inspired by [Everforest](https://github.com/sainnhe/everforest) | +| `nordbones` | Inspired by [Nord](https://www.nordtheme.com/docs/colors-and-palettes) | +| `tokyobones` | Inspired by [Tokyo Night](https://github.com/enkia/tokyo-night-vscode-theme#color-palette) | +| `duckbones` | Inspired by [Spaceduck](https://pineapplegiant.github.io/spaceduck) | +| `zenburned` | Inspired by [Zenburn](https://kippura.org/zenburnpage) | + ## [Configuration and other documentations](doc/zenbones.md) See [documentations](doc/zenbones.md) or `:help zenbones.txt`. @@ -74,7 +78,7 @@ See [documentations](doc/zenbones.md) or `:help zenbones.txt`. | :---------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------: | | ![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) | -See more [showcase from the other flavors here](doc/showcase.md). +See more [showcase from the other colorschemes here](doc/showcase.md). ## Other plugins support From 3ef0de509cbd0dae9d60b46eaca59119aa4da53b Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 14:43:28 +0800 Subject: [PATCH 08/31] initial shipwright integration --- lua/zenbones/shipwright/init.lua | 32 +++++++++++++++++++ lua/zenbones/shipwright/runners/alacritty.lua | 7 ++++ lua/zenbones/shipwright/runners/kitty.lua | 22 +++++++++++++ lua/zenbones/shipwright/transform.lua | 29 +++++++++++++++++ makefile | 2 +- 5 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 lua/zenbones/shipwright/init.lua create mode 100644 lua/zenbones/shipwright/runners/alacritty.lua create mode 100644 lua/zenbones/shipwright/runners/kitty.lua create mode 100644 lua/zenbones/shipwright/transform.lua diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua new file mode 100644 index 0000000..0c5776a --- /dev/null +++ b/lua/zenbones/shipwright/init.lua @@ -0,0 +1,32 @@ +local M = {} + +local function make_env(colorscheme) + local builder = require "shipwright.builder" + local env = builder.make_env() + + local name = colorscheme.name + env.name = name + + vim.opt.background = "light" + package.loaded[name] = nil + env.specs = require(name) + env.p = require(name .. ".palette").light + env.term = require("zenbones.term").colors_map(env.p) + env.transform = require "zenbones.shipwright.transform" + return env +end + +M.run = function() + local runners = { "alacritty", "kitty" } + for _, runner in ipairs(runners) do + local build_fn = loadfile(string.format("lua/zenbones/shipwright/runners/%s.lua", runner)) + assert(pcall(setfenv( + build_fn, + make_env { + name = "zenbones", + } + ))) + end +end + +return M diff --git a/lua/zenbones/shipwright/runners/alacritty.lua b/lua/zenbones/shipwright/runners/alacritty.lua new file mode 100644 index 0000000..1a8d0ee --- /dev/null +++ b/lua/zenbones/shipwright/runners/alacritty.lua @@ -0,0 +1,7 @@ +run( + { specs, p, term }, + transform.colorscheme_to_term_colors, + contrib.alacritty, + { prepend, "# This file is auto-generated by shipwright.nvim", }, + { overwrite, string.format("extras/alacritty/%s.yml", name) } +) diff --git a/lua/zenbones/shipwright/runners/kitty.lua b/lua/zenbones/shipwright/runners/kitty.lua new file mode 100644 index 0000000..cbe5a6f --- /dev/null +++ b/lua/zenbones/shipwright/runners/kitty.lua @@ -0,0 +1,22 @@ +run( + { specs, p, term }, + transform.colorscheme_to_term_colors, + function(colors) + return vim.tbl_extend("keep", colors, { + name = name, + author = "Michael Chris Lopez", + license = "MIT", + upstream = string.format("https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/%s.conf", name), + selection_bg = specs.Visual.bg.hex, + selection_fg = colors.fg, + url_color = term[13].hex, + tab_active_bg = specs.Search.bg.hex, + tab_active_fg = colors.fg, + tab_inactive_bg = specs.StatusLine.bg.hex, + tab_inactive_fg = colors.fg, + }) + end, + contrib.kitty, + { prepend, "# This file is auto-generated by shipwright.nvim" }, + { overwrite, string.format("extras/kitty/%s.conf", name) } +) diff --git a/lua/zenbones/shipwright/transform.lua b/lua/zenbones/shipwright/transform.lua new file mode 100644 index 0000000..61fe762 --- /dev/null +++ b/lua/zenbones/shipwright/transform.lua @@ -0,0 +1,29 @@ +local M = {} + +M.colorscheme_to_term_colors = function(colorscheme) + local specs, _, term = unpack(colorscheme) + return { + fg = specs.Normal.fg.hex, + bg = specs.Normal.bg.hex, + cursor_fg = specs.Cursor.fg.hex, + cursor_bg = specs.Cursor.bg.hex, + black = term[1].hex, + red = term[2].hex, + green = term[3].hex, + yellow = term[4].hex, + blue = term[5].hex, + magenta = term[6].hex, + cyan = term[7].hex, + white = term[8].hex, + bright_black = term[9].hex, + bright_red = term[10].hex, + bright_green = term[11].hex, + bright_yellow = term[12].hex, + bright_blue = term[13].hex, + bright_magenta = term[14].hex, + bright_cyan = term[15].hex, + bright_white = term[16].hex, + } +end + +return M diff --git a/makefile b/makefile index 94f84ad..2b2289b 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ make: nvim --headless -u NORC \ --cmd 'set rtp+=.' \ - --cmd 'lua require("zenbones.build").run()' \ + --cmd 'lua require("zenbones.shipwright").run()' \ --cmd 'q' From f6d1b0e16904c3f12e15213463ca8dd0da4deef6 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 15:14:42 +0800 Subject: [PATCH 09/31] conditional light/dark background builder --- lua/zenbones/shipwright/init.lua | 66 +++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index 0c5776a..7ffd0aa 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -4,28 +4,66 @@ local function make_env(colorscheme) local builder = require "shipwright.builder" local env = builder.make_env() - local name = colorscheme.name - env.name = name + local specs = colorscheme.specs + env.name = colorscheme.name - vim.opt.background = "light" - package.loaded[name] = nil - env.specs = require(name) - env.p = require(name .. ".palette").light + vim.opt.background = colorscheme.background + package.loaded[specs] = nil + env.specs = require(specs) + env.p = require(specs .. ".palette")[colorscheme.background] env.term = require("zenbones.term").colors_map(env.p) env.transform = require "zenbones.shipwright.transform" return env end -M.run = function() - local runners = { "alacritty", "kitty" } - for _, runner in ipairs(runners) do - local build_fn = loadfile(string.format("lua/zenbones/shipwright/runners/%s.lua", runner)) - assert(pcall(setfenv( - build_fn, +local function make_build_fn(file) + return loadfile(string.format("lua/zenbones/shipwright/runners/%s.lua", file)) +end + +local function make_runners(config) + if not config.background then + return { + setfenv( + make_build_fn(config.file), + make_env { + name = config.name .. "_light", + specs = config.name, + background = "light", + } + ), + setfenv( + make_build_fn(config.file), + make_env { + name = config.name .. "_dark", + specs = config.name, + background = "dark", + } + ), + } + end + + return { + setfenv( + make_build_fn(config.file), make_env { - name = "zenbones", + name = config.name, + specs = config.name, + background = config.background, } - ))) + ), + } +end + +M.run = function() + local runner_files = { "alacritty", "kitty" } + local colorschemes = { { name = "zenbones" }, { name = "neobones" } } + for _, colorscheme in ipairs(colorschemes) do + for _, file in ipairs(runner_files) do + colorscheme.file = file + for _, runner in ipairs(make_runners(colorscheme)) do + assert(pcall(runner)) + end + end end end From 635f71ae819fefa37de5f46050ec00da9e5d3da2 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 15:31:28 +0800 Subject: [PATCH 10/31] remove bright/stark variants --- extras/alacritty/neobones_dark.yml | 11 +- extras/alacritty/neobones_light.yml | 11 +- extras/alacritty/zenbones.yml | 27 -- extras/alacritty/zenbones_bright.yml | 27 -- extras/alacritty/zenbones_dark.yml | 27 +- extras/alacritty/zenbones_dim.yml | 27 -- extras/alacritty/zenbones_light.yml | 21 +- extras/iterm/zenbones_bright.itermcolors | 357 ----------------------- extras/iterm/zenbones_dark.itermcolors | 357 ----------------------- extras/iterm/zenbones_dim.itermcolors | 357 ----------------------- extras/iterm/zenbones_light.itermcolors | 357 ----------------------- extras/kitty/neobones_dark.conf | 62 ++-- extras/kitty/neobones_light.conf | 62 ++-- extras/kitty/zenbones.conf | 40 --- extras/kitty/zenbones_bright.conf | 40 --- extras/kitty/zenbones_dark.conf | 70 +++-- extras/kitty/zenbones_dim.conf | 40 --- extras/kitty/zenbones_light.conf | 66 +++-- extras/tmux/zenbones_bright.tmux | 18 -- extras/tmux/zenbones_dark.tmux | 18 -- extras/tmux/zenbones_dim.tmux | 18 -- extras/tmux/zenbones_light.tmux | 18 -- extras/wezterm/Zenbones_bright.toml | 13 - extras/wezterm/Zenbones_dark.toml | 13 - extras/wezterm/Zenbones_dim.toml | 13 - extras/wezterm/Zenbones_light.toml | 13 - 26 files changed, 179 insertions(+), 1904 deletions(-) delete mode 100644 extras/alacritty/zenbones.yml delete mode 100644 extras/alacritty/zenbones_bright.yml delete mode 100644 extras/alacritty/zenbones_dim.yml delete mode 100644 extras/iterm/zenbones_bright.itermcolors delete mode 100644 extras/iterm/zenbones_dark.itermcolors delete mode 100644 extras/iterm/zenbones_dim.itermcolors delete mode 100644 extras/iterm/zenbones_light.itermcolors delete mode 100644 extras/kitty/zenbones.conf delete mode 100644 extras/kitty/zenbones_bright.conf delete mode 100644 extras/kitty/zenbones_dim.conf delete mode 100644 extras/tmux/zenbones_bright.tmux delete mode 100644 extras/tmux/zenbones_dark.tmux delete mode 100644 extras/tmux/zenbones_dim.tmux delete mode 100644 extras/tmux/zenbones_light.tmux delete mode 100644 extras/wezterm/Zenbones_bright.toml delete mode 100644 extras/wezterm/Zenbones_dark.toml delete mode 100644 extras/wezterm/Zenbones_dim.toml delete mode 100644 extras/wezterm/Zenbones_light.toml diff --git a/extras/alacritty/neobones_dark.yml b/extras/alacritty/neobones_dark.yml index 4e2f7c0..5605819 100644 --- a/extras/alacritty/neobones_dark.yml +++ b/extras/alacritty/neobones_dark.yml @@ -1,11 +1,11 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# neobones_dark alacritty colors +# This file is auto-generated by shipwright.nvim colors: - # Default colors primary: - background: '#0F191F' foreground: '#C6D5CF' - # Normal colors + background: '#0F191F' + cursor: + foreground: '#0F191F' + background: '#CEDDD7' normal: black: '#0F191F' red: '#DE6E7C' @@ -15,7 +15,6 @@ colors: magenta: '#B279A7' cyan: '#66A5AD' white: '#C6D5CF' - # Bright colors bright: black: '#263945' red: '#E8838F' diff --git a/extras/alacritty/neobones_light.yml b/extras/alacritty/neobones_light.yml index 77938ac..dab7dda 100644 --- a/extras/alacritty/neobones_light.yml +++ b/extras/alacritty/neobones_light.yml @@ -1,11 +1,11 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# neobones_light alacritty colors +# This file is auto-generated by shipwright.nvim colors: - # Default colors primary: - background: '#E5EDE6' foreground: '#202E18' - # Normal colors + background: '#E5EDE6' + cursor: + foreground: '#E5EDE6' + background: '#202E18' normal: black: '#E5EDE6' red: '#A8334C' @@ -15,7 +15,6 @@ colors: magenta: '#88507D' cyan: '#3B8992' white: '#202E18' - # Bright colors bright: black: '#B3C6B6' red: '#94253E' diff --git a/extras/alacritty/zenbones.yml b/extras/alacritty/zenbones.yml deleted file mode 100644 index 9b907d8..0000000 --- a/extras/alacritty/zenbones.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# zenbones alacritty colors -colors: - # Default colors - primary: - background: '#F0EDEC' - foreground: '#2C363C' - # Normal colors - normal: - black: '#F0EDEC' - red: '#A8334C' - green: '#4F6C31' - yellow: '#944927' - blue: '#286486' - magenta: '#88507D' - cyan: '#3B8992' - white: '#2C363C' - # Bright colors - bright: - black: '#CFC1BA' - red: '#94253E' - green: '#3F5A22' - yellow: '#803D1C' - blue: '#1D5573' - magenta: '#7B3B70' - cyan: '#2B747C' - white: '#4F5E68' diff --git a/extras/alacritty/zenbones_bright.yml b/extras/alacritty/zenbones_bright.yml deleted file mode 100644 index c35f969..0000000 --- a/extras/alacritty/zenbones_bright.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# zenbones_bright alacritty colors -colors: - # Default colors - primary: - background: '#F8F6F5' - foreground: '#2C363C' - # Normal colors - normal: - black: '#F0EDEC' - red: '#A8334C' - green: '#4F6C31' - yellow: '#944927' - blue: '#286486' - magenta: '#88507D' - cyan: '#3B8992' - white: '#2C363C' - # Bright colors - bright: - black: '#CFC1BA' - red: '#94253E' - green: '#3F5A22' - yellow: '#803D1C' - blue: '#1D5573' - magenta: '#7B3B70' - cyan: '#2B747C' - white: '#4F5E68' diff --git a/extras/alacritty/zenbones_dark.yml b/extras/alacritty/zenbones_dark.yml index da966e4..7b994dd 100644 --- a/extras/alacritty/zenbones_dark.yml +++ b/extras/alacritty/zenbones_dark.yml @@ -1,27 +1,26 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# zenbones_dark alacritty colors +# This file is auto-generated by shipwright.nvim colors: - # Default colors primary: - background: '#1C1917' foreground: '#B4BDC3' - # Normal colors + background: '#1C1917' + cursor: + foreground: '#1C1917' + background: '#C4CACF' normal: - black: '#0F191F' + black: '#1C1917' red: '#DE6E7C' - green: '#90FF6B' + green: '#819B69' yellow: '#B77E64' - blue: '#8190D4' + blue: '#6099C0' magenta: '#B279A7' cyan: '#66A5AD' - white: '#C6D5CF' - # Bright colors + white: '#B4BDC3' bright: - black: '#263945' + black: '#403833' red: '#E8838F' - green: '#A0FF85' + green: '#8BAE68' yellow: '#D68C67' - blue: '#92A0E2' + blue: '#61ABDA' magenta: '#CF86C1' cyan: '#65B8C1' - white: '#98A39E' + white: '#888F94' diff --git a/extras/alacritty/zenbones_dim.yml b/extras/alacritty/zenbones_dim.yml deleted file mode 100644 index 9b376cb..0000000 --- a/extras/alacritty/zenbones_dim.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# zenbones_dim alacritty colors -colors: - # Default colors - primary: - background: '#E8E4E3' - foreground: '#2C363C' - # Normal colors - normal: - black: '#F0EDEC' - red: '#A8334C' - green: '#4F6C31' - yellow: '#944927' - blue: '#286486' - magenta: '#88507D' - cyan: '#3B8992' - white: '#2C363C' - # Bright colors - bright: - black: '#CFC1BA' - red: '#94253E' - green: '#3F5A22' - yellow: '#803D1C' - blue: '#1D5573' - magenta: '#7B3B70' - cyan: '#2B747C' - white: '#4F5E68' diff --git a/extras/alacritty/zenbones_light.yml b/extras/alacritty/zenbones_light.yml index 3c4112a..6703b61 100644 --- a/extras/alacritty/zenbones_light.yml +++ b/extras/alacritty/zenbones_light.yml @@ -1,27 +1,26 @@ -# This file is auto-generated from lua/zenbones/template/alacritty.lua -# zenbones_light alacritty colors +# This file is auto-generated by shipwright.nvim colors: - # Default colors primary: - background: '#F0EDEC' foreground: '#2C363C' - # Normal colors + background: '#F0EDEC' + cursor: + foreground: '#F0EDEC' + background: '#2C363C' normal: - black: '#E5EDE6' + black: '#F0EDEC' red: '#A8334C' - green: '#567A30' + green: '#4F6C31' yellow: '#944927' blue: '#286486' magenta: '#88507D' cyan: '#3B8992' - white: '#202E18' - # Bright colors + white: '#2C363C' bright: - black: '#B3C6B6' + black: '#CFC1BA' red: '#94253E' green: '#3F5A22' yellow: '#803D1C' blue: '#1D5573' magenta: '#7B3B70' cyan: '#2B747C' - white: '#415934' + white: '#4F5E68' diff --git a/extras/iterm/zenbones_bright.itermcolors b/extras/iterm/zenbones_bright.itermcolors deleted file mode 100644 index 0166fc4..0000000 --- a/extras/iterm/zenbones_bright.itermcolors +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.9254901960784314 - Color Space - sRGB - Green Component - 0.9294117647058824 - Red Component - 0.9411764705882353 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.2980392156862745 - Color Space - sRGB - Green Component - 0.2000000000000000 - Red Component - 0.6588235294117647 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.1333333333333333 - Color Space - sRGB - Green Component - 0.3529411764705883 - Red Component - 0.2470588235294118 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.1098039215686274 - Color Space - sRGB - Green Component - 0.2392156862745098 - Red Component - 0.5019607843137255 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 0.4509803921568628 - Color Space - sRGB - Green Component - 0.3333333333333333 - Red Component - 0.1137254901960784 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.4392156862745098 - Color Space - sRGB - Green Component - 0.2313725490196079 - Red Component - 0.4823529411764706 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.4862745098039216 - Color Space - sRGB - Green Component - 0.4549019607843137 - Red Component - 0.1686274509803922 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.4078431372549020 - Color Space - sRGB - Green Component - 0.3686274509803922 - Red Component - 0.3098039215686275 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.1921568627450981 - Color Space - sRGB - Green Component - 0.4235294117647059 - Red Component - 0.3098039215686275 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.1529411764705882 - Color Space - sRGB - Green Component - 0.2862745098039216 - Red Component - 0.5803921568627451 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.5254901960784314 - Color Space - sRGB - Green Component - 0.3921568627450980 - Red Component - 0.1568627450980392 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.4901960784313725 - Color Space - sRGB - Green Component - 0.3137254901960784 - Red Component - 0.5333333333333333 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.5725490196078431 - Color Space - sRGB - Green Component - 0.5372549019607843 - Red Component - 0.2313725490196079 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.7294117647058823 - Color Space - sRGB - Green Component - 0.7568627450980392 - Red Component - 0.8117647058823529 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.2431372549019608 - Color Space - sRGB - Green Component - 0.1450980392156863 - Red Component - 0.5803921568627451 - - Background Color - - Alpha Component - 1 - Blue Component - 0.9607843137254902 - Color Space - sRGB - Green Component - 0.9647058823529412 - Red Component - 0.9725490196078431 - - Badge Color - - Alpha Component - 1 - Blue Component - 0.5294117647058824 - Color Space - sRGB - Green Component - 0.5568627450980392 - Red Component - 0.6117647058823530 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.7294117647058823 - Color Space - sRGB - Green Component - 0.7568627450980392 - Red Component - 0.8117647058823529 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Cursor Guide Color - - Alpha Component - 1 - Blue Component - 0.9215686274509803 - Color Space - sRGB - Green Component - 0.9294117647058824 - Red Component - 0.9450980392156862 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.9607843137254902 - Color Space - sRGB - Green Component - 0.9647058823529412 - Red Component - 0.9725490196078431 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Link Color - - Alpha Component - 1 - Blue Component - 0.4509803921568628 - Color Space - sRGB - Green Component - 0.3333333333333333 - Red Component - 0.1137254901960784 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.9137254901960784 - Color Space - sRGB - Green Component - 0.8823529411764706 - Red Component - 0.8392156862745098 - - Tab Color - - Alpha Component - 1 - Blue Component - 0.9607843137254902 - Color Space - sRGB - Green Component - 0.9647058823529412 - Red Component - 0.9725490196078431 - - - \ No newline at end of file diff --git a/extras/iterm/zenbones_dark.itermcolors b/extras/iterm/zenbones_dark.itermcolors deleted file mode 100644 index 194311a..0000000 --- a/extras/iterm/zenbones_dark.itermcolors +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.1215686274509804 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.0588235294117647 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.4862745098039216 - Color Space - sRGB - Green Component - 0.4313725490196079 - Red Component - 0.8705882352941177 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.5215686274509804 - Color Space - sRGB - Green Component - 1.0000000000000000 - Red Component - 0.6274509803921569 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.4039215686274510 - Color Space - sRGB - Green Component - 0.5490196078431373 - Red Component - 0.8392156862745098 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 0.8862745098039215 - Color Space - sRGB - Green Component - 0.6274509803921569 - Red Component - 0.5725490196078431 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.7568627450980392 - Color Space - sRGB - Green Component - 0.5254901960784314 - Red Component - 0.8117647058823529 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.7568627450980392 - Color Space - sRGB - Green Component - 0.7215686274509804 - Red Component - 0.3960784313725490 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.6196078431372549 - Color Space - sRGB - Green Component - 0.6392156862745098 - Red Component - 0.5960784313725490 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.4196078431372549 - Color Space - sRGB - Green Component - 1.0000000000000000 - Red Component - 0.5647058823529412 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.3921568627450980 - Color Space - sRGB - Green Component - 0.4941176470588236 - Red Component - 0.7176470588235294 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.8313725490196079 - Color Space - sRGB - Green Component - 0.5647058823529412 - Red Component - 0.5058823529411764 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.6549019607843137 - Color Space - sRGB - Green Component - 0.4745098039215686 - Red Component - 0.6980392156862745 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.6784313725490196 - Color Space - sRGB - Green Component - 0.6470588235294118 - Red Component - 0.4000000000000000 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.8117647058823529 - Color Space - sRGB - Green Component - 0.8352941176470589 - Red Component - 0.7764705882352941 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.2705882352941176 - Color Space - sRGB - Green Component - 0.2235294117647059 - Red Component - 0.1490196078431373 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.5607843137254902 - Color Space - sRGB - Green Component - 0.5137254901960784 - Red Component - 0.9098039215686274 - - Background Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - Badge Color - - Alpha Component - 1 - Blue Component - 0.3882352941176471 - Color Space - sRGB - Green Component - 0.4039215686274510 - Red Component - 0.4313725490196079 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.2705882352941176 - Color Space - sRGB - Green Component - 0.2235294117647059 - Red Component - 0.1490196078431373 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.8117647058823529 - Color Space - sRGB - Green Component - 0.7921568627450980 - Red Component - 0.7686274509803922 - - Cursor Guide Color - - Alpha Component - 1 - Blue Component - 0.1215686274509804 - Color Space - sRGB - Green Component - 0.1294117647058824 - Red Component - 0.1450980392156863 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Link Color - - Alpha Component - 1 - Blue Component - 0.8862745098039215 - Color Space - sRGB - Green Component - 0.6274509803921569 - Red Component - 0.5725490196078431 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.7647058823529411 - Color Space - sRGB - Green Component - 0.7411764705882353 - Red Component - 0.7058823529411765 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.2588235294117647 - Color Space - sRGB - Green Component - 0.2509803921568627 - Red Component - 0.2392156862745098 - - Tab Color - - Alpha Component - 1 - Blue Component - 0.0901960784313725 - Color Space - sRGB - Green Component - 0.0980392156862745 - Red Component - 0.1098039215686274 - - - \ No newline at end of file diff --git a/extras/iterm/zenbones_dim.itermcolors b/extras/iterm/zenbones_dim.itermcolors deleted file mode 100644 index 0b8f9da..0000000 --- a/extras/iterm/zenbones_dim.itermcolors +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.9254901960784314 - Color Space - sRGB - Green Component - 0.9294117647058824 - Red Component - 0.9411764705882353 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.2980392156862745 - Color Space - sRGB - Green Component - 0.2000000000000000 - Red Component - 0.6588235294117647 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.1333333333333333 - Color Space - sRGB - Green Component - 0.3529411764705883 - Red Component - 0.2470588235294118 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.1098039215686274 - Color Space - sRGB - Green Component - 0.2392156862745098 - Red Component - 0.5019607843137255 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 0.4509803921568628 - Color Space - sRGB - Green Component - 0.3333333333333333 - Red Component - 0.1137254901960784 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.4392156862745098 - Color Space - sRGB - Green Component - 0.2313725490196079 - Red Component - 0.4823529411764706 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.4862745098039216 - Color Space - sRGB - Green Component - 0.4549019607843137 - Red Component - 0.1686274509803922 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.4078431372549020 - Color Space - sRGB - Green Component - 0.3686274509803922 - Red Component - 0.3098039215686275 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.1921568627450981 - Color Space - sRGB - Green Component - 0.4235294117647059 - Red Component - 0.3098039215686275 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.1529411764705882 - Color Space - sRGB - Green Component - 0.2862745098039216 - Red Component - 0.5803921568627451 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.5254901960784314 - Color Space - sRGB - Green Component - 0.3921568627450980 - Red Component - 0.1568627450980392 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.4901960784313725 - Color Space - sRGB - Green Component - 0.3137254901960784 - Red Component - 0.5333333333333333 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.5725490196078431 - Color Space - sRGB - Green Component - 0.5372549019607843 - Red Component - 0.2313725490196079 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.7294117647058823 - Color Space - sRGB - Green Component - 0.7568627450980392 - Red Component - 0.8117647058823529 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.2431372549019608 - Color Space - sRGB - Green Component - 0.1450980392156863 - Red Component - 0.5803921568627451 - - Background Color - - Alpha Component - 1 - Blue Component - 0.8901960784313725 - Color Space - sRGB - Green Component - 0.8941176470588236 - Red Component - 0.9098039215686274 - - Badge Color - - Alpha Component - 1 - Blue Component - 0.5019607843137255 - Color Space - sRGB - Green Component - 0.5215686274509804 - Red Component - 0.5529411764705883 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.7294117647058823 - Color Space - sRGB - Green Component - 0.7568627450980392 - Red Component - 0.8117647058823529 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Cursor Guide Color - - Alpha Component - 1 - Blue Component - 0.8509803921568627 - Color Space - sRGB - Green Component - 0.8627450980392157 - Red Component - 0.8823529411764706 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.8901960784313725 - Color Space - sRGB - Green Component - 0.8941176470588236 - Red Component - 0.9098039215686274 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Link Color - - Alpha Component - 1 - Blue Component - 0.4509803921568628 - Color Space - sRGB - Green Component - 0.3333333333333333 - Red Component - 0.1137254901960784 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.8705882352941177 - Color Space - sRGB - Green Component - 0.8196078431372549 - Red Component - 0.7529411764705882 - - Tab Color - - Alpha Component - 1 - Blue Component - 0.8901960784313725 - Color Space - sRGB - Green Component - 0.8941176470588236 - Red Component - 0.9098039215686274 - - - \ No newline at end of file diff --git a/extras/iterm/zenbones_light.itermcolors b/extras/iterm/zenbones_light.itermcolors deleted file mode 100644 index c027e3e..0000000 --- a/extras/iterm/zenbones_light.itermcolors +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.9019607843137255 - Color Space - sRGB - Green Component - 0.9294117647058824 - Red Component - 0.8980392156862745 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.2980392156862745 - Color Space - sRGB - Green Component - 0.2000000000000000 - Red Component - 0.6588235294117647 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.1333333333333333 - Color Space - sRGB - Green Component - 0.3529411764705883 - Red Component - 0.2470588235294118 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.1098039215686274 - Color Space - sRGB - Green Component - 0.2392156862745098 - Red Component - 0.5019607843137255 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 0.4509803921568628 - Color Space - sRGB - Green Component - 0.3333333333333333 - Red Component - 0.1137254901960784 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.4392156862745098 - Color Space - sRGB - Green Component - 0.2313725490196079 - Red Component - 0.4823529411764706 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.4862745098039216 - Color Space - sRGB - Green Component - 0.4549019607843137 - Red Component - 0.1686274509803922 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.2039215686274510 - Color Space - sRGB - Green Component - 0.3490196078431372 - Red Component - 0.2549019607843137 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.1882352941176471 - Color Space - sRGB - Green Component - 0.4784313725490196 - Red Component - 0.3372549019607843 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.1529411764705882 - Color Space - sRGB - Green Component - 0.2862745098039216 - Red Component - 0.5803921568627451 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.5254901960784314 - Color Space - sRGB - Green Component - 0.3921568627450980 - Red Component - 0.1568627450980392 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.4901960784313725 - Color Space - sRGB - Green Component - 0.3137254901960784 - Red Component - 0.5333333333333333 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.5725490196078431 - Color Space - sRGB - Green Component - 0.5372549019607843 - Red Component - 0.2313725490196079 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.0941176470588235 - Color Space - sRGB - Green Component - 0.1803921568627451 - Red Component - 0.1254901960784314 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.7137254901960784 - Color Space - sRGB - Green Component - 0.7764705882352941 - Red Component - 0.7019607843137254 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.2431372549019608 - Color Space - sRGB - Green Component - 0.1450980392156863 - Red Component - 0.5803921568627451 - - Background Color - - Alpha Component - 1 - Blue Component - 0.9254901960784314 - Color Space - sRGB - Green Component - 0.9294117647058824 - Red Component - 0.9411764705882353 - - Badge Color - - Alpha Component - 1 - Blue Component - 0.5215686274509804 - Color Space - sRGB - Green Component - 0.5372549019607843 - Red Component - 0.5803921568627451 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.7137254901960784 - Color Space - sRGB - Green Component - 0.7764705882352941 - Red Component - 0.7019607843137254 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Cursor Guide Color - - Alpha Component - 1 - Blue Component - 0.8862745098039215 - Color Space - sRGB - Green Component - 0.8941176470588236 - Red Component - 0.9137254901960784 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.9254901960784314 - Color Space - sRGB - Green Component - 0.9294117647058824 - Red Component - 0.9411764705882353 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Link Color - - Alpha Component - 1 - Blue Component - 0.4509803921568628 - Color Space - sRGB - Green Component - 0.3333333333333333 - Red Component - 0.1137254901960784 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.2352941176470588 - Color Space - sRGB - Green Component - 0.2117647058823529 - Red Component - 0.1725490196078431 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.8901960784313725 - Color Space - sRGB - Green Component - 0.8509803921568627 - Red Component - 0.7960784313725490 - - Tab Color - - Alpha Component - 1 - Blue Component - 0.9254901960784314 - Color Space - sRGB - Green Component - 0.9294117647058824 - Red Component - 0.9411764705882353 - - - \ No newline at end of file diff --git a/extras/kitty/neobones_dark.conf b/extras/kitty/neobones_dark.conf index f5584ab..9a33d3c 100644 --- a/extras/kitty/neobones_dark.conf +++ b/extras/kitty/neobones_dark.conf @@ -1,40 +1,48 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua +# This file is auto-generated by shipwright.nvim # vim:ft=kitty ## name: neobones_dark -## license: MIT ## author: Michael Chris Lopez +## license: MIT ## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/neobones_dark.conf - -background #0F191F -foreground #C6D5CF -selection_background #3A3E3D -selection_foreground #C6D5CF -url_color #92A0E2 -cursor #C6D5CF - -# Tabs -active_tab_background #62415B -active_tab_foreground #C6D5CF -inactive_tab_background #273944 -inactive_tab_foreground #C6D5CF -#tab_bar_background ${tab_bar_background} - -# normal +foreground #C6D5CF +background #0F191F +selection_foreground #C6D5CF +selection_background #3A3E3D +# Cursor colors +cursor #CEDDD7 +cursor_text_color #0F191F +# URL underline color when hovering with mouse +# kitty window border colors +# OS Window titlebar colors +# Tab bar colors +active_tab_foreground #C6D5CF +active_tab_background #62415B +inactive_tab_foreground #C6D5CF +inactive_tab_background #273944 +# Colors for marks (marked text in the terminal) +# The basic 16 colors +# black color0 #0F191F -color1 #DE6E7C -color2 #90FF6B -color3 #B77E64 -color4 #8190D4 -color5 #B279A7 -color6 #66A5AD -color7 #C6D5CF - -# bright color8 #263945 +# red +color1 #DE6E7C color9 #E8838F +# green +color2 #90FF6B color10 #A0FF85 +# yellow +color3 #B77E64 color11 #D68C67 +# blue +color4 #8190D4 color12 #92A0E2 +# magenta +color5 #B279A7 color13 #CF86C1 +# cyan +color6 #66A5AD color14 #65B8C1 +# white +color7 #C6D5CF color15 #98A39E +# You can set the remaining 240 colors as color16 to color255. diff --git a/extras/kitty/neobones_light.conf b/extras/kitty/neobones_light.conf index cd4a2be..d8b7f70 100644 --- a/extras/kitty/neobones_light.conf +++ b/extras/kitty/neobones_light.conf @@ -1,40 +1,48 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua +# This file is auto-generated by shipwright.nvim # vim:ft=kitty ## name: neobones_light -## license: MIT ## author: Michael Chris Lopez +## license: MIT ## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/neobones_light.conf - -background #E5EDE6 -foreground #202E18 -selection_background #ADE48C -selection_foreground #202E18 -url_color #1D5573 -cursor #202E18 - -# Tabs -active_tab_background #DCB5D4 -active_tab_foreground #202E18 -inactive_tab_background #BDCABF -inactive_tab_foreground #202E18 -#tab_bar_background ${tab_bar_background} - -# normal +foreground #202E18 +background #E5EDE6 +selection_foreground #202E18 +selection_background #ADE48C +# Cursor colors +cursor #202E18 +cursor_text_color #E5EDE6 +# URL underline color when hovering with mouse +# kitty window border colors +# OS Window titlebar colors +# Tab bar colors +active_tab_foreground #202E18 +active_tab_background #DCB5D4 +inactive_tab_foreground #202E18 +inactive_tab_background #BDCABF +# Colors for marks (marked text in the terminal) +# The basic 16 colors +# black color0 #E5EDE6 -color1 #A8334C -color2 #567A30 -color3 #944927 -color4 #286486 -color5 #88507D -color6 #3B8992 -color7 #202E18 - -# bright color8 #B3C6B6 +# red +color1 #A8334C color9 #94253E +# green +color2 #567A30 color10 #3F5A22 +# yellow +color3 #944927 color11 #803D1C +# blue +color4 #286486 color12 #1D5573 +# magenta +color5 #88507D color13 #7B3B70 +# cyan +color6 #3B8992 color14 #2B747C +# white +color7 #202E18 color15 #415934 +# You can set the remaining 240 colors as color16 to color255. diff --git a/extras/kitty/zenbones.conf b/extras/kitty/zenbones.conf deleted file mode 100644 index 70f86e9..0000000 --- a/extras/kitty/zenbones.conf +++ /dev/null @@ -1,40 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua -# vim:ft=kitty -## name: zenbones -## license: MIT -## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenbones.conf - -background #F0EDEC -foreground #2C363C -selection_background #CBD9E3 -selection_foreground #2C363C -url_color #1D5573 -cursor #2C363C - -# Tabs -active_tab_background #DEB9D6 -active_tab_foreground #2C363C -inactive_tab_background #D1C7C3 -inactive_tab_foreground #2C363C -#tab_bar_background ${tab_bar_background} - -# normal -color0 #F0EDEC -color1 #A8334C -color2 #4F6C31 -color3 #944927 -color4 #286486 -color5 #88507D -color6 #3B8992 -color7 #2C363C - -# bright -color8 #CFC1BA -color9 #94253E -color10 #3F5A22 -color11 #803D1C -color12 #1D5573 -color13 #7B3B70 -color14 #2B747C -color15 #4F5E68 diff --git a/extras/kitty/zenbones_bright.conf b/extras/kitty/zenbones_bright.conf deleted file mode 100644 index b26d514..0000000 --- a/extras/kitty/zenbones_bright.conf +++ /dev/null @@ -1,40 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua -# vim:ft=kitty -## name: zenbones_bright -## license: MIT -## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenbones_bright.conf - -background #F8F6F5 -foreground #2C363C -selection_background #D6E1E9 -selection_foreground #2C363C -url_color #1D5573 -cursor #2C363C - -# Tabs -active_tab_background #E2C3DB -active_tab_foreground #2C363C -inactive_tab_background #D8CCC7 -inactive_tab_foreground #2C363C -#tab_bar_background ${tab_bar_background} - -# normal -color0 #F0EDEC -color1 #A8334C -color2 #4F6C31 -color3 #944927 -color4 #286486 -color5 #88507D -color6 #3B8992 -color7 #2C363C - -# bright -color8 #CFC1BA -color9 #94253E -color10 #3F5A22 -color11 #803D1C -color12 #1D5573 -color13 #7B3B70 -color14 #2B747C -color15 #4F5E68 diff --git a/extras/kitty/zenbones_dark.conf b/extras/kitty/zenbones_dark.conf index 89e7064..902cebc 100644 --- a/extras/kitty/zenbones_dark.conf +++ b/extras/kitty/zenbones_dark.conf @@ -1,40 +1,48 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua +# This file is auto-generated by shipwright.nvim # vim:ft=kitty ## name: zenbones_dark -## license: MIT ## author: Michael Chris Lopez +## license: MIT ## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenbones_dark.conf - -background #1C1917 -foreground #B4BDC3 -selection_background #3D4042 -selection_foreground #B4BDC3 -url_color #92A0E2 -cursor #B4BDC3 - -# Tabs -active_tab_background #65435E -active_tab_foreground #B4BDC3 -inactive_tab_background #3E3835 -inactive_tab_foreground #B4BDC3 -#tab_bar_background ${tab_bar_background} - -# normal -color0 #0F191F +foreground #B4BDC3 +background #1C1917 +selection_foreground #B4BDC3 +selection_background #3D4042 +# Cursor colors +cursor #C4CACF +cursor_text_color #1C1917 +# URL underline color when hovering with mouse +# kitty window border colors +# OS Window titlebar colors +# Tab bar colors +active_tab_foreground #B4BDC3 +active_tab_background #65435E +inactive_tab_foreground #B4BDC3 +inactive_tab_background #3E3835 +# Colors for marks (marked text in the terminal) +# The basic 16 colors +# black +color0 #1C1917 +color8 #403833 +# red color1 #DE6E7C -color2 #90FF6B -color3 #B77E64 -color4 #8190D4 -color5 #B279A7 -color6 #66A5AD -color7 #C6D5CF - -# bright -color8 #263945 color9 #E8838F -color10 #A0FF85 +# green +color2 #819B69 +color10 #8BAE68 +# yellow +color3 #B77E64 color11 #D68C67 -color12 #92A0E2 +# blue +color4 #6099C0 +color12 #61ABDA +# magenta +color5 #B279A7 color13 #CF86C1 +# cyan +color6 #66A5AD color14 #65B8C1 -color15 #98A39E +# white +color7 #B4BDC3 +color15 #888F94 +# You can set the remaining 240 colors as color16 to color255. diff --git a/extras/kitty/zenbones_dim.conf b/extras/kitty/zenbones_dim.conf deleted file mode 100644 index 61b8042..0000000 --- a/extras/kitty/zenbones_dim.conf +++ /dev/null @@ -1,40 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua -# vim:ft=kitty -## name: zenbones_dim -## license: MIT -## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenbones_dim.conf - -background #E8E4E3 -foreground #2C363C -selection_background #C0D1DE -selection_foreground #2C363C -url_color #1D5573 -cursor #2C363C - -# Tabs -active_tab_background #D9AFD0 -active_tab_foreground #2C363C -inactive_tab_background #CABFBA -inactive_tab_foreground #2C363C -#tab_bar_background ${tab_bar_background} - -# normal -color0 #F0EDEC -color1 #A8334C -color2 #4F6C31 -color3 #944927 -color4 #286486 -color5 #88507D -color6 #3B8992 -color7 #2C363C - -# bright -color8 #CFC1BA -color9 #94253E -color10 #3F5A22 -color11 #803D1C -color12 #1D5573 -color13 #7B3B70 -color14 #2B747C -color15 #4F5E68 diff --git a/extras/kitty/zenbones_light.conf b/extras/kitty/zenbones_light.conf index 905c35a..70896f7 100644 --- a/extras/kitty/zenbones_light.conf +++ b/extras/kitty/zenbones_light.conf @@ -1,40 +1,48 @@ -# This file is auto-generated from lua/zenbones/template/kitty.lua +# This file is auto-generated by shipwright.nvim # vim:ft=kitty ## name: zenbones_light -## license: MIT ## author: Michael Chris Lopez +## license: MIT ## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenbones_light.conf - -background #F0EDEC -foreground #2C363C -selection_background #CBD9E3 -selection_foreground #2C363C -url_color #1D5573 -cursor #2C363C - -# Tabs -active_tab_background #DEB9D6 -active_tab_foreground #2C363C -inactive_tab_background #D1C7C3 -inactive_tab_foreground #2C363C -#tab_bar_background ${tab_bar_background} - -# normal -color0 #E5EDE6 +foreground #2C363C +background #F0EDEC +selection_foreground #2C363C +selection_background #CBD9E3 +# Cursor colors +cursor #2C363C +cursor_text_color #F0EDEC +# URL underline color when hovering with mouse +# kitty window border colors +# OS Window titlebar colors +# Tab bar colors +active_tab_foreground #2C363C +active_tab_background #DEB9D6 +inactive_tab_foreground #2C363C +inactive_tab_background #D1C7C3 +# Colors for marks (marked text in the terminal) +# The basic 16 colors +# black +color0 #F0EDEC +color8 #CFC1BA +# red color1 #A8334C -color2 #567A30 -color3 #944927 -color4 #286486 -color5 #88507D -color6 #3B8992 -color7 #202E18 - -# bright -color8 #B3C6B6 color9 #94253E +# green +color2 #4F6C31 color10 #3F5A22 +# yellow +color3 #944927 color11 #803D1C +# blue +color4 #286486 color12 #1D5573 +# magenta +color5 #88507D color13 #7B3B70 +# cyan +color6 #3B8992 color14 #2B747C -color15 #415934 +# white +color7 #2C363C +color15 #4F5E68 +# You can set the remaining 240 colors as color16 to color255. diff --git a/extras/tmux/zenbones_bright.tmux b/extras/tmux/zenbones_bright.tmux deleted file mode 100644 index 4798bb9..0000000 --- a/extras/tmux/zenbones_bright.tmux +++ /dev/null @@ -1,18 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/tmux.lua -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='#2C363C' - -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='#F0EDEC',bg='#D6E1E9' - -set -g display-panes-active-colour '#88507D' -set -g display-panes-colour '#88507D' - -set -g clock-mode-colour '#88507D' - -set -g mode-style fg='#F0EDEC',bg='#D6E1E9' diff --git a/extras/tmux/zenbones_dark.tmux b/extras/tmux/zenbones_dark.tmux deleted file mode 100644 index 6b54c1e..0000000 --- a/extras/tmux/zenbones_dark.tmux +++ /dev/null @@ -1,18 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/tmux.lua -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='#C6D5CF' - -set -g window-status-current-style fg='#B279A7',bg='#C6D5CF',bold - -set -g pane-border-style fg='#B279A7' -set -g pane-active-border-style fg='#B279A7' - -set -g message-style fg='#0F191F',bg='#3D4042' - -set -g display-panes-active-colour '#B279A7' -set -g display-panes-colour '#B279A7' - -set -g clock-mode-colour '#B279A7' - -set -g mode-style fg='#0F191F',bg='#3D4042' diff --git a/extras/tmux/zenbones_dim.tmux b/extras/tmux/zenbones_dim.tmux deleted file mode 100644 index 8042c0a..0000000 --- a/extras/tmux/zenbones_dim.tmux +++ /dev/null @@ -1,18 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/tmux.lua -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='#2C363C' - -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='#F0EDEC',bg='#C0D1DE' - -set -g display-panes-active-colour '#88507D' -set -g display-panes-colour '#88507D' - -set -g clock-mode-colour '#88507D' - -set -g mode-style fg='#F0EDEC',bg='#C0D1DE' diff --git a/extras/tmux/zenbones_light.tmux b/extras/tmux/zenbones_light.tmux deleted file mode 100644 index d73c3bb..0000000 --- a/extras/tmux/zenbones_light.tmux +++ /dev/null @@ -1,18 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/tmux.lua -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='#202E18' - -set -g window-status-current-style fg='#88507D',bg='#202E18',bold - -set -g pane-border-style fg='#88507D' -set -g pane-active-border-style fg='#88507D' - -set -g message-style fg='#E5EDE6',bg='#CBD9E3' - -set -g display-panes-active-colour '#88507D' -set -g display-panes-colour '#88507D' - -set -g clock-mode-colour '#88507D' - -set -g mode-style fg='#E5EDE6',bg='#CBD9E3' diff --git a/extras/wezterm/Zenbones_bright.toml b/extras/wezterm/Zenbones_bright.toml deleted file mode 100644 index 25cf4e8..0000000 --- a/extras/wezterm/Zenbones_bright.toml +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/wezterm.lua -# Zenbones_bright -[colors] -foreground = "#2C363C" -background = "#F8F6F5" -cursor_bg = "#2C363C" -cursor_border = "#F8F6F5" -cursor_fg = "#F8F6F5" -selection_bg = "#D6E1E9" -selection_fg = "#2C363C" - -ansi = ["#F0EDEC", "#A8334C", "#4F6C31", "#944927", "#286486", "#88507D", "#3B8992", "#2C363C"] -brights = ["#CFC1BA", "#94253E", "#3F5A22", "#803D1C", "#1D5573", "#7B3B70", "#2B747C", "#4F5E68"] diff --git a/extras/wezterm/Zenbones_dark.toml b/extras/wezterm/Zenbones_dark.toml deleted file mode 100644 index aeee76b..0000000 --- a/extras/wezterm/Zenbones_dark.toml +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/wezterm.lua -# Zenbones_dark -[colors] -foreground = "#B4BDC3" -background = "#1C1917" -cursor_bg = "#C4CACF" -cursor_border = "#1C1917" -cursor_fg = "#1C1917" -selection_bg = "#3D4042" -selection_fg = "#B4BDC3" - -ansi = ["#0F191F", "#DE6E7C", "#90FF6B", "#B77E64", "#8190D4", "#B279A7", "#66A5AD", "#C6D5CF"] -brights = ["#263945", "#E8838F", "#A0FF85", "#D68C67", "#92A0E2", "#CF86C1", "#65B8C1", "#98A39E"] diff --git a/extras/wezterm/Zenbones_dim.toml b/extras/wezterm/Zenbones_dim.toml deleted file mode 100644 index f6bd5e0..0000000 --- a/extras/wezterm/Zenbones_dim.toml +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/wezterm.lua -# Zenbones_dim -[colors] -foreground = "#2C363C" -background = "#E8E4E3" -cursor_bg = "#2C363C" -cursor_border = "#E8E4E3" -cursor_fg = "#E8E4E3" -selection_bg = "#C0D1DE" -selection_fg = "#2C363C" - -ansi = ["#F0EDEC", "#A8334C", "#4F6C31", "#944927", "#286486", "#88507D", "#3B8992", "#2C363C"] -brights = ["#CFC1BA", "#94253E", "#3F5A22", "#803D1C", "#1D5573", "#7B3B70", "#2B747C", "#4F5E68"] diff --git a/extras/wezterm/Zenbones_light.toml b/extras/wezterm/Zenbones_light.toml deleted file mode 100644 index 8afb414..0000000 --- a/extras/wezterm/Zenbones_light.toml +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated from lua/zenbones/template/wezterm.lua -# Zenbones_light -[colors] -foreground = "#2C363C" -background = "#F0EDEC" -cursor_bg = "#2C363C" -cursor_border = "#F0EDEC" -cursor_fg = "#F0EDEC" -selection_bg = "#CBD9E3" -selection_fg = "#2C363C" - -ansi = ["#E5EDE6", "#A8334C", "#567A30", "#944927", "#286486", "#88507D", "#3B8992", "#202E18"] -brights = ["#B3C6B6", "#94253E", "#3F5A22", "#803D1C", "#1D5573", "#7B3B70", "#2B747C", "#415934"] From a5bd4b1bb29ce05b58f8f668557f24f1986c9c1f Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 15:43:29 +0800 Subject: [PATCH 11/31] breaking: standardize palette vimbones and nordbones follow standard palatte table: require("nordbones.palette").dark instead of "derived" --- lua/nordbones/init.lua | 4 ++-- lua/nordbones/palette.lua | 2 +- lua/vimbones/init.lua | 2 +- lua/vimbones/palette.lua | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lua/nordbones/init.lua b/lua/nordbones/init.lua index 91e6ea6..fe5e369 100644 --- a/lua/nordbones/init.lua +++ b/lua/nordbones/init.lua @@ -2,14 +2,14 @@ local lush = require "lush" local generator = require "zenbones.specs" local p = require "nordbones.palette" -local specs = generator.generate(p.derived, "dark", generator.get_global_config("nordbones", "dark")) +local specs = generator.generate(p.dark, "dark", generator.get_global_config("nordbones", "dark")) return lush.extends({ specs }).with(function() ---@diagnostic disable: undefined-global -- selene: allow(undefined_variable) return { Number { fg = p.base.nord7, gui = "italic" }, - Identifer { fg = p.derived.fg }, + Identifer { fg = p.dark.fg }, Function { fg = p.base.nord8 }, Statement { fg = p.base.nord9 }, Type { fg = p.base.nord10 }, diff --git a/lua/nordbones/palette.lua b/lua/nordbones/palette.lua index 2c71a1f..f9d6403 100644 --- a/lua/nordbones/palette.lua +++ b/lua/nordbones/palette.lua @@ -23,7 +23,7 @@ local base = { nord15 = hsluv "#b48ead", } -M.derived = util.palette_extend { +M.dark = util.palette_extend { bg = base.nord0, fg = base.nord6, rose = base.nord11, diff --git a/lua/vimbones/init.lua b/lua/vimbones/init.lua index fbc1f73..360ec4e 100644 --- a/lua/vimbones/init.lua +++ b/lua/vimbones/init.lua @@ -1,6 +1,6 @@ local lush = require "lush" local generator = require "zenbones.specs" -local p = require "vimbones.palette" +local p = require("vimbones.palette").light local specs = generator.generate(p, "light", generator.get_global_config("vimbones", "light")) diff --git a/lua/vimbones/palette.lua b/lua/vimbones/palette.lua index 4f7af7a..82803ce 100644 --- a/lua/vimbones/palette.lua +++ b/lua/vimbones/palette.lua @@ -2,8 +2,12 @@ local util = require "zenbones.util" local lush = require "lush" local hsluv = lush.hsluv -return util.palette_extend({ +local M = {} + +M.light = util.palette_extend({ bg = hsluv(85.9, 27, 94), fg = hsluv(0, 0, 22), vim = hsluv(131.8, 92, 51), }, "light") + +return M From 6afa5a275042686aa1fb4c5817d61b11bb8083e1 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 15:55:49 +0800 Subject: [PATCH 12/31] add wezterm runner --- lua/zenbones/shipwright/init.lua | 8 ++++++-- lua/zenbones/shipwright/runners/kitty.lua | 2 -- lua/zenbones/shipwright/runners/wezterm.lua | 12 ++++++++++++ lua/zenbones/shipwright/transform.lua | 5 ++++- 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 lua/zenbones/shipwright/runners/wezterm.lua diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index 7ffd0aa..afbacf2 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -55,8 +55,12 @@ local function make_runners(config) end M.run = function() - local runner_files = { "alacritty", "kitty" } - local colorschemes = { { name = "zenbones" }, { name = "neobones" } } + local runner_files = { "alacritty", "kitty", "wezterm" } + local colorschemes = { + { name = "zenbones" }, + { name = "neobones" }, + { name = "vimbones", background = "light" }, + } for _, colorscheme in ipairs(colorschemes) do for _, file in ipairs(runner_files) do colorscheme.file = file diff --git a/lua/zenbones/shipwright/runners/kitty.lua b/lua/zenbones/shipwright/runners/kitty.lua index cbe5a6f..25090a0 100644 --- a/lua/zenbones/shipwright/runners/kitty.lua +++ b/lua/zenbones/shipwright/runners/kitty.lua @@ -7,8 +7,6 @@ run( author = "Michael Chris Lopez", license = "MIT", upstream = string.format("https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/%s.conf", name), - selection_bg = specs.Visual.bg.hex, - selection_fg = colors.fg, url_color = term[13].hex, tab_active_bg = specs.Search.bg.hex, tab_active_fg = colors.fg, diff --git a/lua/zenbones/shipwright/runners/wezterm.lua b/lua/zenbones/shipwright/runners/wezterm.lua new file mode 100644 index 0000000..e12411c --- /dev/null +++ b/lua/zenbones/shipwright/runners/wezterm.lua @@ -0,0 +1,12 @@ +run( + { specs, p, term }, + transform.colorscheme_to_term_colors, + function(colors) + return vim.tbl_extend("keep", colors, { + cursor_border = specs.Cursor.fg.hex, + }) + end, + contrib.wezterm, + { prepend, "# This file is auto-generated by shipwright.nvim" }, + { overwrite, string.format("extras/wezterm/%s.toml", name:sub(1, 1):upper() .. name:sub(2)) } +) diff --git a/lua/zenbones/shipwright/transform.lua b/lua/zenbones/shipwright/transform.lua index 61fe762..d51f0e0 100644 --- a/lua/zenbones/shipwright/transform.lua +++ b/lua/zenbones/shipwright/transform.lua @@ -2,11 +2,14 @@ local M = {} M.colorscheme_to_term_colors = function(colorscheme) local specs, _, term = unpack(colorscheme) + local fg = specs.Normal.fg.hex return { - fg = specs.Normal.fg.hex, + fg = fg, bg = specs.Normal.bg.hex, cursor_fg = specs.Cursor.fg.hex, cursor_bg = specs.Cursor.bg.hex, + selection_bg = specs.Visual.bg.hex, + selection_fg = fg, black = term[1].hex, red = term[2].hex, green = term[3].hex, From aa31123d22b78da9b06b650e2254e3c40e3a074f Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 16:52:55 +0800 Subject: [PATCH 13/31] add lualine transform --- lua/zenbones/shipwright/init.lua | 2 +- lua/zenbones/shipwright/runners/lualine.lua | 83 +++++++++++++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 lua/zenbones/shipwright/runners/lualine.lua diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index afbacf2..c70cfcb 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -55,7 +55,7 @@ local function make_runners(config) end M.run = function() - local runner_files = { "alacritty", "kitty", "wezterm" } + local runner_files = { "alacritty", "kitty", "wezterm", "lualine" } local colorschemes = { { name = "zenbones" }, { name = "neobones" }, diff --git a/lua/zenbones/shipwright/runners/lualine.lua b/lua/zenbones/shipwright/runners/lualine.lua new file mode 100644 index 0000000..9243aa5 --- /dev/null +++ b/lua/zenbones/shipwright/runners/lualine.lua @@ -0,0 +1,83 @@ +local template = [[local common_fg = "$common_fg" +local inactive_bg = "$inactive_bg" +local inactive_fg = "$inactive_fg" + +return { + normal = { + a = { bg = "$normal_a_bg", fg = common_fg, gui = "bold" }, + b = { bg = "$normal_b_bg", fg = common_fg }, + c = { bg = "$normal_c_bg", fg = "$normal_c_fg" }, + }, + + insert = { + a = { bg = "$insert_a_bg", fg = common_fg, gui = "bold" }, + }, + + command = { + a = { bg = "$command_a_bg", fg = common_fg, gui = "bold" }, + }, + + visual = { + a = { bg = "$visual_a_bg", fg = common_fg, gui = "bold" }, + }, + + replace = { + a = { bg = "$replace_a_bg", 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 }, + }, +} +]] + +local helpers = require "shipwright.transform.helpers" + +local check_keys = { + "common_fg", + "inactive_bg", + "inactive_fg", + "normal_a_bg", + "normal_b_bg", + "normal_c_bg", + "normal_c_fg", + "insert_a_bg", + "command_a_bg", + "visual_a_bg", + "replace_a_bg", +} + +local function transform(colors) + for _, key in ipairs(check_keys) do + assert(colors[key], "lualine colors table missing key: " .. key) + end + + local text = helpers.apply_template(template, colors) + return helpers.split_newlines(text) +end + +local function specs_to_colors(specs) + return { + common_fg = specs.Folded.fg.hex, + inactive_bg = specs.StatusLineNC.bg.hex, + inactive_fg = specs.StatusLineNC.fg.hex, + normal_a_bg = specs.PmenuSbar.bg.hex, + normal_b_bg = specs.PmenuSel.bg.hex, + normal_c_bg = specs.StatusLine.bg.hex, + normal_c_fg = specs.StatusLine.fg.hex, + insert_a_bg = specs.DiffText.bg.hex, + command_a_bg = specs.Search.bg.hex, + visual_a_bg = specs.Visual.bg.hex, + replace_a_bg = specs.DiffDelete.bg.hex, + } +end + +run( + specs, + specs_to_colors, + transform, + { prepend, "-- This file is auto-generated by shipwright.nvim" }, + { overwrite, string.format("lua/lualine/themes/%s.lua", name) } +) From e7b8f8f44a63489aa800682b370b45e132a69029 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 17:03:11 +0800 Subject: [PATCH 14/31] add runner for lightline --- lua/zenbones/shipwright/init.lua | 2 +- lua/zenbones/shipwright/runners/lightline.lua | 92 +++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 lua/zenbones/shipwright/runners/lightline.lua diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index c70cfcb..3387153 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -55,7 +55,7 @@ local function make_runners(config) end M.run = function() - local runner_files = { "alacritty", "kitty", "wezterm", "lualine" } + local runner_files = { "alacritty", "kitty", "wezterm", "lualine", "lightline" } local colorschemes = { { name = "zenbones" }, { name = "neobones" }, diff --git a/lua/zenbones/shipwright/runners/lightline.lua b/lua/zenbones/shipwright/runners/lightline.lua new file mode 100644 index 0000000..6ba07bf --- /dev/null +++ b/lua/zenbones/shipwright/runners/lightline.lua @@ -0,0 +1,92 @@ +local template = [[let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} + +let s:p.normal.left = [ [ "$common_fg", "$normal_a_bg", "bold" ], [ "$common_fg", "$normal_b_bg" ] ] +let s:p.normal.middle = [ [ "$normal_c_fg", "$normal_c_bg" ] ] +let s:p.normal.right = [ [ "$common_fg", "$normal_b_bg" ], [ "$common_fg", "$normal_b_bg" ] ] +let s:p.normal.warning = [ [ "$warning_fg", "$warning_bg" ] ] +let s:p.normal.error = [ [ "$error_fg", "$error_bg" ] ] + +let s:p.inactive.left = [ [ "$inactive_fg", "$inactive_bg" ], [ "$inactive_fg", "$inactive_bg" ] ] +let s:p.inactive.middle = [ [ "$inactive_fg", "$inactive_bg" ] ] +let s:p.inactive.right = [ [ "$inactive_fg", "$inactive_bg" ] ] + +let s:p.insert.left = [ [ "$common_fg", "$insert_a_bg", "bold" ], [ "$common_fg", "$normal_b_bg" ] ] +let s:p.replace.left = [ [ "$common_fg", "$replace_a_bg", "bold" ], [ "$common_fg", "$normal_b_bg" ] ] +let s:p.visual.left = [ [ "$common_fg", "$visual_a_bg", "bold" ], [ "$common_fg", "$normal_b_bg" ] ] + +let s:p.tabline.left = [ [ "$tabline_left_fg", "$tabline_left_bg", "italic" ] ] +let s:p.tabline.middle = [ [ "$inactive_fg", "$inactive_bg" ] ] +let s:p.tabline.right = [ [ "$tabline_right_fg", "$tabline_right_bg" ] ] +let s:p.tabline.tabsel = [ [ "$tabsel_fg", "$tabsel_bg", "bold" ] ] + +let g:lightline#colorscheme#$name#palette = lightline#colorscheme#fill(s:p) +]] + +local helpers = require "shipwright.transform.helpers" + +local check_keys = { + "name", + "common_fg", + "inactive_bg", + "inactive_fg", + "normal_a_bg", + "normal_b_bg", + "normal_c_bg", + "normal_c_fg", + "insert_a_bg", + "visual_a_bg", + "replace_a_bg", + "tabline_left_bg", + "tabline_left_fg", + "tabline_right_bg", + "tabline_right_fg", + "tabsel_bg", + "tabsel_fg", + "warning_bg", + "warning_fg", + "error_bg", + "error_fg", +} + +local function transform(colors) + for _, key in ipairs(check_keys) do + assert(colors[key], "lightline colors table missing key: " .. key) + end + + local text = helpers.apply_template(template, colors) + return helpers.split_newlines(text) +end + +local function specs_to_colors(specs) + return { + name = name, + common_fg = specs.Folded.fg.hex, + inactive_bg = specs.StatusLineNC.bg.hex, + inactive_fg = specs.StatusLineNC.fg.hex, + normal_a_bg = specs.PmenuSbar.bg.hex, + normal_b_bg = specs.PmenuSel.bg.hex, + normal_c_bg = specs.StatusLine.bg.hex, + normal_c_fg = specs.StatusLine.fg.hex, + insert_a_bg = specs.DiffText.bg.hex, + visual_a_bg = specs.Visual.bg.hex, + replace_a_bg = specs.DiffDelete.bg.hex, + tabline_left_bg = specs.PmenuSel.bg.hex, + tabline_left_fg = specs.Normal.fg.hex, + tabline_right_bg = specs.PmenuSel.bg.hex, + tabline_right_fg = specs.Normal.fg.hex, + tabsel_bg = specs.Normal.bg.hex, + tabsel_fg = specs.Normal.fg.hex, + warning_bg = specs.DiagnosticVirtualTextWarn.bg.hex, + warning_fg = specs.DiagnosticVirtualTextWarn.fg.hex, + error_bg = specs.DiagnosticVirtualTextError.bg.hex, + error_fg = specs.DiagnosticVirtualTextError.fg.hex, + } +end + +run( + specs, + specs_to_colors, + transform, + { prepend, [[" This file is auto-generated by shipwright.nvim]] }, + { overwrite, string.format("autoload/lightline/colorscheme/%s.vim", name) } +) From 72959ba5153818b6c02d108fe9c482467a9e6362 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 17:09:24 +0800 Subject: [PATCH 15/31] add all colorschemes to shipwright pipeline --- lua/zenbones/shipwright/init.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index 3387153..1296ab4 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -60,6 +60,12 @@ M.run = function() { name = "zenbones" }, { name = "neobones" }, { name = "vimbones", background = "light" }, + { name = "forestbones" }, + { name = "nordbones", background = "dark" }, + { name = "rosebones" }, + { name = "tokyobones" }, + { name = "zenburned", background = "dark" }, + { name = "zenwritten" }, } for _, colorscheme in ipairs(colorschemes) do for _, file in ipairs(runner_files) do From e122642ac3d863eb61471848b61e4ea39ab0cac7 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Fri, 5 Nov 2021 17:13:54 +0800 Subject: [PATCH 16/31] ci(build): clone shipwright --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07c8972..ba0b78d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: - name: Clone lush run: git clone --depth 1 https://github.com/rktjmp/lush.nvim ~/.local/share/nvim/site/pack/zenbones/start/lush.nvim + run: git clone --depth 1 https://github.com/rktjmp/shipwright.nvim ~/.local/share/nvim/site/pack/zenbones/start/shipwright.nvim - uses: rhysd/action-setup-vim@v1 with: From de8f1bdad80571aa8611ac8f1f852ededdeb2453 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 11:03:27 +0800 Subject: [PATCH 17/31] no need to manually convert to hex --- lua/zenbones/shipwright/runners/lightline.lua | 42 +++++++++---------- lua/zenbones/shipwright/runners/lualine.lua | 24 +++++------ lua/zenbones/shipwright/transform.lua | 42 +++++++++---------- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/lua/zenbones/shipwright/runners/lightline.lua b/lua/zenbones/shipwright/runners/lightline.lua index 6ba07bf..3cfe535 100644 --- a/lua/zenbones/shipwright/runners/lightline.lua +++ b/lua/zenbones/shipwright/runners/lightline.lua @@ -54,32 +54,32 @@ local function transform(colors) end local text = helpers.apply_template(template, colors) - return helpers.split_newlines(text) + return { text } end local function specs_to_colors(specs) return { name = name, - common_fg = specs.Folded.fg.hex, - inactive_bg = specs.StatusLineNC.bg.hex, - inactive_fg = specs.StatusLineNC.fg.hex, - normal_a_bg = specs.PmenuSbar.bg.hex, - normal_b_bg = specs.PmenuSel.bg.hex, - normal_c_bg = specs.StatusLine.bg.hex, - normal_c_fg = specs.StatusLine.fg.hex, - insert_a_bg = specs.DiffText.bg.hex, - visual_a_bg = specs.Visual.bg.hex, - replace_a_bg = specs.DiffDelete.bg.hex, - tabline_left_bg = specs.PmenuSel.bg.hex, - tabline_left_fg = specs.Normal.fg.hex, - tabline_right_bg = specs.PmenuSel.bg.hex, - tabline_right_fg = specs.Normal.fg.hex, - tabsel_bg = specs.Normal.bg.hex, - tabsel_fg = specs.Normal.fg.hex, - warning_bg = specs.DiagnosticVirtualTextWarn.bg.hex, - warning_fg = specs.DiagnosticVirtualTextWarn.fg.hex, - error_bg = specs.DiagnosticVirtualTextError.bg.hex, - error_fg = specs.DiagnosticVirtualTextError.fg.hex, + common_fg = specs.Folded.fg, + inactive_bg = specs.StatusLineNC.bg, + inactive_fg = specs.StatusLineNC.fg, + normal_a_bg = specs.PmenuSbar.bg, + normal_b_bg = specs.PmenuSel.bg, + normal_c_bg = specs.StatusLine.bg, + normal_c_fg = specs.StatusLine.fg, + insert_a_bg = specs.DiffText.bg, + visual_a_bg = specs.Visual.bg, + replace_a_bg = specs.DiffDelete.bg, + tabline_left_bg = specs.PmenuSel.bg, + tabline_left_fg = specs.Normal.fg, + tabline_right_bg = specs.PmenuSel.bg, + tabline_right_fg = specs.Normal.fg, + tabsel_bg = specs.Normal.bg, + tabsel_fg = specs.Normal.fg, + warning_bg = specs.DiagnosticVirtualTextWarn.bg, + warning_fg = specs.DiagnosticVirtualTextWarn.fg, + error_bg = specs.DiagnosticVirtualTextError.bg, + error_fg = specs.DiagnosticVirtualTextError.fg, } end diff --git a/lua/zenbones/shipwright/runners/lualine.lua b/lua/zenbones/shipwright/runners/lualine.lua index 9243aa5..faccc26 100644 --- a/lua/zenbones/shipwright/runners/lualine.lua +++ b/lua/zenbones/shipwright/runners/lualine.lua @@ -55,22 +55,22 @@ local function transform(colors) end local text = helpers.apply_template(template, colors) - return helpers.split_newlines(text) + return { text } end local function specs_to_colors(specs) return { - common_fg = specs.Folded.fg.hex, - inactive_bg = specs.StatusLineNC.bg.hex, - inactive_fg = specs.StatusLineNC.fg.hex, - normal_a_bg = specs.PmenuSbar.bg.hex, - normal_b_bg = specs.PmenuSel.bg.hex, - normal_c_bg = specs.StatusLine.bg.hex, - normal_c_fg = specs.StatusLine.fg.hex, - insert_a_bg = specs.DiffText.bg.hex, - command_a_bg = specs.Search.bg.hex, - visual_a_bg = specs.Visual.bg.hex, - replace_a_bg = specs.DiffDelete.bg.hex, + common_fg = specs.Folded.fg, + inactive_bg = specs.StatusLineNC.bg, + inactive_fg = specs.StatusLineNC.fg, + normal_a_bg = specs.PmenuSbar.bg, + normal_b_bg = specs.PmenuSel.bg, + normal_c_bg = specs.StatusLine.bg, + normal_c_fg = specs.StatusLine.fg, + insert_a_bg = specs.DiffText.bg, + command_a_bg = specs.Search.bg, + visual_a_bg = specs.Visual.bg, + replace_a_bg = specs.DiffDelete.bg, } end diff --git a/lua/zenbones/shipwright/transform.lua b/lua/zenbones/shipwright/transform.lua index d51f0e0..1fe7f76 100644 --- a/lua/zenbones/shipwright/transform.lua +++ b/lua/zenbones/shipwright/transform.lua @@ -2,30 +2,30 @@ local M = {} M.colorscheme_to_term_colors = function(colorscheme) local specs, _, term = unpack(colorscheme) - local fg = specs.Normal.fg.hex + local fg = specs.Normal.fg return { fg = fg, - bg = specs.Normal.bg.hex, - cursor_fg = specs.Cursor.fg.hex, - cursor_bg = specs.Cursor.bg.hex, - selection_bg = specs.Visual.bg.hex, + bg = specs.Normal.bg, + cursor_fg = specs.Cursor.fg, + cursor_bg = specs.Cursor.bg, + selection_bg = specs.Visual.bg, selection_fg = fg, - black = term[1].hex, - red = term[2].hex, - green = term[3].hex, - yellow = term[4].hex, - blue = term[5].hex, - magenta = term[6].hex, - cyan = term[7].hex, - white = term[8].hex, - bright_black = term[9].hex, - bright_red = term[10].hex, - bright_green = term[11].hex, - bright_yellow = term[12].hex, - bright_blue = term[13].hex, - bright_magenta = term[14].hex, - bright_cyan = term[15].hex, - bright_white = term[16].hex, + black = term[1], + red = term[2], + green = term[3], + yellow = term[4], + blue = term[5], + magenta = term[6], + cyan = term[7], + white = term[8], + bright_black = term[9], + bright_red = term[10], + bright_green = term[11], + bright_yellow = term[12], + bright_blue = term[13], + bright_magenta = term[14], + bright_cyan = term[15], + bright_white = term[16], } end From 4674c87cf8a10e97bd69585af9e6aca19e6e5332 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 11:36:59 +0800 Subject: [PATCH 18/31] use make_env merge --- lua/zenbones/shipwright/init.lua | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index 1296ab4..93f8d86 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -1,18 +1,19 @@ local M = {} local function make_env(colorscheme) - local builder = require "shipwright.builder" - local env = builder.make_env() - local specs = colorscheme.specs - env.name = colorscheme.name - vim.opt.background = colorscheme.background package.loaded[specs] = nil - env.specs = require(specs) - env.p = require(specs .. ".palette")[colorscheme.background] - env.term = require("zenbones.term").colors_map(env.p) - env.transform = require "zenbones.shipwright.transform" + + local builder = require "shipwright.builder" + local p = require(specs .. ".palette")[colorscheme.background] + local env = builder.make_env { + name = colorscheme.name, + specs = require(specs), + p = p, + term = require("zenbones.term").colors_map(p), + transform = require "zenbones.shipwright.transform", + } return env end @@ -55,7 +56,7 @@ local function make_runners(config) end M.run = function() - local runner_files = { "alacritty", "kitty", "wezterm", "lualine", "lightline" } + local runner_files = { "vim", "alacritty", "kitty", "wezterm", "tmux", "lualine", "lightline" } local colorschemes = { { name = "zenbones" }, { name = "neobones" }, From 29340b7e226df255ee0689c7043ef2cb6271c5e4 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 11:37:47 +0800 Subject: [PATCH 19/31] add tmux runner --- lua/zenbones/shipwright/runners/lualine.lua | 4 +-- lua/zenbones/shipwright/runners/tmux.lua | 31 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 lua/zenbones/shipwright/runners/tmux.lua diff --git a/lua/zenbones/shipwright/runners/lualine.lua b/lua/zenbones/shipwright/runners/lualine.lua index faccc26..ac31455 100644 --- a/lua/zenbones/shipwright/runners/lualine.lua +++ b/lua/zenbones/shipwright/runners/lualine.lua @@ -49,7 +49,7 @@ local check_keys = { "replace_a_bg", } -local function transform(colors) +local function to_lualine(colors) for _, key in ipairs(check_keys) do assert(colors[key], "lualine colors table missing key: " .. key) end @@ -77,7 +77,7 @@ end run( specs, specs_to_colors, - transform, + to_lualine, { prepend, "-- This file is auto-generated by shipwright.nvim" }, { overwrite, string.format("lua/lualine/themes/%s.lua", name) } ) diff --git a/lua/zenbones/shipwright/runners/tmux.lua b/lua/zenbones/shipwright/runners/tmux.lua new file mode 100644 index 0000000..82e2f1d --- /dev/null +++ b/lua/zenbones/shipwright/runners/tmux.lua @@ -0,0 +1,31 @@ +local template = [[set -g status-left ' #[fg=$magenta,bold]#{s/root//:client_key_table} ' +set -g status-right '#[fg=$magenta,bold] [#S]#[fg=$magenta,bold] [%d/%m] #[fg=$magenta,bold][%I:%M%p] ' +set -g status-style fg='$magenta',bg='$white' + +set -g window-status-current-style fg='$magenta',bg='$white',bold + +set -g pane-border-style fg='$magenta' +set -g pane-active-border-style fg='$magenta' + +set -g message-style fg='$black',bg='$selection_bg' + +set -g display-panes-active-colour '$magenta' +set -g display-panes-colour '$magenta' + +set -g clock-mode-colour '$magenta' + +set -g mode-style fg='$black',bg='$selection_bg' +]] + +local helpers = require "shipwright.transform.helpers" + +run( + { specs, p, term }, + transform.colorscheme_to_term_colors, + function(colors) + local text = helpers.apply_template(template, colors) + return { text } + end, + { prepend, "# This file is auto-generated by shipwright.nvim" }, + { overwrite, string.format("extras/tmux/%s.tmux", name) } +) From 3b02baf92673a4448dc258d2dff58d0c3e9cd040 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 11:37:55 +0800 Subject: [PATCH 20/31] add vim runner --- lua/zenbones/shipwright/runners/vim.lua | 57 +++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 lua/zenbones/shipwright/runners/vim.lua diff --git a/lua/zenbones/shipwright/runners/vim.lua b/lua/zenbones/shipwright/runners/vim.lua new file mode 100644 index 0000000..f2b788a --- /dev/null +++ b/lua/zenbones/shipwright/runners/vim.lua @@ -0,0 +1,57 @@ +local template = [[function! $name#load() + +$termcolors +$vimcolors +highlight! link StatusLineTerm StatusLine +highlight! link StatusLineTermNC StatusLineNC + +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 + +endfunction +]] + +local helpers = require "shipwright.transform.helpers" + +local function to_vim_autoload(vimcolors) + local termcolors = "" + for i, v in ipairs(term) do + termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex) + end + + local text = helpers.apply_template(template, { + name = name, + termcolors = termcolors, + vimcolors = table.concat(vimcolors, "\n"), + }) + return { text } +end + +local lushwright = require "shipwright.transform.lush" + +run( + specs, + lushwright.to_vimscript, + lushwright.vim_compatible_vimscript, + to_vim_autoload, + { prepend, [[" This file is auto-generated by shipwright.nvim]] }, + { overwrite, string.format("autoload/%s.vim", name) } +) From ab274926e040b48d371d10a89500b1b8d77b5986 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 11:44:23 +0800 Subject: [PATCH 21/31] add iterm runner --- lua/zenbones/shipwright/init.lua | 2 +- lua/zenbones/shipwright/runners/iterm.lua | 95 +++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 lua/zenbones/shipwright/runners/iterm.lua diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index 93f8d86..ce798af 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -56,7 +56,7 @@ local function make_runners(config) end M.run = function() - local runner_files = { "vim", "alacritty", "kitty", "wezterm", "tmux", "lualine", "lightline" } + local runner_files = { "vim", "iterm", "alacritty", "kitty", "wezterm", "tmux", "lualine", "lightline" } local colorschemes = { { name = "zenbones" }, { name = "neobones" }, diff --git a/lua/zenbones/shipwright/runners/iterm.lua b/lua/zenbones/shipwright/runners/iterm.lua new file mode 100644 index 0000000..99bd9d8 --- /dev/null +++ b/lua/zenbones/shipwright/runners/iterm.lua @@ -0,0 +1,95 @@ +local util = require "zenbones.util" + +local key_template = [[ + ${k} Color +]] +local color_template = [[ + + Alpha Component + 1 + Blue Component + ${b} + Color Space + sRGB + Green Component + ${g} + Red Component + ${r} + ]] + +local start_template = [[ + + + +]] +local end_template = [[ + + +]] + +local function hex_to_rgb(hex) + local _, r, g, b = hex:match "(.)(..)(..)(..)" + r, g, b = + string.format("%0.16f", (tonumber(r, 16) / 255)), + string.format("%0.16f", (tonumber(g, 16) / 255)), + string.format("%0.16f", (tonumber(b, 16) / 255)) + return { r = r, g = g, b = b } +end + +local function key_to_xml(key, color) + local xml = util.interp(key_template, { k = key }) + local rgb = hex_to_rgb(color.hex) + xml = xml .. util.interp(color_template, rgb) + return xml +end + +local function to_iterm(colorscheme) + local specs, term = unpack(colorscheme) + local colors = { + ["Ansi 0"] = term[1], + ["Ansi 1"] = term[2], + ["Ansi 2"] = term[3], + ["Ansi 3"] = term[4], + ["Ansi 4"] = term[5], + ["Ansi 5"] = term[6], + ["Ansi 6"] = term[7], + ["Ansi 7"] = term[8], + ["Ansi 8"] = term[9], + ["Ansi 9"] = term[10], + ["Ansi 10"] = term[11], + ["Ansi 11"] = term[12], + ["Ansi 12"] = term[13], + ["Ansi 13"] = term[14], + ["Ansi 14"] = term[15], + ["Ansi 15"] = term[16], + Foreground = specs.Normal.fg, + Background = specs.Normal.bg, + Bold = term[9], + Cursor = specs.Cursor.bg, + ["Cursor Text"] = specs.Cursor.fg, + ["Cursor Guide"] = specs.CursorLine.bg, + Link = term[13], + Selection = specs.Visual.bg, + ["Selected Text"] = specs.Normal.fg, + Badge = specs.Comment.fg, + Tab = specs.Normal.bg, + } + + local template = start_template + + local xml_compiled = {} + for k, c in pairs(colors) do + table.insert(xml_compiled, key_to_xml(k, c)) + end + + template = template .. table.concat(vim.fn.sort(xml_compiled), "\n") + template = template .. end_template + + return { template } +end + +run( + { specs, term }, + to_iterm, + { overwrite, string.format("extras/iterm/%s.itermcolors", name) } +) From 8185f46dcd79bf75a7ed8c35706c53c49d39f9a3 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 11:49:28 +0800 Subject: [PATCH 22/31] remove old build system --- lua/zenbones/build.lua | 261 ---------------------------- lua/zenbones/template/alacritty.lua | 42 ----- lua/zenbones/template/iterm.lua | 89 ---------- lua/zenbones/template/kitty.lua | 65 ------- lua/zenbones/template/lightline.lua | 53 ------ lua/zenbones/template/lualine.lua | 55 ------ lua/zenbones/template/tmux.lua | 31 ---- lua/zenbones/template/vim.lua | 58 ------- lua/zenbones/template/wezterm.lua | 34 ---- 9 files changed, 688 deletions(-) delete mode 100644 lua/zenbones/build.lua delete mode 100644 lua/zenbones/template/alacritty.lua delete mode 100644 lua/zenbones/template/iterm.lua delete mode 100644 lua/zenbones/template/kitty.lua delete mode 100644 lua/zenbones/template/lightline.lua delete mode 100644 lua/zenbones/template/lualine.lua delete mode 100644 lua/zenbones/template/tmux.lua delete mode 100644 lua/zenbones/template/vim.lua delete mode 100644 lua/zenbones/template/wezterm.lua diff --git a/lua/zenbones/build.lua b/lua/zenbones/build.lua deleted file mode 100644 index a4919b3..0000000 --- a/lua/zenbones/build.lua +++ /dev/null @@ -1,261 +0,0 @@ -local util = require "zenbones.util" - -local function write_template(path, template, values) - print("[write template] " .. path) - local content = util.interp(template, values) - local file = io.open(path, "w") - file:write(content) - file:close() -end - -local function build(name, specs, palette, opt) - local exclude = opt.exclude or {} - local template_opt = opt.template_opt or {} - local template_keys = { "vim", "iterm", "kitty", "alacritty", "wezterm", "lualine", "lightline", "tmux" } - for _, key in ipairs(template_keys) do - if not vim.tbl_contains(exclude, key) then - local template = require("zenbones.template." .. key) - write_template(unpack(template(name, specs, palette, template_opt[key] or {}))) - end - end -end - -local config_set = { - { - name = "zenbones_light", - specs = "zenbones", - palette = require("zenbones.palette").light, - setup = function() - vim.opt.background = "light" - end, - }, - - { - name = "zenbones_dark", - specs = "zenbones", - palette = require("zenbones.palette").dark, - setup = function() - vim.opt.background = "dark" - end, - }, - - { - name = "zenbones_bright", - specs = "zenbones", - palette = require("zenbones.palette").light, - setup = function() - vim.g.zenbones_lightness = "bright" - end, - cleanup = function() - vim.api.nvim_del_var "zenbones_lightness" - end, - opt = { - exclude = { "vim", "lightline", "lualine" }, - }, - }, - - { - name = "zenbones_dim", - specs = "zenbones", - palette = require("zenbones.palette").light, - setup = function() - vim.g.zenbones_lightness = "dim" - end, - cleanup = function() - vim.api.nvim_del_var "zenbones_lightness" - end, - opt = { - exclude = { "vim", "lightline", "lualine" }, - }, - }, - - -- { - -- name = "zenflesh_stark", - -- specs = "zenflesh", - -- palette = require "zenflesh.palette", - -- setup = function() - -- vim.g.zenflesh_darkness = "stark" - -- end, - -- cleanup = function() - -- vim.api.nvim_del_var "zenflesh_darkness" - -- end, - -- opt = { - -- exclude = { "vim", "lightline", "lualine" }, - -- }, - -- }, - -- - -- { - -- name = "zenflesh_warm", - -- specs = "zenflesh", - -- palette = require "zenflesh.palette", - -- setup = function() - -- vim.g.zenflesh_darkness = "warm" - -- end, - -- cleanup = function() - -- vim.api.nvim_del_var "zenflesh_darkness" - -- end, - -- opt = { - -- exclude = { "vim", "lightline", "lualine" }, - -- }, - -- }, - - { - name = "neobones_light", - specs = "neobones", - palette = require("neobones.palette").light, - setup = function() - vim.opt.background = "light" - end, - opt = { - exclude = { "vim" }, - }, - }, - - { - name = "neobones_dark", - specs = "neobones", - palette = require("neobones.palette").dark, - setup = function() - vim.opt.background = "dark" - end, - opt = { - exclude = { "vim" }, - }, - }, - - { - name = "zenwritten_light", - specs = "zenwritten", - palette = require("zenwritten.palette").light, - setup = function() - vim.opt.background = "light" - end, - opt = { - exclude = { "vim" }, - }, - }, - - { - name = "zenwritten_dark", - specs = "zenwritten", - palette = require("zenwritten.palette").dark, - setup = function() - vim.opt.background = "dark" - end, - opt = { - exclude = { "vim" }, - }, - }, - - { - name = "rosebones_light", - specs = "rosebones", - palette = require("rosebones.palette").light, - setup = function() - vim.opt.background = "light" - end, - opt = { - exclude = { "vim", "alacritty", "iterm", "kitty", "tmux", "wezterm" }, - }, - }, - - { - name = "rosebones_dark", - specs = "rosebones", - palette = require("rosebones.palette").dark, - setup = function() - vim.opt.background = "dark" - end, - opt = { - exclude = { "vim", "alacritty", "iterm", "kitty", "tmux", "wezterm" }, - }, - }, - - { - name = "forestbones_light", - specs = "forestbones", - palette = require("forestbones.palette").light, - setup = function() - vim.opt.background = "light" - end, - opt = { - exclude = { "vim", "alacritty", "iterm", "kitty", "tmux", "wezterm" }, - }, - }, - - { - name = "forestbones_dark", - specs = "forestbones", - palette = require("forestbones.palette").dark, - setup = function() - vim.opt.background = "dark" - end, - opt = { - exclude = { "vim", "alacritty", "iterm", "kitty", "tmux", "wezterm" }, - }, - }, - - { - name = "tokyobones_light", - specs = "tokyobones", - palette = require("tokyobones.palette").light, - setup = function() - vim.opt.background = "light" - end, - opt = { - exclude = { "vim", "alacritty", "iterm", "kitty", "tmux", "wezterm" }, - }, - }, - - { - name = "tokyobones_dark", - specs = "tokyobones", - palette = require("tokyobones.palette").dark, - setup = function() - vim.opt.background = "dark" - end, - opt = { - exclude = { "vim", "alacritty", "iterm", "kitty", "tmux", "wezterm" }, - }, - }, - - { - name = "nordbones", - palette = require("nordbones.palette").dark, - opt = { - exclude = { "alacritty", "iterm", "kitty", "tmux", "wezterm" }, - }, - }, - - { - name = "vimbones", - palette = require "vimbones.palette", - opt = { - template_opt = { - vim = { bg = "light" }, - }, - }, - }, -} - -local function build_from(config) - if config.setup then - config.setup() - end - local specs = config.specs or config.name - package.loaded[specs] = nil - build(config.name, require(specs), config.palette, config.opt or {}) - if config.cleanup then - config.cleanup() - end -end - -local M = {} - -function M.run() - for _i, config in ipairs(config_set) do - build_from(config) - end -end - -return M diff --git a/lua/zenbones/template/alacritty.lua b/lua/zenbones/template/alacritty.lua deleted file mode 100644 index 9de39bc..0000000 --- a/lua/zenbones/template/alacritty.lua +++ /dev/null @@ -1,42 +0,0 @@ -local template = [[# This file is auto-generated from lua/zenbones/template/alacritty.lua -# ${name} alacritty colors -colors: - # Default colors - primary: - background: '${bg}' - foreground: '${fg}' - # Normal colors - normal: - black: '${color0}' - red: '${color1}' - green: '${color2}' - yellow: '${color3}' - blue: '${color4}' - magenta: '${color5}' - cyan: '${color6}' - white: '${color7}' - # Bright colors - bright: - black: '${color8}' - red: '${color9}' - green: '${color10}' - yellow: '${color11}' - blue: '${color12}' - magenta: '${color13}' - cyan: '${color14}' - white: '${color15}' -]] - -return function(name, specs, p) - local term = require("zenbones.term").colors_map(p) - local values = { - name = name, - bg = specs.Normal.bg.hex, - fg = specs.Normal.fg.hex, - } - for i, v in ipairs(term) do - values["color" .. (i - 1)] = v.hex - end - - return { string.format("extras/alacritty/%s.yml", name), template, values } -end diff --git a/lua/zenbones/template/iterm.lua b/lua/zenbones/template/iterm.lua deleted file mode 100644 index 853fa98..0000000 --- a/lua/zenbones/template/iterm.lua +++ /dev/null @@ -1,89 +0,0 @@ -local util = require "zenbones.util" - -local key_template = [[ - ${k} Color -]] -local color_template = [[ - - Alpha Component - 1 - Blue Component - ${b} - Color Space - sRGB - Green Component - ${g} - Red Component - ${r} - ]] - -local start_template = [[ - - - -]] -local end_template = [[ - - -]] - -local function hex_to_rgb(hex) - local _, r, g, b = hex:match "(.)(..)(..)(..)" - r, g, b = - string.format("%0.16f", (tonumber(r, 16) / 255)), - string.format("%0.16f", (tonumber(g, 16) / 255)), - string.format("%0.16f", (tonumber(b, 16) / 255)) - return { r = r, g = g, b = b } -end - -local function key_to_xml(key, color) - local xml = util.interp(key_template, { k = key }) - local rgb = hex_to_rgb(color.hex) - xml = xml .. util.interp(color_template, rgb) - return xml -end - -return function(name, specs, p) - local term = require("zenbones.term").colors_map(p) - local colors = { - ["Ansi 0"] = term[1], - ["Ansi 1"] = term[2], - ["Ansi 2"] = term[3], - ["Ansi 3"] = term[4], - ["Ansi 4"] = term[5], - ["Ansi 5"] = term[6], - ["Ansi 6"] = term[7], - ["Ansi 7"] = term[8], - ["Ansi 8"] = term[9], - ["Ansi 9"] = term[10], - ["Ansi 10"] = term[11], - ["Ansi 11"] = term[12], - ["Ansi 12"] = term[13], - ["Ansi 13"] = term[14], - ["Ansi 14"] = term[15], - ["Ansi 15"] = term[16], - Foreground = specs.Normal.fg, - Background = specs.Normal.bg, - Bold = term[9], - Cursor = specs.Cursor.bg, - ["Cursor Text"] = specs.Cursor.fg, - ["Cursor Guide"] = specs.CursorLine.bg, - Link = term[13], - Selection = specs.Visual.bg, - ["Selected Text"] = specs.Normal.fg, - Badge = specs.Comment.fg, - Tab = specs.Normal.bg, - } - - local template = start_template - - local xml_compiled = {} - for k, c in pairs(colors) do - table.insert(xml_compiled, key_to_xml(k, c)) - end - - template = template .. table.concat(vim.fn.sort(xml_compiled), "\n") - template = template .. end_template - - return { string.format("extras/iterm/%s.itermcolors", name), template, {} } -end diff --git a/lua/zenbones/template/kitty.lua b/lua/zenbones/template/kitty.lua deleted file mode 100644 index a55cd50..0000000 --- a/lua/zenbones/template/kitty.lua +++ /dev/null @@ -1,65 +0,0 @@ -local template = [[# This file is auto-generated from lua/zenbones/template/kitty.lua -# vim:ft=kitty -## name: ${name} -## license: MIT -## author: Michael Chris Lopez -## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/${name}.conf - -background ${background} -foreground ${foreground} -selection_background ${selection_background} -selection_foreground ${selection_foreground} -url_color ${url_color} -cursor ${cursor} - -# Tabs -active_tab_background ${active_tab_background} -active_tab_foreground ${active_tab_foreground} -inactive_tab_background ${inactive_tab_background} -inactive_tab_foreground ${inactive_tab_foreground} -#tab_bar_background ${tab_bar_background} - -# normal -color0 ${color0} -color1 ${color1} -color2 ${color2} -color3 ${color3} -color4 ${color4} -color5 ${color5} -color6 ${color6} -color7 ${color7} - -# bright -color8 ${color8} -color9 ${color9} -color10 ${color10} -color11 ${color11} -color12 ${color12} -color13 ${color13} -color14 ${color14} -color15 ${color15} -]] - -return function(name, specs, p) - local term = require("zenbones.term").colors_map(p) - local bg = specs.Normal.bg.hex - local fg = specs.Normal.fg.hex - local values = { - name = name, - background = bg, - foreground = fg, - selection_background = specs.Visual.bg.hex, - selection_foreground = fg, - url_color = term[13].hex, - cursor = fg, - active_tab_background = specs.Search.bg.hex, - active_tab_foreground = fg, - inactive_tab_background = specs.StatusLine.bg.hex, - inactive_tab_foreground = fg, - } - for i, v in ipairs(term) do - values["color" .. (i - 1)] = v.hex - end - - return { string.format("extras/kitty/%s.conf", name), template, values } -end diff --git a/lua/zenbones/template/lightline.lua b/lua/zenbones/template/lightline.lua deleted file mode 100644 index a0e81d2..0000000 --- a/lua/zenbones/template/lightline.lua +++ /dev/null @@ -1,53 +0,0 @@ -local template = [[" This file is auto-generated from lua/zenbones/template/lightline.lua -let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} - -let s:p.normal.left = [ [ "${common_fg}", "${normal_a_bg}", "bold" ], [ "${common_fg}", "${normal_b_bg}" ] ] -let s:p.normal.middle = [ [ "${normal_c_fg}", "${normal_c_bg}" ] ] -let s:p.normal.right = [ [ "${common_fg}", "${normal_b_bg}" ], [ "${common_fg}", "${normal_b_bg}" ] ] -let s:p.normal.warning = [ [ "${warning_fg}", "${warning_bg}" ] ] -let s:p.normal.error = [ [ "${error_fg}", "${error_bg}" ] ] - -let s:p.inactive.left = [ [ "${inactive_fg}", "${inactive_bg}" ], [ "${inactive_fg}", "${inactive_bg}" ] ] -let s:p.inactive.middle = [ [ "${inactive_fg}", "${inactive_bg}" ] ] -let s:p.inactive.right = [ [ "${inactive_fg}", "${inactive_bg}" ] ] - -let s:p.insert.left = [ [ "${common_fg}", "${insert_a_bg}", "bold" ], [ "${common_fg}", "${normal_b_bg}" ] ] -let s:p.replace.left = [ [ "${common_fg}", "${replace_a_bg}", "bold" ], [ "${common_fg}", "${normal_b_bg}" ] ] -let s:p.visual.left = [ [ "${common_fg}", "${visual_a_bg}", "bold" ], [ "${common_fg}", "${normal_b_bg}" ] ] - -let s:p.tabline.left = [ [ "${tabline_left_fg}", "${tabline_left_bg}", "italic" ] ] -let s:p.tabline.middle = [ [ "${inactive_fg}", "${inactive_bg}" ] ] -let s:p.tabline.right = [ [ "${tabline_right_fg}", "${tabline_right_bg}" ] ] -let s:p.tabline.tabsel = [ [ "${tabsel_fg}", "${tabsel_bg}", "bold" ] ] - -let g:lightline#colorscheme#zenbones#palette = lightline#colorscheme#fill(s:p) -]] - -return function(name, specs) - return { - string.format("autoload/lightline/colorscheme/%s.vim", name), - template, - { - common_fg = specs.Folded.fg.hex, - inactive_bg = specs.StatusLineNC.bg.hex, - inactive_fg = specs.StatusLineNC.fg.hex, - normal_a_bg = specs.PmenuSbar.bg.hex, - normal_b_bg = specs.PmenuSel.bg.hex, - normal_c_bg = specs.StatusLine.bg.hex, - normal_c_fg = specs.StatusLine.fg.hex, - insert_a_bg = specs.DiffText.bg.hex, - visual_a_bg = specs.Visual.bg.hex, - replace_a_bg = specs.DiffDelete.bg.hex, - tabline_left_bg = specs.PmenuSel.bg.hex, - tabline_left_fg = specs.Normal.fg.hex, - tabline_right_bg = specs.PmenuSel.bg.hex, - tabline_right_fg = specs.Normal.fg.hex, - tabsel_bg = specs.Normal.bg.hex, - tabsel_fg = specs.Normal.fg.hex, - warning_bg = specs.DiagnosticVirtualTextWarn.bg.hex, - warning_fg = specs.DiagnosticVirtualTextWarn.fg.hex, - error_bg = specs.DiagnosticVirtualTextError.bg.hex, - error_fg = specs.DiagnosticVirtualTextError.fg.hex, - }, - } -end diff --git a/lua/zenbones/template/lualine.lua b/lua/zenbones/template/lualine.lua deleted file mode 100644 index ba45f17..0000000 --- a/lua/zenbones/template/lualine.lua +++ /dev/null @@ -1,55 +0,0 @@ -local template = [[-- This file is auto-generated from lua/zenbones/template/lualine.lua -local common_fg = "${common_fg}" -local inactive_bg = "${inactive_bg}" -local inactive_fg = "${inactive_fg}" - -return { - normal = { - a = { bg = "${normal_a_bg}", fg = common_fg, gui = "bold" }, - b = { bg = "${normal_b_bg}", fg = common_fg }, - c = { bg = "${normal_c_bg}", fg = "${normal_c_fg}" }, - }, - - insert = { - a = { bg = "${insert_a_bg}", fg = common_fg, gui = "bold" }, - }, - - command = { - a = { bg = "${command_a_bg}", fg = common_fg, gui = "bold" }, - }, - - visual = { - a = { bg = "${visual_a_bg}", fg = common_fg, gui = "bold" }, - }, - - replace = { - a = { bg = "${replace_a_bg}", 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 }, - }, -} -]] - -return function(name, specs) - return { - string.format("lua/lualine/themes/%s.lua", name), - template, - { - common_fg = specs.Folded.fg.hex, - inactive_bg = specs.StatusLineNC.bg.hex, - inactive_fg = specs.StatusLineNC.fg.hex, - normal_a_bg = specs.PmenuSbar.bg.hex, - normal_b_bg = specs.PmenuSel.bg.hex, - normal_c_bg = specs.StatusLine.bg.hex, - normal_c_fg = specs.StatusLine.fg.hex, - insert_a_bg = specs.DiffText.bg.hex, - command_a_bg = specs.Search.bg.hex, - visual_a_bg = specs.Visual.bg.hex, - replace_a_bg = specs.DiffDelete.bg.hex, - }, - } -end diff --git a/lua/zenbones/template/tmux.lua b/lua/zenbones/template/tmux.lua deleted file mode 100644 index 114cebe..0000000 --- a/lua/zenbones/template/tmux.lua +++ /dev/null @@ -1,31 +0,0 @@ -local template = [[# This file is auto-generated from lua/zenbones/template/tmux.lua -set -g status-left ' #[fg=${color5},bold]#{s/root//:client_key_table} ' -set -g status-right '#[fg=${color5},bold] [#S]#[fg=${color5},bold] [%d/%m] #[fg=${color5},bold][%I:%M%p] ' -set -g status-style fg='${color5}',bg='${color7}' - -set -g window-status-current-style fg='${color5}',bg='${color7}',bold - -set -g pane-border-style fg='${color5}' -set -g pane-active-border-style fg='${color5}' - -set -g message-style fg='${color0}',bg='${selection_background}' - -set -g display-panes-active-colour '${color5}' -set -g display-panes-colour '${color5}' - -set -g clock-mode-colour '${color5}' - -set -g mode-style fg='${color0}',bg='${selection_background}' -]] - -return function(name, specs, p) - local term = require("zenbones.term").colors_map(p) - local values = { - selection_background = specs.Visual.bg.hex, - } - for i, v in ipairs(term) do - values["color" .. (i - 1)] = v.hex - end - - return { string.format("extras/tmux/%s.tmux", name), template, values } -end diff --git a/lua/zenbones/template/vim.lua b/lua/zenbones/template/vim.lua deleted file mode 100644 index 6d2a99e..0000000 --- a/lua/zenbones/template/vim.lua +++ /dev/null @@ -1,58 +0,0 @@ -local template = [[" This file is auto-generated from lua/zenbones/template/vim.lua -function! ${name}#load() - -${termcolors} -${vimcolors} -highlight! link StatusLineTerm StatusLine -highlight! link StatusLineTermNC StatusLineNC - -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 - -endfunction -]] - -return function(name, specs, p) - local lush = require "lush" - local term = require("zenbones.term").colors_map(p) - local termcolors = "" - for i, v in ipairs(term) 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 compiled = lush.compile(specs, { - exclude_keys = { "blend" }, - copy_cterm_from_gui = true, - }) - local vimcolors = table.concat(vim.fn.sort(compiled), "\n") - - return { - string.format("autoload/%s.vim", name), - template, - { - name = name, - specs_path = name, - termcolors = termcolors, - vimcolors = vimcolors, - }, - } -end diff --git a/lua/zenbones/template/wezterm.lua b/lua/zenbones/template/wezterm.lua deleted file mode 100644 index 98ba12a..0000000 --- a/lua/zenbones/template/wezterm.lua +++ /dev/null @@ -1,34 +0,0 @@ -local template = [[# This file is auto-generated from lua/zenbones/template/wezterm.lua -# ${name} -[colors] -foreground = "${fg}" -background = "${bg}" -cursor_bg = "${cursor_bg}" -cursor_border = "${cursor_border}" -cursor_fg = "${cursor_fg}" -selection_bg = "${selection_bg}" -selection_fg = "${selection_fg}" - -ansi = ["${color0}", "${color1}", "${color2}", "${color3}", "${color4}", "${color5}", "${color6}", "${color7}"] -brights = ["${color8}", "${color9}", "${color10}", "${color11}", "${color12}", "${color13}", "${color14}", "${color15}"] -]] - -return function(name, specs, p) - local term = require("zenbones.term").colors_map(p) - - local values = { - name = name:sub(1, 1):upper() .. name:sub(2), - fg = specs.Normal.fg.hex, - bg = specs.Normal.bg.hex, - cursor_bg = specs.Cursor.bg.hex, - cursor_border = specs.Cursor.fg.hex, - cursor_fg = specs.Cursor.fg.hex, - selection_bg = specs.Visual.bg.hex, - selection_fg = specs.Normal.fg.hex, - } - for i, v in ipairs(term) do - values["color" .. (i - 1)] = v.hex - end - - return { string.format("extras/wezterm/%s.toml", values.name), template, values } -end From 0473b25a059efab51e93ab1935ab0cbc7952771c Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 12:04:23 +0800 Subject: [PATCH 23/31] fix lint errors --- lua/zenbones/shipwright/runners/alacritty.lua | 2 ++ lua/zenbones/shipwright/runners/iterm.lua | 2 ++ lua/zenbones/shipwright/runners/kitty.lua | 8 +++++--- lua/zenbones/shipwright/runners/lightline.lua | 7 +++++-- lua/zenbones/shipwright/runners/lualine.lua | 2 ++ lua/zenbones/shipwright/runners/tmux.lua | 2 ++ lua/zenbones/shipwright/runners/vim.lua | 8 +++++++- lua/zenbones/shipwright/runners/wezterm.lua | 4 +++- 8 files changed, 28 insertions(+), 7 deletions(-) diff --git a/lua/zenbones/shipwright/runners/alacritty.lua b/lua/zenbones/shipwright/runners/alacritty.lua index 1a8d0ee..c8f818b 100644 --- a/lua/zenbones/shipwright/runners/alacritty.lua +++ b/lua/zenbones/shipwright/runners/alacritty.lua @@ -1,3 +1,4 @@ +-- selene: allow(undefined_variable) run( { specs, p, term }, transform.colorscheme_to_term_colors, @@ -5,3 +6,4 @@ run( { prepend, "# This file is auto-generated by shipwright.nvim", }, { overwrite, string.format("extras/alacritty/%s.yml", name) } ) +-- selene: deny(undefined_variable) diff --git a/lua/zenbones/shipwright/runners/iterm.lua b/lua/zenbones/shipwright/runners/iterm.lua index 99bd9d8..38a3be5 100644 --- a/lua/zenbones/shipwright/runners/iterm.lua +++ b/lua/zenbones/shipwright/runners/iterm.lua @@ -88,8 +88,10 @@ local function to_iterm(colorscheme) return { template } end +-- selene: allow(undefined_variable) run( { specs, term }, to_iterm, { overwrite, string.format("extras/iterm/%s.itermcolors", name) } ) +-- selene: deny(undefined_variable) diff --git a/lua/zenbones/shipwright/runners/kitty.lua b/lua/zenbones/shipwright/runners/kitty.lua index 25090a0..02c3baa 100644 --- a/lua/zenbones/shipwright/runners/kitty.lua +++ b/lua/zenbones/shipwright/runners/kitty.lua @@ -1,3 +1,4 @@ +-- selene: allow(undefined_variable) run( { specs, p, term }, transform.colorscheme_to_term_colors, @@ -7,10 +8,10 @@ run( author = "Michael Chris Lopez", license = "MIT", upstream = string.format("https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/%s.conf", name), - url_color = term[13].hex, - tab_active_bg = specs.Search.bg.hex, + url_color = term[13], + tab_active_bg = specs.Search.bg, tab_active_fg = colors.fg, - tab_inactive_bg = specs.StatusLine.bg.hex, + tab_inactive_bg = specs.StatusLine.bg, tab_inactive_fg = colors.fg, }) end, @@ -18,3 +19,4 @@ run( { prepend, "# This file is auto-generated by shipwright.nvim" }, { overwrite, string.format("extras/kitty/%s.conf", name) } ) +-- selene: deny(undefined_variable) diff --git a/lua/zenbones/shipwright/runners/lightline.lua b/lua/zenbones/shipwright/runners/lightline.lua index 3cfe535..deacfc5 100644 --- a/lua/zenbones/shipwright/runners/lightline.lua +++ b/lua/zenbones/shipwright/runners/lightline.lua @@ -57,7 +57,8 @@ local function transform(colors) return { text } end -local function specs_to_colors(specs) +local function specs_to_colors(colorscheme) + local specs, name = unpack(colorscheme) return { name = name, common_fg = specs.Folded.fg, @@ -83,10 +84,12 @@ local function specs_to_colors(specs) } end +-- selene: allow(undefined_variable) run( - specs, + { specs, name }, specs_to_colors, transform, { prepend, [[" This file is auto-generated by shipwright.nvim]] }, { overwrite, string.format("autoload/lightline/colorscheme/%s.vim", name) } ) +-- selene: deny(undefined_variable) diff --git a/lua/zenbones/shipwright/runners/lualine.lua b/lua/zenbones/shipwright/runners/lualine.lua index ac31455..21419ed 100644 --- a/lua/zenbones/shipwright/runners/lualine.lua +++ b/lua/zenbones/shipwright/runners/lualine.lua @@ -74,6 +74,7 @@ local function specs_to_colors(specs) } end +-- selene: allow(undefined_variable) run( specs, specs_to_colors, @@ -81,3 +82,4 @@ run( { prepend, "-- This file is auto-generated by shipwright.nvim" }, { overwrite, string.format("lua/lualine/themes/%s.lua", name) } ) +-- selene: deny(undefined_variable) diff --git a/lua/zenbones/shipwright/runners/tmux.lua b/lua/zenbones/shipwright/runners/tmux.lua index 82e2f1d..46f7f8b 100644 --- a/lua/zenbones/shipwright/runners/tmux.lua +++ b/lua/zenbones/shipwright/runners/tmux.lua @@ -19,6 +19,7 @@ set -g mode-style fg='$black',bg='$selection_bg' local helpers = require "shipwright.transform.helpers" +-- selene: allow(undefined_variable) run( { specs, p, term }, transform.colorscheme_to_term_colors, @@ -29,3 +30,4 @@ run( { prepend, "# This file is auto-generated by shipwright.nvim" }, { overwrite, string.format("extras/tmux/%s.tmux", name) } ) +-- selene: deny(undefined_variable) diff --git a/lua/zenbones/shipwright/runners/vim.lua b/lua/zenbones/shipwright/runners/vim.lua index f2b788a..d68e514 100644 --- a/lua/zenbones/shipwright/runners/vim.lua +++ b/lua/zenbones/shipwright/runners/vim.lua @@ -31,7 +31,8 @@ endfunction local helpers = require "shipwright.transform.helpers" -local function to_vim_autoload(vimcolors) +local function to_vim_autoload(colorscheme) + local vimcolors, term, name = unpack(colorscheme) local termcolors = "" for i, v in ipairs(term) do termcolors = termcolors .. string.format("let g:terminal_color_%s = '%s'\n", (i - 1), v.hex) @@ -47,11 +48,16 @@ end local lushwright = require "shipwright.transform.lush" +-- selene: allow(undefined_variable) run( specs, lushwright.to_vimscript, lushwright.vim_compatible_vimscript, + function(vimcolors) + return { vimcolors, term, name } + end, to_vim_autoload, { prepend, [[" This file is auto-generated by shipwright.nvim]] }, { overwrite, string.format("autoload/%s.vim", name) } ) +-- selene: deny(undefined_variable) diff --git a/lua/zenbones/shipwright/runners/wezterm.lua b/lua/zenbones/shipwright/runners/wezterm.lua index e12411c..3cde03c 100644 --- a/lua/zenbones/shipwright/runners/wezterm.lua +++ b/lua/zenbones/shipwright/runners/wezterm.lua @@ -1,12 +1,14 @@ +-- selene: allow(undefined_variable) run( { specs, p, term }, transform.colorscheme_to_term_colors, function(colors) return vim.tbl_extend("keep", colors, { - cursor_border = specs.Cursor.fg.hex, + cursor_border = specs.Cursor.fg, }) end, contrib.wezterm, { prepend, "# This file is auto-generated by shipwright.nvim" }, { overwrite, string.format("extras/wezterm/%s.toml", name:sub(1, 1):upper() .. name:sub(2)) } ) +-- selene: deny(undefined_variable) From 036ade08d444b2c1b521142e74d206e8d9dd9ecd Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 12:11:18 +0800 Subject: [PATCH 24/31] cleanup trailing line --- lua/zenbones/shipwright/runners/lightline.lua | 3 +-- lua/zenbones/shipwright/runners/lualine.lua | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lua/zenbones/shipwright/runners/lightline.lua b/lua/zenbones/shipwright/runners/lightline.lua index deacfc5..d223ab8 100644 --- a/lua/zenbones/shipwright/runners/lightline.lua +++ b/lua/zenbones/shipwright/runners/lightline.lua @@ -19,8 +19,7 @@ let s:p.tabline.middle = [ [ "$inactive_fg", "$inactive_bg" ] ] let s:p.tabline.right = [ [ "$tabline_right_fg", "$tabline_right_bg" ] ] let s:p.tabline.tabsel = [ [ "$tabsel_fg", "$tabsel_bg", "bold" ] ] -let g:lightline#colorscheme#$name#palette = lightline#colorscheme#fill(s:p) -]] +let g:lightline#colorscheme#$name#palette = lightline#colorscheme#fill(s:p)]] local helpers = require "shipwright.transform.helpers" diff --git a/lua/zenbones/shipwright/runners/lualine.lua b/lua/zenbones/shipwright/runners/lualine.lua index 21419ed..d1b76b8 100644 --- a/lua/zenbones/shipwright/runners/lualine.lua +++ b/lua/zenbones/shipwright/runners/lualine.lua @@ -30,8 +30,7 @@ return { b = { bg = inactive_bg, fg = inactive_fg }, c = { bg = inactive_bg, fg = inactive_fg }, }, -} -]] +}]] local helpers = require "shipwright.transform.helpers" From 897a0559a6d8e10573daa9326cff87c0eb010d5c Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 12:13:13 +0800 Subject: [PATCH 25/31] exclude mechanism --- lua/zenbones/shipwright/init.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lua/zenbones/shipwright/init.lua b/lua/zenbones/shipwright/init.lua index ce798af..6b8f651 100644 --- a/lua/zenbones/shipwright/init.lua +++ b/lua/zenbones/shipwright/init.lua @@ -61,18 +61,20 @@ M.run = function() { name = "zenbones" }, { name = "neobones" }, { name = "vimbones", background = "light" }, - { name = "forestbones" }, - { name = "nordbones", background = "dark" }, - { name = "rosebones" }, - { name = "tokyobones" }, + { name = "forestbones", exclude = { "iterm", "alacritty", "kitty", "wezterm", "tmux" } }, + { name = "nordbones", background = "dark", exclude = { "iterm", "alacritty", "kitty", "wezterm", "tmux" } }, + { name = "rosebones", exclude = { "iterm", "alacritty", "kitty", "wezterm", "tmux" } }, + { name = "tokyobones", exclude = { "iterm", "alacritty", "kitty", "wezterm", "tmux" } }, { name = "zenburned", background = "dark" }, { name = "zenwritten" }, } for _, colorscheme in ipairs(colorschemes) do for _, file in ipairs(runner_files) do - colorscheme.file = file - for _, runner in ipairs(make_runners(colorscheme)) do - assert(pcall(runner)) + if not vim.tbl_contains(colorscheme.exclude or {}, file) then + colorscheme.file = file + for _, runner in ipairs(make_runners(colorscheme)) do + assert(pcall(runner)) + end end end end From 981c2bc0b23efba63f1cadd7377ca62965eb2690 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 13:05:03 +0800 Subject: [PATCH 26/31] create setup_colorscheme in vimscript --- autoload/zenbones/util.vim | 17 +++++++++++++++++ colors/zenbones.vim | 12 +----------- 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 autoload/zenbones/util.vim diff --git a/autoload/zenbones/util.vim b/autoload/zenbones/util.vim new file mode 100644 index 0000000..0845ed6 --- /dev/null +++ b/autoload/zenbones/util.vim @@ -0,0 +1,17 @@ +function! zenbones#util#setup_colorscheme(...) abort + if exists('g:colors_name') + highlight clear + endif + + let g:colors_name = a:1 + let l:bg = a:0 == 2 ? a:2 : v:null + if l:bg + set background=l:bg + endif + + if has('nvim') && (!exists('g:' . g:colors_name . '_compat') || g:{g:colors_name}_compat == 0) + lua require("zenbones.util").apply_colorscheme() + else + call {g:colors_name . l:bg ? '_' . l:bg : ''}#load() + endif +endfunction diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 4b4adbc..9a779b5 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -1,11 +1 @@ -if exists('g:colors_name') - highlight clear -endif - -let g:colors_name = 'zenbones' - -if has('nvim') && (!exists('g:' . g:colors_name . '_compat') || g:{g:colors_name}_compat == 0) - lua require("zenbones.util").apply_colorscheme() -else - call {g:colors_name . '_' . &background}#load() -endif +call zenbones#util#setup_colorscheme('zenbones') From c623e9ff93ef0a45919d945c6afd46c509190347 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 13:06:54 +0800 Subject: [PATCH 27/31] replace util interpolation with shipwright --- lua/zenbones/shipwright/runners/iterm.lua | 16 ++++++++-------- lua/zenbones/util.lua | 7 ------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/lua/zenbones/shipwright/runners/iterm.lua b/lua/zenbones/shipwright/runners/iterm.lua index 38a3be5..ed7023c 100644 --- a/lua/zenbones/shipwright/runners/iterm.lua +++ b/lua/zenbones/shipwright/runners/iterm.lua @@ -1,20 +1,18 @@ -local util = require "zenbones.util" - local key_template = [[ - ${k} Color + $k Color ]] local color_template = [[ Alpha Component 1 Blue Component - ${b} + $b Color Space sRGB Green Component - ${g} + $g Red Component - ${r} + $r ]] local start_template = [[ @@ -27,6 +25,8 @@ local end_template = [[ ]] +local helpers = require "shipwright.transform.helpers" + local function hex_to_rgb(hex) local _, r, g, b = hex:match "(.)(..)(..)(..)" r, g, b = @@ -37,9 +37,9 @@ local function hex_to_rgb(hex) end local function key_to_xml(key, color) - local xml = util.interp(key_template, { k = key }) + local xml = helpers.apply_template(key_template, { k = key }) local rgb = hex_to_rgb(color.hex) - xml = xml .. util.interp(color_template, rgb) + xml = xml .. helpers.apply_template(color_template, rgb) return xml end diff --git a/lua/zenbones/util.lua b/lua/zenbones/util.lua index b14e301..7225fcc 100644 --- a/lua/zenbones/util.lua +++ b/lua/zenbones/util.lua @@ -1,12 +1,5 @@ local M = {} --- got from http://lua-users.org/wiki/StringInterpolation -function M.interp(s, tab) - return (s:gsub("($%b{})", function(w) - return tab[w:sub(3, -2)] or w - end)) -end - function M.apply_colorscheme() local colors_name = vim.api.nvim_get_var "colors_name" package.loaded[colors_name] = nil From 58b05fdeb61fbf78393e7e6f3838279e22ff51a1 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 13:19:03 +0800 Subject: [PATCH 28/31] fix single bg loading --- autoload/zenbones/util.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/zenbones/util.vim b/autoload/zenbones/util.vim index 0845ed6..7c436e5 100644 --- a/autoload/zenbones/util.vim +++ b/autoload/zenbones/util.vim @@ -5,13 +5,13 @@ function! zenbones#util#setup_colorscheme(...) abort let g:colors_name = a:1 let l:bg = a:0 == 2 ? a:2 : v:null - if l:bg - set background=l:bg + if l:bg != v:null + let &background = l:bg endif if has('nvim') && (!exists('g:' . g:colors_name . '_compat') || g:{g:colors_name}_compat == 0) lua require("zenbones.util").apply_colorscheme() else - call {g:colors_name . l:bg ? '_' . l:bg : ''}#load() + call {g:colors_name . (l:bg ? '_' . l:bg : '')}#load() endif endfunction From 05f191d8134bc16c86b3c74a253c6e699ca94053 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 13:23:33 +0800 Subject: [PATCH 29/31] apply new setup to all colorschemes --- colors/duckbones.lua | 12 -- colors/duckbones.vim | 1 + colors/forestbones.lua | 11 -- colors/forestbones.vim | 1 + colors/neobones.lua | 11 -- colors/neobones.vim | 1 + colors/nordbones.vim | 265 +---------------------------------------- colors/rosebones.lua | 11 -- colors/rosebones.vim | 1 + colors/tokyobones.lua | 11 -- colors/tokyobones.vim | 1 + colors/vimbones.vim | 264 +--------------------------------------- colors/zenburned.lua | 12 -- colors/zenburned.vim | 1 + colors/zenwritten.lua | 11 -- colors/zenwritten.vim | 1 + 16 files changed, 9 insertions(+), 606 deletions(-) delete mode 100644 colors/duckbones.lua create mode 100644 colors/duckbones.vim delete mode 100644 colors/forestbones.lua create mode 100644 colors/forestbones.vim delete mode 100644 colors/neobones.lua create mode 100644 colors/neobones.vim delete mode 100644 colors/rosebones.lua create mode 100644 colors/rosebones.vim delete mode 100644 colors/tokyobones.lua create mode 100644 colors/tokyobones.vim delete mode 100644 colors/zenburned.lua create mode 100644 colors/zenburned.vim delete mode 100644 colors/zenwritten.lua create mode 100644 colors/zenwritten.vim diff --git a/colors/duckbones.lua b/colors/duckbones.lua deleted file mode 100644 index 04b938b..0000000 --- a/colors/duckbones.lua +++ /dev/null @@ -1,12 +0,0 @@ -if vim.g.colors_name then - vim.api.nvim_command "highlight clear" -end - -vim.g.colors_name = "duckbones" -vim.opt.background = "dark" - -package.loaded["duckbones"] = nil -require "lush"(require "duckbones", { force_clean = false }) - -local p = require("duckbones.palette").dark -require("zenbones.term").apply_colors(p) diff --git a/colors/duckbones.vim b/colors/duckbones.vim new file mode 100644 index 0000000..a8baa1e --- /dev/null +++ b/colors/duckbones.vim @@ -0,0 +1 @@ +call zenbones#util#setup_colorscheme('duckbones', 'dark') diff --git a/colors/forestbones.lua b/colors/forestbones.lua deleted file mode 100644 index 376296c..0000000 --- a/colors/forestbones.lua +++ /dev/null @@ -1,11 +0,0 @@ -if vim.g.colors_name then - vim.api.nvim_command "highlight clear" -end - -vim.g.colors_name = "forestbones" - -package.loaded["forestbones"] = nil -require "lush"(require "forestbones", { force_clean = false }) - -local p = require("forestbones.palette")[vim.opt.background:get()] -require("zenbones.term").apply_colors(p) diff --git a/colors/forestbones.vim b/colors/forestbones.vim new file mode 100644 index 0000000..112f339 --- /dev/null +++ b/colors/forestbones.vim @@ -0,0 +1 @@ +call zenbones#util#setup_colorscheme('forestbones') diff --git a/colors/neobones.lua b/colors/neobones.lua deleted file mode 100644 index 86b62d9..0000000 --- a/colors/neobones.lua +++ /dev/null @@ -1,11 +0,0 @@ -if vim.g.colors_name then - vim.api.nvim_command "highlight clear" -end - -vim.g.colors_name = "neobones" - -package.loaded["neobones"] = nil -require "lush"(require "neobones", { force_clean = false }) - -local p = require("neobones.palette")[vim.opt.background:get()] -require("zenbones.term").apply_colors(p) diff --git a/colors/neobones.vim b/colors/neobones.vim new file mode 100644 index 0000000..829c031 --- /dev/null +++ b/colors/neobones.vim @@ -0,0 +1 @@ +call zenbones#util#setup_colorscheme('neobones') diff --git a/colors/nordbones.vim b/colors/nordbones.vim index cc3bcfb..1e0e17d 100644 --- a/colors/nordbones.vim +++ b/colors/nordbones.vim @@ -1,264 +1 @@ -" This file is auto-generated from lua/zenbones/template/vim.lua -if exists('g:colors_name') - highlight clear -endif - -set background=dark -let g:colors_name = 'nordbones' - -let g:terminal_color_0 = '#2F3541' -let g:terminal_color_1 = '#C1616A' -let g:terminal_color_2 = '#A4BE8D' -let g:terminal_color_3 = '#CF866F' -let g:terminal_color_4 = '#8FBCBA' -let g:terminal_color_5 = '#B38DAC' -let g:terminal_color_6 = '#87BFCE' -let g:terminal_color_7 = '#EBEEF3' -let g:terminal_color_8 = '#475063' -let g:terminal_color_9 = '#D6787F' -let g:terminal_color_10 = '#A8CC86' -let g:terminal_color_11 = '#E09680' -let g:terminal_color_12 = '#89CAC8' -let g:terminal_color_13 = '#CF97C5' -let g:terminal_color_14 = '#82CCE0' -let g:terminal_color_15 = '#A5B4CD' - -if has('nvim') && (!exists('g:zenbones_compat') || g:zenbones_compat == 0) - lua package.loaded["nordbones"] = nil - lua require "lush"(require "nordbones", { force_clean = false }) - finish -else -highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight BufferVisible guifg=#F2F4F7 guibg=NONE guisp=NONE gui=NONE -highlight BufferVisibleIndex guifg=#F2F4F7 guibg=NONE guisp=NONE gui=NONE -highlight BufferVisibleSign guifg=#F2F4F7 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbr guifg=#BFCADB guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbrDeprecated guifg=#7285A0 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbrMatch guifg=#EBEEF3 guibg=NONE guisp=NONE gui=bold -highlight CmpItemAbbrMatchFuzzy guifg=#CDD5E2 guibg=NONE guisp=NONE gui=bold -highlight CmpItemKind guifg=#9EAFC9 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemMenu guifg=#8DA2C0 guibg=NONE guisp=NONE gui=NONE -highlight CocMarkdownLink guifg=#87BFCE guibg=NONE guisp=NONE gui=underline -highlight ColorColumn guifg=NONE guibg=#825243 guisp=NONE gui=NONE -highlight Comment guifg=#737C90 guibg=NONE guisp=NONE gui=italic -highlight Conceal guifg=#8DA2C0 guibg=NONE guisp=NONE gui=bold,italic -highlight Constant guifg=#9EAFC9 guibg=NONE guisp=NONE gui=italic -highlight Cursor guifg=#2F3541 guibg=#EEF1F5 guisp=NONE gui=NONE -highlight CursorLine guifg=NONE guibg=#353C49 guisp=NONE gui=NONE -highlight CursorLineNr guifg=#EBEEF3 guibg=NONE guisp=NONE gui=bold -highlight Delimiter guifg=#818EAB guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticHint guifg=#B38DAC guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticInfo guifg=#8FBCBA guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignError guifg=#C1616A guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignHint guifg=#B38DAC guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignInfo guifg=#8FBCBA guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignWarn guifg=#CF866F guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticUnderlineError guifg=#C1616A guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineHint guifg=#B38DAC guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineInfo guifg=#8FBCBA guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineWarn guifg=#CF866F guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticVirtualTextError guifg=#C1616A guibg=#453536 guisp=NONE gui=NONE -highlight DiagnosticVirtualTextWarn guifg=#CF866F guibg=#403735 guisp=NONE gui=NONE -highlight DiffAdd guifg=NONE guibg=#3D4B2F guisp=NONE gui=NONE -highlight DiffChange guifg=NONE guibg=#324B4B guisp=NONE gui=NONE -highlight DiffDelete guifg=NONE guibg=#663A3E guisp=NONE gui=NONE -highlight DiffText guifg=#EBEEF3 guibg=#476968 guisp=NONE gui=NONE -highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight Error guifg=#C1616A guibg=NONE guisp=NONE gui=NONE -highlight FloatBorder guifg=#7E8CA8 guibg=NONE guisp=NONE gui=NONE -highlight FoldColumn guifg=#69758C guibg=NONE guisp=NONE gui=bold -highlight Folded guifg=#A8B1C5 guibg=#485061 guisp=NONE gui=NONE -highlight Function guifg=#87BFCE guibg=NONE guisp=NONE gui=NONE -highlight GitSignsAdd guifg=#A4BE8D guibg=NONE guisp=NONE gui=NONE -highlight GitSignsChange guifg=#8FBCBA guibg=NONE guisp=NONE gui=NONE -highlight GitSignsDelete guifg=#C1616A guibg=NONE guisp=NONE gui=NONE -highlight HopNextKey2 guifg=#8FBCBA guibg=NONE guisp=NONE gui=NONE -highlight Identifer guifg=#EBEEF3 guibg=NONE guisp=NONE gui=NONE -highlight Identifier guifg=#BFCADB guibg=NONE guisp=NONE gui=NONE -highlight IncSearch guifg=#2F3541 guibg=#D1BACD guisp=NONE gui=bold -highlight IndentBlanklineChar guifg=#474E5B guibg=NONE guisp=NONE gui=NONE -highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic -highlight LightspeedGreyWash guifg=#737C90 guibg=NONE guisp=NONE gui=NONE -highlight LightspeedLabel guifg=#B38DAC guibg=NONE guisp=NONE gui=bold,underline -highlight LightspeedLabelDistant guifg=#87BFCE guibg=NONE guisp=NONE gui=bold,underline -highlight LightspeedLabelDistantOverlapped guifg=#87BFCE guibg=NONE guisp=NONE gui=underline -highlight LightspeedLabelOverlapped guifg=#B38DAC guibg=NONE guisp=NONE gui=underline -highlight LightspeedOneCharMatch guifg=#2F3541 guibg=#B38DAC guisp=NONE gui=bold -highlight LightspeedPendingChangeOpArea guifg=#B38DAC guibg=NONE guisp=NONE gui=NONE -highlight LightspeedShortcut guifg=#2F3541 guibg=#B38DAC guisp=NONE gui=bold,underline -highlight LineNr guifg=#69758C guibg=NONE guisp=NONE gui=NONE -highlight MoreMsg guifg=#A4BE8D guibg=NONE guisp=NONE gui=bold -highlight NeogitHunkHeaderHighlight guifg=#EBEEF3 guibg=#353C49 guisp=NONE gui=bold -highlight NnnNormal guifg=#EBEEF3 guibg=#333946 guisp=NONE gui=NONE -highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE -highlight NonText guifg=#606B81 guibg=NONE guisp=NONE gui=NONE -highlight Normal guifg=#EBEEF3 guibg=#2F3541 guisp=NONE gui=NONE -highlight NormalFloat guifg=NONE guibg=#3B4251 guisp=NONE gui=NONE -highlight Number guifg=#8FBCBA guibg=NONE guisp=NONE gui=italic -highlight NvimTreeCursorLine guifg=NONE guibg=#414959 guisp=NONE gui=NONE -highlight NvimTreeNormal guifg=#EBEEF3 guibg=#333946 guisp=NONE gui=NONE -highlight NvimTreeRootFolder guifg=#8FBCBA guibg=NONE guisp=NONE gui=bold -highlight NvimTreeSpecialFile guifg=#B38DAC guibg=NONE guisp=NONE gui=underline -highlight NvimTreeSymlink guifg=#8FBCBA guibg=NONE guisp=NONE gui=NONE -highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE -highlight Pmenu guifg=NONE guibg=#414959 guisp=NONE gui=NONE -highlight PmenuSbar guifg=NONE guibg=#727F98 guisp=NONE gui=NONE -highlight PmenuSel guifg=NONE guibg=#576175 guisp=NONE gui=NONE -highlight PmenuThumb guifg=NONE guibg=#8694B0 guisp=NONE gui=NONE -highlight Search guifg=#EBEEF3 guibg=#84637E guisp=NONE gui=NONE -highlight SneakLabelMask guifg=#B38DAC guibg=#B38DAC guisp=NONE gui=NONE -highlight Special guifg=#ABBAD0 guibg=NONE guisp=NONE gui=bold -highlight SpecialComment guifg=#737C90 guibg=NONE guisp=NONE gui=bold -highlight SpecialKey guifg=#606B81 guibg=NONE guisp=NONE gui=italic -highlight SpellBad guifg=#B16B70 guibg=NONE guisp=NONE gui=undercurl -highlight SpellCap guifg=#B16B70 guibg=NONE guisp=NONE gui=undercurl -highlight SpellRare guifg=#B16B70 guibg=NONE guisp=NONE gui=undercurl -highlight Statement guifg=#81A1C1 guibg=NONE guisp=NONE gui=NONE -highlight StatusLine guifg=#EBEEF3 guibg=#485061 guisp=NONE gui=NONE -highlight StatusLineNC guifg=#F2F4F7 guibg=#414959 guisp=NONE gui=NONE -highlight TSConstant guifg=#BFCADB guibg=NONE guisp=NONE gui=bold -highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight TelescopeBorder guifg=#7E8CA8 guibg=NONE guisp=NONE gui=NONE -highlight TelescopeMatching guifg=#B38DAC guibg=NONE guisp=NONE gui=bold -highlight TelescopeSelectionCaret guifg=#C1616A guibg=#353C49 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=#5E81AB guibg=NONE guisp=NONE gui=NONE -highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline -highlight VertSplit guifg=#69758C guibg=NONE guisp=NONE gui=NONE -highlight Visual guifg=NONE guibg=#545F70 guisp=NONE gui=NONE -highlight WarningMsg guifg=#CF866F guibg=NONE guisp=NONE gui=NONE -highlight WildMenu guifg=#2F3541 guibg=#B38DAC guisp=NONE gui=NONE -highlight diffAdded guifg=#A4BE8D guibg=NONE guisp=NONE gui=NONE -highlight diffChanged guifg=#8FBCBA guibg=NONE guisp=NONE gui=NONE -highlight diffFile guifg=#CF866F guibg=NONE guisp=NONE gui=bold -highlight diffIndexLine guifg=#CF866F guibg=NONE guisp=NONE gui=NONE -highlight diffLine guifg=#B38DAC guibg=NONE guisp=NONE gui=bold -highlight diffNewFile guifg=#A4BE8D guibg=NONE guisp=NONE gui=italic -highlight diffOldFile guifg=#C1616A guibg=NONE guisp=NONE gui=italic -highlight diffRemoved guifg=#C1616A guibg=NONE guisp=NONE gui=NONE -highlight lCursor guifg=#2F3541 guibg=#8297B6 guisp=NONE gui=NONE -highlight markdownH1 guifg=#EBEEF3 guibg=NONE guisp=NONE gui=bold,underline -highlight! link Boolean Number -highlight! link BufferCurrent TabLineSel -highlight! link CocCodeLens LineNr -highlight! link CocErrorHighlight DiagnosticUnderlineError -highlight! link CocErrorSign DiagnosticSignError -highlight! link CocErrorVirtualText DiagnosticVirtualTextError -highlight! link CocHintHighlight DiagnosticUnderlineHint -highlight! link CocHintSign DiagnosticSignHint -highlight! link CocInfoHighlight DiagnosticUnderlineInfo -highlight! link CocInfoSign DiagnosticSignInfo -highlight! link CocSelectedText SpellBad -highlight! link CocWarningHighlight DiagnosticUnderlineWarn -highlight! link CocWarningSign DiagnosticSignWarn -highlight! link CocWarningVitualText DiagnosticVirtualTextWarn -highlight! link CursorColumn CursorLine -highlight! link DiagnosticError Error -highlight! link DiagnosticWarn WarningMsg -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 DiagnosticError -highlight! link LspDiagnosticsDefaultHint DiagnosticHint -highlight! link LspDiagnosticsDefaultInformation DiagnosticInfo -highlight! link LspDiagnosticsDefaultWarning DiagnosticWarn -highlight! link LspDiagnosticsSignError DiagnosticSignError -highlight! link LspDiagnosticsSignHint DiagnosticSignHint -highlight! link LspDiagnosticsSignInformation DiagnosticSignInfo -highlight! link LspDiagnosticsSignWarning DiagnosticSignWarn -highlight! link LspDiagnosticsUnderlineError DiagnosticUnderlineError -highlight! link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint -highlight! link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo -highlight! link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn -highlight! link LspDiagnosticsVirtualTextError DiagnosticVirtualTextError -highlight! link LspDiagnosticsVirtualTextWarning DiagnosticVirtualTextWarn -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 DiagnosticError -highlight! link NeogitNotificationInfo DiagnosticInfo -highlight! link NeogitNotificationWarning DiagnosticWarn -highlight! link NnnNormalNC NnnNormal -highlight! link NvimTreeCursorColumn NvimTreeCursorLine -highlight! link NvimTreeGitDeleted diffRemoved -highlight! link NvimTreeGitDirty diffChanged -highlight! link NvimTreeGitNew diffAdded -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 TSConstBuiltin Number -highlight! link TSConstMacro Number -highlight! link TSDanger Error -highlight! link TSNamespace Special -highlight! link TSNote DiagnosticInfo -highlight! link TSTag Special -highlight! link TSVariable Identifier -highlight! link TSVariableBuiltin Number -highlight! link TSWarning WarningMsg -highlight! link TabLine StatusLine -highlight! link TabLineFill StatusLineNC -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 WhichKey Statement -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 -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 -highlight! link StatusLineTerm StatusLine -highlight! link StatusLineTermNC StatusLineNC -endif - -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 +call zenbones#util#setup_colorscheme('nordbones', 'dark') diff --git a/colors/rosebones.lua b/colors/rosebones.lua deleted file mode 100644 index ba5f300..0000000 --- a/colors/rosebones.lua +++ /dev/null @@ -1,11 +0,0 @@ -if vim.g.colors_name then - vim.api.nvim_command "highlight clear" -end - -vim.g.colors_name = "rosebones" - -package.loaded["rosebones"] = nil -require "lush"(require "rosebones", { force_clean = false }) - -local p = require("rosebones.palette")[vim.opt.background:get()] -require("zenbones.term").apply_colors(p) diff --git a/colors/rosebones.vim b/colors/rosebones.vim new file mode 100644 index 0000000..652683a --- /dev/null +++ b/colors/rosebones.vim @@ -0,0 +1 @@ +call zenbones#util#setup_colorscheme('rosebones') diff --git a/colors/tokyobones.lua b/colors/tokyobones.lua deleted file mode 100644 index 23c3c6f..0000000 --- a/colors/tokyobones.lua +++ /dev/null @@ -1,11 +0,0 @@ -if vim.g.colors_name then - vim.api.nvim_command "highlight clear" -end - -vim.g.colors_name = "tokyobones" - -package.loaded["tokyobones"] = nil -require "lush"(require "tokyobones", { force_clean = false }) - -local p = require("tokyobones.palette")[vim.opt.background:get()] -require("zenbones.term").apply_colors(p) diff --git a/colors/tokyobones.vim b/colors/tokyobones.vim new file mode 100644 index 0000000..1f5f068 --- /dev/null +++ b/colors/tokyobones.vim @@ -0,0 +1 @@ +call zenbones#util#setup_colorscheme('tokyobones') diff --git a/colors/vimbones.vim b/colors/vimbones.vim index 75f40dd..0f60482 100644 --- a/colors/vimbones.vim +++ b/colors/vimbones.vim @@ -1,263 +1 @@ -" This file is auto-generated from lua/zenbones/template/vim.lua -if exists('g:colors_name') - highlight clear -endif - -set background=light -let g:colors_name = 'vimbones' - -let g:terminal_color_0 = '#F0F0CA' -let g:terminal_color_1 = '#A8334C' -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 = '#353535' -let g:terminal_color_8 = '#C6C6A3' -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 = '#5C5C5C' - -if has('nvim') && (!exists('g:zenbones_compat') || g:zenbones_compat == 0) - lua package.loaded["vimbones"] = nil - lua require "lush"(require "vimbones", { force_clean = false }) - finish -else -highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight BufferVisible guifg=#686868 guibg=NONE guisp=NONE gui=NONE -highlight BufferVisibleIndex guifg=#686868 guibg=NONE guisp=NONE gui=NONE -highlight BufferVisibleSign guifg=#686868 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbr guifg=#505050 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbrDeprecated guifg=#848484 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemAbbrMatch guifg=#353535 guibg=NONE guisp=NONE gui=bold -highlight CmpItemAbbrMatchFuzzy guifg=#494949 guibg=NONE guisp=NONE gui=bold -highlight CmpItemKind guifg=#636363 guibg=NONE guisp=NONE gui=NONE -highlight CmpItemMenu guifg=#6D6D6D guibg=NONE guisp=NONE gui=NONE -highlight CocMarkdownLink guifg=#3B8992 guibg=NONE guisp=NONE gui=underline -highlight ColorColumn guifg=NONE guibg=#E6C5BD guisp=NONE gui=NONE -highlight Comment guifg=#8C8C7C guibg=NONE guisp=NONE gui=italic -highlight Conceal guifg=#5C5C5C guibg=NONE guisp=NONE gui=bold,italic -highlight Constant guifg=#636363 guibg=NONE guisp=NONE gui=italic -highlight Cursor guifg=#F0F0CA guibg=#353535 guisp=NONE gui=NONE -highlight CursorLine guifg=NONE guibg=#E7E8C3 guisp=NONE gui=NONE -highlight CursorLineNr guifg=#353535 guibg=NONE guisp=NONE gui=bold -highlight Delimiter guifg=#85856F guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignError guifg=#A8334C guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticSignWarn guifg=#944927 guibg=NONE guisp=NONE gui=NONE -highlight DiagnosticUnderlineError guifg=#A8334C guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineHint guifg=#88507D guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineInfo guifg=#286486 guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticUnderlineWarn guifg=#944927 guibg=NONE guisp=NONE gui=undercurl -highlight DiagnosticVirtualTextError guifg=#A8334C guibg=#F2DEE0 guisp=NONE gui=NONE -highlight DiagnosticVirtualTextWarn guifg=#944927 guibg=#F2DEDA guisp=NONE gui=NONE -highlight DiffAdd guifg=NONE guibg=#CBE5B8 guisp=NONE gui=NONE -highlight DiffChange guifg=NONE guibg=#D4DEE7 guisp=NONE gui=NONE -highlight DiffDelete guifg=NONE guibg=#EBD8DA guisp=NONE gui=NONE -highlight DiffText guifg=#353535 guibg=#A9BED1 guisp=NONE gui=NONE -highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight Error guifg=#A8334C guibg=NONE guisp=NONE gui=NONE -highlight FloatBorder guifg=#71715E guibg=NONE guisp=NONE gui=NONE -highlight FoldColumn guifg=#9A9A81 guibg=NONE guisp=NONE gui=bold -highlight Folded guifg=#515143 guibg=#C6C6A6 guisp=NONE gui=NONE -highlight Function guifg=#353535 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 -highlight Identifier guifg=#505050 guibg=NONE guisp=NONE gui=NONE -highlight IncSearch guifg=#F0F0CA guibg=#C074B2 guisp=NONE gui=bold -highlight IndentBlanklineChar guifg=#D0D0B6 guibg=NONE guisp=NONE gui=NONE -highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic -highlight LightspeedGreyWash guifg=#8C8C7C guibg=NONE guisp=NONE gui=NONE -highlight LightspeedLabel guifg=#88507D guibg=NONE guisp=NONE gui=bold,underline -highlight LightspeedLabelDistant guifg=#3B8992 guibg=NONE guisp=NONE gui=bold,underline -highlight LightspeedLabelDistantOverlapped guifg=#3B8992 guibg=NONE guisp=NONE gui=underline -highlight LightspeedLabelOverlapped guifg=#88507D guibg=NONE guisp=NONE gui=underline -highlight LightspeedOneCharMatch guifg=#F0F0CA guibg=#88507D guisp=NONE gui=bold -highlight LightspeedPendingChangeOpArea guifg=#88507D guibg=NONE guisp=NONE gui=NONE -highlight LightspeedShortcut guifg=#F0F0CA guibg=#88507D guisp=NONE gui=bold,underline -highlight LineNr guifg=#9A9A81 guibg=NONE guisp=NONE gui=NONE -highlight MoreMsg guifg=#4F6C31 guibg=NONE guisp=NONE gui=bold -highlight NeogitHunkHeaderHighlight guifg=#353535 guibg=#E7E8C3 guisp=NONE gui=bold -highlight NnnNormal guifg=#353535 guibg=#E7E8C3 guisp=NONE gui=NONE -highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE -highlight NonText guifg=#B0B093 guibg=NONE guisp=NONE gui=NONE -highlight Normal guifg=#353535 guibg=#F0F0CA guisp=NONE gui=NONE -highlight NormalFloat guifg=NONE guibg=#DFDFBC guisp=NONE gui=NONE -highlight Number guifg=#2A6535 guibg=NONE guisp=NONE gui=italic -highlight NvimTreeCursorLine guifg=NONE guibg=#D6D6B5 guisp=NONE gui=NONE -highlight NvimTreeNormal guifg=#353535 guibg=#E7E8C3 guisp=NONE gui=NONE -highlight NvimTreeRootFolder guifg=#286486 guibg=NONE guisp=NONE gui=bold -highlight NvimTreeSpecialFile guifg=#88507D guibg=NONE guisp=NONE gui=underline -highlight NvimTreeSymlink guifg=#286486 guibg=NONE guisp=NONE gui=NONE -highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE -highlight Pmenu guifg=NONE guibg=#D6D6B5 guisp=NONE gui=NONE -highlight PmenuSbar guifg=NONE guibg=#A7A78D guisp=NONE gui=NONE -highlight PmenuSel guifg=NONE guibg=#BABB9D guisp=NONE gui=NONE -highlight PmenuThumb guifg=NONE guibg=#F9F9D2 guisp=NONE gui=NONE -highlight PreProc guifg=#35663D guibg=NONE guisp=NONE gui=NONE -highlight Search guifg=#353535 guibg=#DEB9D6 guisp=NONE gui=NONE -highlight SneakLabelMask guifg=#88507D guibg=#88507D guisp=NONE gui=NONE -highlight Special guifg=#5C5C5C guibg=NONE guisp=NONE gui=bold -highlight SpecialComment guifg=#8C8C7C guibg=NONE guisp=NONE gui=bold -highlight SpecialKey guifg=#B0B093 guibg=NONE guisp=NONE gui=italic -highlight SpellBad guifg=#974352 guibg=NONE guisp=NONE gui=undercurl -highlight SpellCap guifg=#974352 guibg=NONE guisp=NONE gui=undercurl -highlight SpellRare guifg=#974352 guibg=NONE guisp=NONE gui=undercurl -highlight Statement guifg=#156A29 guibg=NONE guisp=NONE gui=bold -highlight StatusLine guifg=#353535 guibg=#CBCBAB guisp=NONE gui=NONE -highlight StatusLineNC guifg=#686868 guibg=#D6D6B5 guisp=NONE gui=NONE -highlight TSConstant guifg=#505050 guibg=NONE guisp=NONE gui=bold -highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold -highlight TelescopeBorder guifg=#71715E guibg=NONE guisp=NONE gui=NONE -highlight TelescopeMatching guifg=#88507D guibg=NONE guisp=NONE gui=bold -highlight TelescopeSelectionCaret guifg=#A8334C guibg=#E7E8C3 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=#5B5B42 guibg=NONE guisp=NONE gui=NONE -highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline -highlight VertSplit guifg=#9A9A81 guibg=NONE guisp=NONE gui=NONE -highlight Visual guifg=NONE guibg=#D7D7D7 guisp=NONE gui=NONE -highlight WarningMsg guifg=#944927 guibg=NONE guisp=NONE gui=NONE -highlight WildMenu guifg=#F0F0CA guibg=#88507D 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=#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=#F0F0CA guibg=#595959 guisp=NONE gui=NONE -highlight markdownH1 guifg=#353535 guibg=NONE guisp=NONE gui=bold,underline -highlight! link Boolean Number -highlight! link BufferCurrent TabLineSel -highlight! link CocCodeLens LineNr -highlight! link CocErrorHighlight DiagnosticUnderlineError -highlight! link CocErrorSign DiagnosticSignError -highlight! link CocErrorVirtualText DiagnosticVirtualTextError -highlight! link CocHintHighlight DiagnosticUnderlineHint -highlight! link CocHintSign DiagnosticSignHint -highlight! link CocInfoHighlight DiagnosticUnderlineInfo -highlight! link CocInfoSign DiagnosticSignInfo -highlight! link CocSelectedText SpellBad -highlight! link CocWarningHighlight DiagnosticUnderlineWarn -highlight! link CocWarningSign DiagnosticSignWarn -highlight! link CocWarningVitualText DiagnosticVirtualTextWarn -highlight! link CursorColumn CursorLine -highlight! link DiagnosticError Error -highlight! link DiagnosticWarn WarningMsg -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 DiagnosticError -highlight! link LspDiagnosticsDefaultHint DiagnosticHint -highlight! link LspDiagnosticsDefaultInformation DiagnosticInfo -highlight! link LspDiagnosticsDefaultWarning DiagnosticWarn -highlight! link LspDiagnosticsSignError DiagnosticSignError -highlight! link LspDiagnosticsSignHint DiagnosticSignHint -highlight! link LspDiagnosticsSignInformation DiagnosticSignInfo -highlight! link LspDiagnosticsSignWarning DiagnosticSignWarn -highlight! link LspDiagnosticsUnderlineError DiagnosticUnderlineError -highlight! link LspDiagnosticsUnderlineHint DiagnosticUnderlineHint -highlight! link LspDiagnosticsUnderlineInformation DiagnosticUnderlineInfo -highlight! link LspDiagnosticsUnderlineWarning DiagnosticUnderlineWarn -highlight! link LspDiagnosticsVirtualTextError DiagnosticVirtualTextError -highlight! link LspDiagnosticsVirtualTextWarning DiagnosticVirtualTextWarn -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 DiagnosticError -highlight! link NeogitNotificationInfo DiagnosticInfo -highlight! link NeogitNotificationWarning DiagnosticWarn -highlight! link NnnNormalNC NnnNormal -highlight! link NvimTreeCursorColumn NvimTreeCursorLine -highlight! link NvimTreeGitDeleted diffRemoved -highlight! link NvimTreeGitDirty diffChanged -highlight! link NvimTreeGitNew diffAdded -highlight! link Question MoreMsg -highlight! link SignColumn LineNr -highlight! link Sneak Search -highlight! link SneakLabel WildMenu -highlight! link SpellLocal SpellCap -highlight! link TSConstBuiltin Number -highlight! link TSConstMacro Number -highlight! link TSDanger Error -highlight! link TSNamespace Special -highlight! link TSNote DiagnosticInfo -highlight! link TSTag Special -highlight! link TSVariable Identifier -highlight! link TSVariableBuiltin Number -highlight! link TSWarning WarningMsg -highlight! link TabLine StatusLine -highlight! link TabLineFill StatusLineNC -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 WhichKey Statement -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 -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 -highlight! link StatusLineTerm StatusLine -highlight! link StatusLineTermNC StatusLineNC -endif - -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 +call zenbones#util#setup_colorscheme('vimbones', 'light') diff --git a/colors/zenburned.lua b/colors/zenburned.lua deleted file mode 100644 index f24b570..0000000 --- a/colors/zenburned.lua +++ /dev/null @@ -1,12 +0,0 @@ -if vim.g.colors_name then - vim.api.nvim_command "highlight clear" -end - -vim.g.colors_name = "zenburned" -vim.opt.background = "dark" - -package.loaded["zenburned"] = nil -require "lush"(require "zenburned", { force_clean = false }) - -local p = require("zenburned.palette").dark -require("zenbones.term").apply_colors(p) diff --git a/colors/zenburned.vim b/colors/zenburned.vim new file mode 100644 index 0000000..565da54 --- /dev/null +++ b/colors/zenburned.vim @@ -0,0 +1 @@ +call zenbones#util#setup_colorscheme('zenburned', 'dark') diff --git a/colors/zenwritten.lua b/colors/zenwritten.lua deleted file mode 100644 index c670180..0000000 --- a/colors/zenwritten.lua +++ /dev/null @@ -1,11 +0,0 @@ -if vim.g.colors_name then - vim.api.nvim_command "highlight clear" -end - -vim.g.colors_name = "zenwritten" - -package.loaded["zenwritten"] = nil -require "lush"(require "zenwritten", { force_clean = false }) - -local p = require("zenwritten.palette")[vim.opt.background:get()] -require("zenbones.term").apply_colors(p) diff --git a/colors/zenwritten.vim b/colors/zenwritten.vim new file mode 100644 index 0000000..717c3b1 --- /dev/null +++ b/colors/zenwritten.vim @@ -0,0 +1 @@ +call zenbones#util#setup_colorscheme('zenwritten') From a315e231f97235211f57c4f770126c2551a6ac58 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 13:28:10 +0800 Subject: [PATCH 30/31] show zenflesh removed error --- colors/zenflesh.vim | 1 + 1 file changed, 1 insertion(+) create mode 100644 colors/zenflesh.vim diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim new file mode 100644 index 0000000..32e611a --- /dev/null +++ b/colors/zenflesh.vim @@ -0,0 +1 @@ +throw 'zenflesh is removed in favor of zenbones bg=dark' From b8cab8f17dbbeb48be5ffaf87b75a13a5fb7994e Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 14:06:48 +0800 Subject: [PATCH 31/31] reorganize generated vimscript --- autoload/{zenbones/util.vim => zenbones.vim} | 4 +- autoload/zenbones_dark.vim | 240 ------------------- autoload/zenbones_light.vim | 240 ------------------- colors/duckbones.vim | 2 +- colors/forestbones.vim | 2 +- colors/neobones.vim | 2 +- colors/nordbones.vim | 2 +- colors/rosebones.vim | 2 +- colors/tokyobones.vim | 2 +- colors/vimbones.vim | 2 +- colors/zenbones.vim | 2 +- colors/zenburned.vim | 2 +- colors/zenwritten.vim | 2 +- lua/zenbones/shipwright/runners/vim.lua | 9 +- 14 files changed, 15 insertions(+), 498 deletions(-) rename autoload/{zenbones/util.vim => zenbones.vim} (72%) delete mode 100644 autoload/zenbones_dark.vim delete mode 100644 autoload/zenbones_light.vim diff --git a/autoload/zenbones/util.vim b/autoload/zenbones.vim similarity index 72% rename from autoload/zenbones/util.vim rename to autoload/zenbones.vim index 7c436e5..8b77b26 100644 --- a/autoload/zenbones/util.vim +++ b/autoload/zenbones.vim @@ -1,4 +1,4 @@ -function! zenbones#util#setup_colorscheme(...) abort +function! zenbones#setup_colorscheme(...) abort if exists('g:colors_name') highlight clear endif @@ -12,6 +12,6 @@ function! zenbones#util#setup_colorscheme(...) abort if has('nvim') && (!exists('g:' . g:colors_name . '_compat') || g:{g:colors_name}_compat == 0) lua require("zenbones.util").apply_colorscheme() else - call {g:colors_name . (l:bg ? '_' . l:bg : '')}#load() + call zenbones#generated#{g:colors_name . (l:bg == v:null ? '_' . &background : '')}#load() endif endfunction diff --git a/autoload/zenbones_dark.vim b/autoload/zenbones_dark.vim deleted file mode 100644 index 57d73fd..0000000 --- a/autoload/zenbones_dark.vim +++ /dev/null @@ -1,240 +0,0 @@ -" This file is auto-generated from lua/zenbones/template/vim.lua -function! zenbones_dark#load() - -let g:terminal_color_0 = '#1C1917' -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 = '#403833' -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' - -highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold -highlight BufferVisible guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight BufferVisibleIndex guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight BufferVisibleSign guifg=#CAD0D4 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CmpItemAbbr guifg=#979FA4 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CmpItemAbbrDeprecated guifg=#64696D guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CmpItemAbbrMatch guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight CmpItemAbbrMatchFuzzy guifg=#9FA7AD guibg=NONE guisp=NONE gui=bold cterm=bold -highlight CmpItemKind guifg=#868C91 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CmpItemMenu guifg=#797F84 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CocMarkdownLink guifg=#66A5AD guibg=NONE guisp=NONE gui=underline cterm=underline -highlight ColorColumn guifg=NONE guibg=#55392C guisp=NONE gui=NONE cterm=NONE -highlight Comment guifg=#6E6763 guibg=NONE guisp=NONE gui=italic cterm=italic -highlight Conceal guifg=#797F84 guibg=NONE guisp=NONE gui=bold,italic cterm=bold,italic -highlight Constant guifg=#868C91 guibg=NONE guisp=NONE gui=italic cterm=italic -highlight Cursor guifg=#1C1917 guibg=#C4CACF guisp=NONE gui=NONE cterm=NONE -highlight CursorLine guifg=NONE guibg=#25211F guisp=NONE gui=NONE cterm=NONE -highlight CursorLineNr guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight Delimiter guifg=#867A74 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticSignError guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticSignHint guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticSignInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticSignWarn guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticUnderlineError guifg=#DE6E7C guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight DiagnosticUnderlineHint guifg=#B279A7 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight DiagnosticUnderlineInfo guifg=#6099C0 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight DiagnosticUnderlineWarn guifg=#B77E64 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight DiagnosticVirtualTextError guifg=#DE6E7C guibg=#251B1C guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticVirtualTextWarn guifg=#B77E64 guibg=#211D1B guisp=NONE gui=NONE cterm=NONE -highlight DiffAdd guifg=NONE guibg=#232D1A guisp=NONE gui=NONE cterm=NONE -highlight DiffChange guifg=NONE guibg=#1D2C36 guisp=NONE gui=NONE cterm=NONE -highlight DiffDelete guifg=NONE guibg=#3E2225 guisp=NONE gui=NONE cterm=NONE -highlight DiffText guifg=#B4BDC3 guibg=#324757 guisp=NONE gui=NONE cterm=NONE -highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold -highlight Error guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight FloatBorder guifg=#837771 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight FoldColumn guifg=#685F5A guibg=NONE guisp=NONE gui=bold cterm=bold -highlight Folded guifg=#AFA099 guibg=#3E3835 guisp=NONE gui=NONE cterm=NONE -highlight Function guifg=#B4BDC3 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight GitSignsAdd guifg=#819B69 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight GitSignsChange guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight GitSignsDelete guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight HopNextKey2 guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Identifier guifg=#979FA4 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight IncSearch guifg=#1C1917 guibg=#BF8FB5 guisp=NONE gui=bold cterm=bold -highlight IndentBlanklineChar guifg=#383432 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic cterm=italic -highlight LightspeedGreyWash guifg=#6E6763 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight LightspeedLabel guifg=#B279A7 guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline -highlight LightspeedLabelDistant guifg=#66A5AD guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline -highlight LightspeedLabelDistantOverlapped guifg=#66A5AD guibg=NONE guisp=NONE gui=underline cterm=underline -highlight LightspeedLabelOverlapped guifg=#B279A7 guibg=NONE guisp=NONE gui=underline cterm=underline -highlight LightspeedOneCharMatch guifg=#1C1917 guibg=#B279A7 guisp=NONE gui=bold cterm=bold -highlight LightspeedPendingChangeOpArea guifg=#B279A7 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight LightspeedShortcut guifg=#1C1917 guibg=#B279A7 guisp=NONE gui=bold,underline cterm=bold,underline -highlight LineNr guifg=#685F5A guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight MoreMsg guifg=#819B69 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight NeogitHunkHeaderHighlight guifg=#B4BDC3 guibg=#25211F guisp=NONE gui=bold cterm=bold -highlight NnnNormal guifg=#B4BDC3 guibg=#231F1D guisp=NONE gui=NONE cterm=NONE -highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight NonText guifg=#5C534F guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Normal guifg=#B4BDC3 guibg=#1C1917 guisp=NONE gui=NONE cterm=NONE -highlight NormalFloat guifg=NONE guibg=#2C2725 guisp=NONE gui=NONE cterm=NONE -highlight Number guifg=#B4BDC3 guibg=NONE guisp=NONE gui=italic cterm=italic -highlight NvimTreeCursorLine guifg=NONE guibg=#322D2B guisp=NONE gui=NONE cterm=NONE -highlight NvimTreeNormal guifg=#B4BDC3 guibg=#231F1D guisp=NONE gui=NONE cterm=NONE -highlight NvimTreeRootFolder guifg=#6099C0 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight NvimTreeSpecialFile guifg=#B279A7 guibg=NONE guisp=NONE gui=underline cterm=underline -highlight NvimTreeSymlink guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Pmenu guifg=NONE guibg=#352F2D guisp=NONE gui=NONE cterm=NONE -highlight PmenuSbar guifg=NONE guibg=#736863 guisp=NONE gui=NONE cterm=NONE -highlight PmenuSel guifg=NONE guibg=#4F4844 guisp=NONE gui=NONE cterm=NONE -highlight PmenuThumb guifg=NONE guibg=#8E817B guisp=NONE gui=NONE cterm=NONE -highlight Search guifg=#B4BDC3 guibg=#65435E guisp=NONE gui=NONE cterm=NONE -highlight SneakLabelMask guifg=#B279A7 guibg=#B279A7 guisp=NONE gui=NONE cterm=NONE -highlight Special guifg=#8D9499 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight SpecialComment guifg=#6E6763 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight SpecialKey guifg=#5C534F guibg=NONE guisp=NONE gui=italic cterm=italic -highlight SpellBad guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight SpellCap guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight SpellRare guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight Statement guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight StatusLine guifg=#B4BDC3 guibg=#3E3835 guisp=NONE gui=NONE cterm=NONE -highlight StatusLineNC guifg=#CAD0D4 guibg=#322D2B guisp=NONE gui=NONE cterm=NONE -highlight TSConstant guifg=#979FA4 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold -highlight TelescopeBorder guifg=#837771 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight TelescopeMatching guifg=#B279A7 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight TelescopeSelectionCaret guifg=#DE6E7C guibg=#25211F guisp=NONE gui=NONE cterm=NONE -highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold -highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline -highlight Type guifg=#A1938C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline -highlight VertSplit guifg=#685F5A guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Visual guifg=NONE guibg=#3D4042 guisp=NONE gui=NONE cterm=NONE -highlight WarningMsg guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight WildMenu guifg=#1C1917 guibg=#B279A7 guisp=NONE gui=NONE cterm=NONE -highlight diffAdded guifg=#819B69 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight diffChanged guifg=#6099C0 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight diffFile guifg=#B77E64 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight diffIndexLine guifg=#B77E64 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight diffLine guifg=#B279A7 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight diffNewFile guifg=#819B69 guibg=NONE guisp=NONE gui=italic cterm=italic -highlight diffOldFile guifg=#DE6E7C guibg=NONE guisp=NONE gui=italic cterm=italic -highlight diffRemoved guifg=#DE6E7C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight lCursor guifg=#1C1917 guibg=#797F84 guisp=NONE gui=NONE cterm=NONE -highlight markdownH1 guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline -highlight! link Boolean Number -highlight! link BufferCurrent TabLineSel -highlight! link CocCodeLens LineNr -highlight! link CocErrorHighlight DiagnosticUnderlineError -highlight! link CocErrorSign DiagnosticSignError -highlight! link CocErrorVirtualText DiagnosticVirtualTextError -highlight! link CocHintHighlight DiagnosticUnderlineHint -highlight! link CocHintSign DiagnosticSignHint -highlight! link CocInfoHighlight DiagnosticUnderlineInfo -highlight! link CocInfoSign DiagnosticSignInfo -highlight! link CocSelectedText SpellBad -highlight! link CocWarningHighlight DiagnosticUnderlineWarn -highlight! link CocWarningSign DiagnosticSignWarn -highlight! link CocWarningVitualText DiagnosticVirtualTextWarn -highlight! link CursorColumn CursorLine -highlight! link DiagnosticError Error -highlight! link DiagnosticWarn WarningMsg -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 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 DiagnosticError -highlight! link NeogitNotificationInfo DiagnosticInfo -highlight! link NeogitNotificationWarning DiagnosticWarn -highlight! link NnnNormalNC NnnNormal -highlight! link NvimTreeCursorColumn NvimTreeCursorLine -highlight! link NvimTreeGitDeleted diffRemoved -highlight! link NvimTreeGitDirty diffChanged -highlight! link NvimTreeGitNew diffAdded -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 TSConstBuiltin Number -highlight! link TSConstMacro Number -highlight! link TSDanger Error -highlight! link TSNamespace Special -highlight! link TSNote DiagnosticInfo -highlight! link TSTag Special -highlight! link TSVariable Identifier -highlight! link TSVariableBuiltin Number -highlight! link TSWarning WarningMsg -highlight! link TabLine StatusLine -highlight! link TabLineFill StatusLineNC -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 WhichKey Statement -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 -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 -highlight! link StatusLineTerm StatusLine -highlight! link StatusLineTermNC StatusLineNC - -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 - -endfunction diff --git a/autoload/zenbones_light.vim b/autoload/zenbones_light.vim deleted file mode 100644 index 86cda79..0000000 --- a/autoload/zenbones_light.vim +++ /dev/null @@ -1,240 +0,0 @@ -" This file is auto-generated from lua/zenbones/template/vim.lua -function! zenbones_light#load() - -let g:terminal_color_0 = '#F0EDEC' -let g:terminal_color_1 = '#A8334C' -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 = '#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' - -highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold -highlight BufferVisible guifg=#596A76 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight BufferVisibleIndex guifg=#596A76 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight BufferVisibleSign guifg=#596A76 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CmpItemAbbr guifg=#44525B guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CmpItemAbbrDeprecated guifg=#728794 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CmpItemAbbrMatch guifg=#2C363C guibg=NONE guisp=NONE gui=bold cterm=bold -highlight CmpItemAbbrMatchFuzzy guifg=#3E4B53 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight CmpItemKind guifg=#556570 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CmpItemMenu guifg=#5E6F7B guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight CocMarkdownLink guifg=#3B8992 guibg=NONE guisp=NONE gui=underline cterm=underline -highlight ColorColumn guifg=NONE guibg=#E6C5BD guisp=NONE gui=NONE cterm=NONE -highlight Comment guifg=#948985 guibg=NONE guisp=NONE gui=italic cterm=italic -highlight Conceal guifg=#4F5E68 guibg=NONE guisp=NONE gui=bold,italic cterm=bold,italic -highlight Constant guifg=#556570 guibg=NONE guisp=NONE gui=italic cterm=italic -highlight Cursor guifg=#F0EDEC guibg=#2C363C guisp=NONE gui=NONE cterm=NONE -highlight CursorLine guifg=NONE guibg=#E9E4E2 guisp=NONE gui=NONE cterm=NONE -highlight CursorLineNr guifg=#2C363C guibg=NONE guisp=NONE gui=bold cterm=bold -highlight Delimiter guifg=#8E817B guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticSignError guifg=#A8334C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticSignHint guifg=#88507D guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticSignInfo guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticSignWarn guifg=#944927 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticUnderlineError guifg=#A8334C guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight DiagnosticUnderlineHint guifg=#88507D guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight DiagnosticUnderlineInfo guifg=#286486 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight DiagnosticUnderlineWarn guifg=#944927 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight DiagnosticVirtualTextError guifg=#A8334C guibg=#F2DEE0 guisp=NONE gui=NONE cterm=NONE -highlight DiagnosticVirtualTextWarn guifg=#944927 guibg=#F2DEDA guisp=NONE gui=NONE cterm=NONE -highlight DiffAdd guifg=NONE guibg=#CBE5B8 guisp=NONE gui=NONE cterm=NONE -highlight DiffChange guifg=NONE guibg=#D4DEE7 guisp=NONE gui=NONE cterm=NONE -highlight DiffDelete guifg=NONE guibg=#EBD8DA guisp=NONE gui=NONE cterm=NONE -highlight DiffText guifg=#2C363C guibg=#A9BED1 guisp=NONE gui=NONE cterm=NONE -highlight Directory guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold -highlight Error guifg=#A8334C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight FloatBorder guifg=#786D68 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight FoldColumn guifg=#A4968F guibg=NONE guisp=NONE gui=bold cterm=bold -highlight Folded guifg=#564E4A guibg=#CDC2BC guisp=NONE gui=NONE cterm=NONE -highlight Function guifg=#2C363C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight GitSignsAdd guifg=#4F6C31 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight GitSignsChange guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight GitSignsDelete guifg=#A8334C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight HopNextKey2 guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Identifier guifg=#44525B guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight IncSearch guifg=#F0EDEC guibg=#C074B2 guisp=NONE gui=bold cterm=bold -highlight IndentBlanklineChar guifg=#D4CDCA guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic cterm=italic -highlight LightspeedGreyWash guifg=#948985 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight LightspeedLabel guifg=#88507D guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline -highlight LightspeedLabelDistant guifg=#3B8992 guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline -highlight LightspeedLabelDistantOverlapped guifg=#3B8992 guibg=NONE guisp=NONE gui=underline cterm=underline -highlight LightspeedLabelOverlapped guifg=#88507D guibg=NONE guisp=NONE gui=underline cterm=underline -highlight LightspeedOneCharMatch guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold cterm=bold -highlight LightspeedPendingChangeOpArea guifg=#88507D guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight LightspeedShortcut guifg=#F0EDEC guibg=#88507D guisp=NONE gui=bold,underline cterm=bold,underline -highlight LineNr guifg=#A4968F guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight MoreMsg guifg=#4F6C31 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight NeogitHunkHeaderHighlight guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=bold cterm=bold -highlight NnnNormal guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=NONE cterm=NONE -highlight NnnVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight NonText guifg=#BBABA3 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Normal guifg=#2C363C guibg=#F0EDEC guisp=NONE gui=NONE cterm=NONE -highlight NormalFloat guifg=NONE guibg=#E1DCD9 guisp=NONE gui=NONE cterm=NONE -highlight Number guifg=#2C363C guibg=NONE guisp=NONE gui=italic cterm=italic -highlight NvimTreeCursorLine guifg=NONE guibg=#DAD3CF guisp=NONE gui=NONE cterm=NONE -highlight NvimTreeNormal guifg=#2C363C guibg=#E9E4E2 guisp=NONE gui=NONE cterm=NONE -highlight NvimTreeRootFolder guifg=#286486 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight NvimTreeSpecialFile guifg=#88507D guibg=NONE guisp=NONE gui=underline cterm=underline -highlight NvimTreeSymlink guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight NvimTreeVertSplit guifg=bg guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Pmenu guifg=NONE guibg=#DAD3CF guisp=NONE gui=NONE cterm=NONE -highlight PmenuSbar guifg=NONE guibg=#B2A39B guisp=NONE gui=NONE cterm=NONE -highlight PmenuSel guifg=NONE guibg=#C4B6AF guisp=NONE gui=NONE cterm=NONE -highlight PmenuThumb guifg=NONE guibg=#F7F6F5 guisp=NONE gui=NONE cterm=NONE -highlight Search guifg=#2C363C guibg=#DEB9D6 guisp=NONE gui=NONE cterm=NONE -highlight SneakLabelMask guifg=#88507D guibg=#88507D guisp=NONE gui=NONE cterm=NONE -highlight Special guifg=#4F5E68 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight SpecialComment guifg=#948985 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight SpecialKey guifg=#BBABA3 guibg=NONE guisp=NONE gui=italic cterm=italic -highlight SpellBad guifg=#974352 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight SpellCap guifg=#974352 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight SpellRare guifg=#974352 guibg=NONE guisp=NONE gui=undercurl cterm=undercurl -highlight Statement guifg=#2C363C guibg=NONE guisp=NONE gui=bold cterm=bold -highlight StatusLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=NONE cterm=NONE -highlight StatusLineNC guifg=#596A76 guibg=#DAD3CF guisp=NONE gui=NONE cterm=NONE -highlight TSConstant guifg=#44525B guibg=NONE guisp=NONE gui=bold cterm=bold -highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold -highlight TelescopeBorder guifg=#786D68 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight TelescopeMatching guifg=#88507D guibg=NONE guisp=NONE gui=bold cterm=bold -highlight TelescopeSelectionCaret guifg=#A8334C guibg=#E9E4E2 guisp=NONE gui=NONE cterm=NONE -highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold cterm=bold -highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline -highlight Type guifg=#6A5549 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline -highlight VertSplit guifg=#A4968F guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight Visual guifg=NONE guibg=#CBD9E3 guisp=NONE gui=NONE cterm=NONE -highlight WarningMsg guifg=#944927 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight WildMenu guifg=#F0EDEC guibg=#88507D guisp=NONE gui=NONE cterm=NONE -highlight diffAdded guifg=#4F6C31 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight diffChanged guifg=#286486 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight diffFile guifg=#944927 guibg=NONE guisp=NONE gui=bold cterm=bold -highlight diffIndexLine guifg=#944927 guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight diffLine guifg=#88507D guibg=NONE guisp=NONE gui=bold cterm=bold -highlight diffNewFile guifg=#4F6C31 guibg=NONE guisp=NONE gui=italic cterm=italic -highlight diffOldFile guifg=#A8334C guibg=NONE guisp=NONE gui=italic cterm=italic -highlight diffRemoved guifg=#A8334C guibg=NONE guisp=NONE gui=NONE cterm=NONE -highlight lCursor guifg=#F0EDEC guibg=#4D5C65 guisp=NONE gui=NONE cterm=NONE -highlight markdownH1 guifg=#2C363C guibg=NONE guisp=NONE gui=bold,underline cterm=bold,underline -highlight! link Boolean Number -highlight! link BufferCurrent TabLineSel -highlight! link CocCodeLens LineNr -highlight! link CocErrorHighlight DiagnosticUnderlineError -highlight! link CocErrorSign DiagnosticSignError -highlight! link CocErrorVirtualText DiagnosticVirtualTextError -highlight! link CocHintHighlight DiagnosticUnderlineHint -highlight! link CocHintSign DiagnosticSignHint -highlight! link CocInfoHighlight DiagnosticUnderlineInfo -highlight! link CocInfoSign DiagnosticSignInfo -highlight! link CocSelectedText SpellBad -highlight! link CocWarningHighlight DiagnosticUnderlineWarn -highlight! link CocWarningSign DiagnosticSignWarn -highlight! link CocWarningVitualText DiagnosticVirtualTextWarn -highlight! link CursorColumn CursorLine -highlight! link DiagnosticError Error -highlight! link DiagnosticWarn WarningMsg -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 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 DiagnosticError -highlight! link NeogitNotificationInfo DiagnosticInfo -highlight! link NeogitNotificationWarning DiagnosticWarn -highlight! link NnnNormalNC NnnNormal -highlight! link NvimTreeCursorColumn NvimTreeCursorLine -highlight! link NvimTreeGitDeleted diffRemoved -highlight! link NvimTreeGitDirty diffChanged -highlight! link NvimTreeGitNew diffAdded -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 TSConstBuiltin Number -highlight! link TSConstMacro Number -highlight! link TSDanger Error -highlight! link TSNamespace Special -highlight! link TSNote DiagnosticInfo -highlight! link TSTag Special -highlight! link TSVariable Identifier -highlight! link TSVariableBuiltin Number -highlight! link TSWarning WarningMsg -highlight! link TabLine StatusLine -highlight! link TabLineFill StatusLineNC -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 WhichKey Statement -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 -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 -highlight! link StatusLineTerm StatusLine -highlight! link StatusLineTermNC StatusLineNC - -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 - -endfunction diff --git a/colors/duckbones.vim b/colors/duckbones.vim index a8baa1e..11ff5b5 100644 --- a/colors/duckbones.vim +++ b/colors/duckbones.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('duckbones', 'dark') +call zenbones#setup_colorscheme('duckbones', 'dark') diff --git a/colors/forestbones.vim b/colors/forestbones.vim index 112f339..e031c15 100644 --- a/colors/forestbones.vim +++ b/colors/forestbones.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('forestbones') +call zenbones#setup_colorscheme('forestbones') diff --git a/colors/neobones.vim b/colors/neobones.vim index 829c031..e5580ae 100644 --- a/colors/neobones.vim +++ b/colors/neobones.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('neobones') +call zenbones#setup_colorscheme('neobones') diff --git a/colors/nordbones.vim b/colors/nordbones.vim index 1e0e17d..4435c33 100644 --- a/colors/nordbones.vim +++ b/colors/nordbones.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('nordbones', 'dark') +call zenbones#setup_colorscheme('nordbones', 'dark') diff --git a/colors/rosebones.vim b/colors/rosebones.vim index 652683a..ebc8c16 100644 --- a/colors/rosebones.vim +++ b/colors/rosebones.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('rosebones') +call zenbones#setup_colorscheme('rosebones') diff --git a/colors/tokyobones.vim b/colors/tokyobones.vim index 1f5f068..deb6cea 100644 --- a/colors/tokyobones.vim +++ b/colors/tokyobones.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('tokyobones') +call zenbones#setup_colorscheme('tokyobones') diff --git a/colors/vimbones.vim b/colors/vimbones.vim index 0f60482..f9aca07 100644 --- a/colors/vimbones.vim +++ b/colors/vimbones.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('vimbones', 'light') +call zenbones#setup_colorscheme('vimbones', 'light') diff --git a/colors/zenbones.vim b/colors/zenbones.vim index 9a779b5..837794e 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('zenbones') +call zenbones#setup_colorscheme('zenbones') diff --git a/colors/zenburned.vim b/colors/zenburned.vim index 565da54..d452631 100644 --- a/colors/zenburned.vim +++ b/colors/zenburned.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('zenburned', 'dark') +call zenbones#setup_colorscheme('zenburned', 'dark') diff --git a/colors/zenwritten.vim b/colors/zenwritten.vim index 717c3b1..024751d 100644 --- a/colors/zenwritten.vim +++ b/colors/zenwritten.vim @@ -1 +1 @@ -call zenbones#util#setup_colorscheme('zenwritten') +call zenbones#setup_colorscheme('zenwritten') diff --git a/lua/zenbones/shipwright/runners/vim.lua b/lua/zenbones/shipwright/runners/vim.lua index d68e514..b430e41 100644 --- a/lua/zenbones/shipwright/runners/vim.lua +++ b/lua/zenbones/shipwright/runners/vim.lua @@ -1,5 +1,4 @@ -local template = [[function! $name#load() - +local template = [[function! zenbones#generated#$name#load() abort $termcolors $vimcolors highlight! link StatusLineTerm StatusLine @@ -25,9 +24,7 @@ if has('terminal') \ g:terminal_color_15 \ ] endif - -endfunction -]] +endfunction]] local helpers = require "shipwright.transform.helpers" @@ -58,6 +55,6 @@ run( end, to_vim_autoload, { prepend, [[" This file is auto-generated by shipwright.nvim]] }, - { overwrite, string.format("autoload/%s.vim", name) } + { overwrite, string.format("autoload/zenbones/generated/%s.vim", name) } ) -- selene: deny(undefined_variable)