diff --git a/templates/_cleanup.colortemplate b/templates/_cleanup.colortemplate new file mode 100644 index 0000000..a6a3355 --- /dev/null +++ b/templates/_cleanup.colortemplate @@ -0,0 +1,3 @@ +# vim: ft=colortemplate fdm=marker +#unlet s:termtrans + diff --git a/templates/_global.colortemplate b/templates/_global.colortemplate new file mode 100644 index 0000000..297bb1c --- /dev/null +++ b/templates/_global.colortemplate @@ -0,0 +1,5 @@ +# vim: ft=colortemplate fdm=marker +#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1) +#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running') +Include: _linked_groups.colortemplate + diff --git a/templates/_info.colortemplate b/templates/_info.colortemplate new file mode 100644 index 0000000..4fcdc8d --- /dev/null +++ b/templates/_info.colortemplate @@ -0,0 +1,9 @@ +# vim: ft=colortemplate fdm=marker +Author: Ethan Schoonover +Maintainer: Lifepillar +Website: https://github.com/lifepillar/vim-solarized8 +Description: Precision colors for machines and people +Option Prefix: solarized +License: OSI approved MIT license +Neovim: yes + diff --git a/templates/solarized8.colortemplate b/templates/solarized8.colortemplate index 8ff218a..cefc590 100644 --- a/templates/solarized8.colortemplate +++ b/templates/solarized8.colortemplate @@ -3,13 +3,7 @@ # Information {{{ Full name: Solarized 8 Short name: solarized8 -Author: Ethan Schoonover -Maintainer: Lifepillar -Website: https://github.com/lifepillar/vim-solarized8 -Description: Precision colors for machines and people -Option Prefix: solarized -License: OSI approved MIT license -Neovim: yes +Include: _info.colortemplate # }}} # Documentation {{{ Include: _help.colortemplate @@ -220,7 +214,7 @@ TermCursorNC base03 base01 # Extra stuff (dark) {{{ Include: _extra.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate Background: light # Light color palette {{{ @@ -429,11 +423,11 @@ TermCursorNC base03 base01 # Extra stuff (light) {{{ Include: _extra.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate Background: any # B&W variant {{{ Include: _bw.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate diff --git a/templates/solarized8_flat.colortemplate b/templates/solarized8_flat.colortemplate index 2185ee0..0d1dbad 100644 --- a/templates/solarized8_flat.colortemplate +++ b/templates/solarized8_flat.colortemplate @@ -3,19 +3,10 @@ # Information {{{ Full name: Solarized 8 Flat Short name: solarized8_flat -Author: Ethan Schoonover -Maintainer: Lifepillar -Website: https://github.com/lifepillar/vim-solarized8 -Description: Precision colors for machines and people -Option Prefix: solarized -License: OSI approved MIT license -Neovim: yes +Include: _info.colortemplate # }}} -#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1) -#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running') - -Include: _linked_groups.colortemplate +Include: _global.colortemplate Variant: gui 256 16 @@ -185,7 +176,7 @@ TermCursorNC base03 base01 # Extra stuff (light) {{{ Include: _extra.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate Background: light # Light color palette {{{ @@ -363,11 +354,11 @@ TermCursorNC base03 base01 # Extra stuff (light) {{{ Include: _extra.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate Background: any # B&W variant {{{ Include: _bw.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate diff --git a/templates/solarized8_high.colortemplate b/templates/solarized8_high.colortemplate index 0f1203c..cbd4399 100644 --- a/templates/solarized8_high.colortemplate +++ b/templates/solarized8_high.colortemplate @@ -3,19 +3,10 @@ # Information {{{ Full name: Solarized 8 High Contrast Short name: solarized8_high -Author: Ethan Schoonover -Maintainer: Lifepillar -Website: https://github.com/lifepillar/vim-solarized8 -Description: Precision colors for machines and people -Option Prefix: solarized -License: OSI approved MIT license -Neovim: yes +Include: _info.colortemplate # }}} -#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1) -#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running') - -Include: _linked_groups.colortemplate +Include: _global.colortemplate Variant: gui 256 16 @@ -211,7 +202,7 @@ TermCursorNC base03 base01 # Extra stuff (dark) {{{ Include: _extra.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate Background: light # Light color palette {{{ @@ -414,11 +405,11 @@ TermCursorNC base03 base01 # Extra stuff (light) {{{ Include: _extra.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate Background: any # B&W variant {{{ Include: _bw.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate diff --git a/templates/solarized8_low.colortemplate b/templates/solarized8_low.colortemplate index 7e8edb8..cf0016e 100644 --- a/templates/solarized8_low.colortemplate +++ b/templates/solarized8_low.colortemplate @@ -3,21 +3,12 @@ # Information {{{ Full name: Solarized 8 Low Contrast Short name: solarized8_low -Author: Ethan Schoonover -Maintainer: Lifepillar -Website: https://github.com/lifepillar/vim-solarized8 -Description: Precision colors for machines and people -Option Prefix: solarized -License: OSI approved MIT license -Neovim: yes +Include: _info.colortemplate # }}} -#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1) -#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running') +Include: _global.colortemplate -Include: _linked_groups.colortemplate - -Variant: 256 gui 16 +Variant: gui 256 16 Background: dark # Dark color palette {{{ @@ -207,7 +198,7 @@ CommandMode magenta base3 reverse # Extra stuff (dark) {{{ Include: _extra.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate Background: light # Light color palette {{{ @@ -412,11 +403,11 @@ TermCursorNC base03 base01 # Extra stuff (light) {{{ Include: _extra.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate Background: any # B&W variant {{{ Include: _bw.colortemplate # }}} -#unlet s:termtrans +Include: _cleanup.colortemplate