From b8cab8f17dbbeb48be5ffaf87b75a13a5fb7994e Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sat, 6 Nov 2021 14:06:48 +0800 Subject: [PATCH] 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)