From e1225c8af2da5861569db30e8e3197fae21aa8cb Mon Sep 17 00:00:00 2001 From: Von Random Date: Mon, 11 Feb 2019 14:16:12 +0300 Subject: [PATCH] update theme and readme --- README.md | 44 +++++++++++++++++++++ colors/solarized16.vim | 90 +++++++++++++++++++++--------------------- 2 files changed, 90 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index e69de29..62e80ee 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,44 @@ +Solarized 16 (because we need another solarized theme) +====================================================== + +A fork of [solarized8](https://github.com/Lifepillar/vim-solarized8), which +is itself based on [solarized](http://ethanschoonover.com/solarized) and +[flattened](https://github.com/romainl/flattened). (I know, it is a long list, +but the credit should be given.) + +This theme is just that: solarized8 with no configuration that only supports +solarized terminal colors and truecolor / gui. Since I've completely stripped +the 256 color approximation, I've decided to call this fork solarized16. + +Why another solarized colorscheme? +---------------------------------- + +Solarized8 was ideal, but over the time it shifted from sensible defaults to +256 color approximation and added more options than was necessary. + +Flattened could have been nice if it was updated and worked with the plugins +that I use. + +The original solarized colorscheme code is obnoxiously complicated. Also 256 +color approximation is default and there is no support for termguicolors. + +What's in a name? +----------------- + +In terminal, this theme only uses the first 16 colors. Hence solarized16. +You can also think that it's two times more awesome than solarized8 +(in reality it is not, the original offers many cool options if you're into +that). + +But my terminal is not using solarized and my vim does not support tgc! +----------------------------------------------------------------------- + +Check out [solarized8](https://github.com/Lifepillar/vim-solarized8). + +In my opinion though, 256 color approximation is so horrendously ugly, there +is no point including it. + +What's the plan? +---------------- + +I'll probably merge changes from the defaults of solarized8 from time to time. diff --git a/colors/solarized16.vim b/colors/solarized16.vim index b04dc81..2cb7b51 100644 --- a/colors/solarized16.vim +++ b/colors/solarized16.vim @@ -1,8 +1,8 @@ " Name: Solarized 16 -" Description: Precision colors for machines and people +" Description: It's solarized, by now everyone knows what it is " Maintainer: Von Random " License: OSI approved MIT license -" Last Updated: Mon Jul 16 2018 +" Last Updated: Mon Jan 28 2019 " Original authors: Ethan Schoonover http://ethanschoonover.com/solarized " Romain Lafourcade https://github.com/romainl/flattened @@ -12,6 +12,8 @@ " approximation is entirely pointless and I do not want any options in a bloody " color scheme. It only supports truecolor and 16 colors hence the name. +" solarized8 commit: 4e511a561d95e7f8d3e0dbdea59cf018ca8c3035 + if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < 16) echoerr '[Solarized 16] There are not enough colors.' @@ -28,6 +30,26 @@ let g:colors_name = 'solarized16' if &background ==# 'dark' let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] + if has('nvim') + hi! link TermCursor Cursor + hi TermCursorNC ctermfg=8 ctermbg=10 guifg=#002b36 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE + let g:terminal_color_0='#073642' + let g:terminal_color_1='#dc322f' + let g:terminal_color_2='#859900' + let g:terminal_color_3='#b58900' + let g:terminal_color_4='#268bd2' + let g:terminal_color_5='#d33682' + let g:terminal_color_6='#2aa198' + let g:terminal_color_7='#eee8d5' + let g:terminal_color_8='#002b36' + let g:terminal_color_9='#cb4b16' + let g:terminal_color_10='#586e75' + let g:terminal_color_11='#657b83' + let g:terminal_color_12='#839496' + let g:terminal_color_13='#6c71c4' + let g:terminal_color_14='#93a1a1' + let g:terminal_color_15='#fdf6e3' + endif hi Normal ctermfg=12 ctermbg=8 guifg=#839496 guibg=#002b36 guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=NONE cterm=NONE gui=NONE hi Folded ctermfg=12 ctermbg=0 guifg=#839496 guibg=#073642 guisp=#002b36 cterm=NONE,bold gui=NONE,bold @@ -299,31 +321,31 @@ if &background ==# 'dark' hi pandocMetadataKey ctermfg=4 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi pandocMetadata ctermfg=4 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold hi! link pandocMetadataTitle pandocMetadata - if has('nvim') - hi! link TermCursor Cursor - hi TermCursorNC ctermfg=8 ctermbg=10 guifg=#002b36 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE - let g:terminal_color_8='#002b36' - let g:terminal_color_0='#073642' - let g:terminal_color_10='#586e75' - let g:terminal_color_11='#657b83' - let g:terminal_color_12='#839496' - let g:terminal_color_14='#93a1a1' - let g:terminal_color_7='#eee8d5' - let g:terminal_color_15='#fdf6e3' - let g:terminal_color_3='#b58900' - let g:terminal_color_9='#cb4b16' - let g:terminal_color_1='#dc322f' - let g:terminal_color_5='#d33682' - let g:terminal_color_13='#6c71c4' - let g:terminal_color_4='#268bd2' - let g:terminal_color_6='#2aa198' - let g:terminal_color_2='#859900' - endif finish endif -let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', - \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] +let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] +if has('nvim') + hi! link TermCursor Cursor + hi TermCursorNC ctermfg=15 ctermbg=14 guifg=#fdf6e3 guibg=#93a1a1 guisp=NONE cterm=NONE gui=NONE + let g:terminal_color_0='#eee8d5' + let g:terminal_color_1='#dc322f' + let g:terminal_color_2='#859900' + let g:terminal_color_3='#b58900' + let g:terminal_color_4='#268bd2' + let g:terminal_color_5='#d33682' + let g:terminal_color_6='#2aa198' + let g:terminal_color_7='#073642' + let g:terminal_color_8='#fdf6e3' + let g:terminal_color_9='#cb4b16' + let g:terminal_color_10='#93a1a1' + let g:terminal_color_11='#839496' + let g:terminal_color_12='#657b83' + let g:terminal_color_13='#6c71c4' + let g:terminal_color_14='#586e75' + let g:terminal_color_15='#002b36' +endif hi Normal ctermfg=11 ctermbg=15 guifg=#657b83 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=11 ctermbg=7 guifg=#657b83 guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE hi Folded ctermfg=11 ctermbg=7 guifg=#657b83 guibg=#eee8d5 guisp=#fdf6e3 cterm=NONE,bold gui=NONE,bold @@ -595,24 +617,4 @@ hi pandocMetadata ctermfg=4 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cte hi pandocMetadataKey ctermfg=4 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi pandocMetadata ctermfg=4 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold hi! link pandocMetadataTitle pandocMetadata -if has('nvim') - hi! link TermCursor Cursor - hi TermCursorNC ctermfg=15 ctermbg=14 guifg=#fdf6e3 guibg=#93a1a1 guisp=NONE cterm=NONE gui=NONE - let g:terminal_color_8='#fdf6e3' - let g:terminal_color_0='#eee8d5' - let g:terminal_color_10='#93a1a1' - let g:terminal_color_11='#839496' - let g:terminal_color_12='#657b83' - let g:terminal_color_14='#586e75' - let g:terminal_color_7='#073642' - let g:terminal_color_15='#002b36' - let g:terminal_color_3='#b58900' - let g:terminal_color_9='#cb4b16' - let g:terminal_color_1='#dc322f' - let g:terminal_color_5='#d33682' - let g:terminal_color_13='#6c71c4' - let g:terminal_color_4='#268bd2' - let g:terminal_color_6='#2aa198' - let g:terminal_color_2='#859900' -endif finish