From 90d097ddf8a2a88f5283fa998ac95270d6488d42 Mon Sep 17 00:00:00 2001 From: shofel Date: Wed, 4 Jul 2018 13:00:48 +0500 Subject: [PATCH 01/26] Swap bg and fg for MatchParen. The problem: when for MatchParen fg=syntax_bg, then block-shaped cursor coloured with bg color, that is become invisible. This makes "another" paren more accented than "this" paren. To fix this, I just swap bg and fg for MatchParen, which solves the problem. --- colors/two-firewatch.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index a5c61a4..53e5931 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -317,7 +317,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('IncSearch', s:syntax_bg, s:uno_4, '') call X('LineNr', s:syntax_fold_bg, '', '') call X('CursorLineNr', s:uno_2, '', 'none') - call X('MatchParen', s:syntax_bg, s:syntax_accent, '') + call X('MatchParen', s:syntax_accent, s:syntax_bg, '') call X('Italic', '', '', 'italic') call X('ModeMsg', s:syntax_color_added, '', '') call X('MoreMsg', s:syntax_fg, '', '') From 442fe0279385100ae488195fcb5655c503fc0009 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 02:23:19 +0500 Subject: [PATCH 02/26] Comment hsv value of (light) colors. --- colors/two-firewatch.vim | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 53e5931..c42c32a 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -236,14 +236,14 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 " Color definition --------------------------------------------------------{{{ if &background ==? 'light' - let s:uno_1 = '2d2006' - let s:uno_2 = '896724' - let s:uno_3 = 'B29762' - let s:uno_4 = 'B6ad9a' - - let s:duo_1 = '065289' - let s:duo_2 = '718ecd' - let s:duo_3 = 'aeb3b7' + let s:uno_1 = '2d2006' " hsv 40 87 18 + let s:uno_2 = '896724' " hsv 40 74 54 + let s:uno_3 = 'B29762' " hsv 40 45 70 + let s:uno_4 = 'b6ad9a' " hsv 41 14 71 + + let s:duo_1 = '065289' " 205°, 96%, 54% + let s:duo_2 = '718ecd' " 221°, 45%, 80% + let s:duo_3 = 'aeb3b7' " 207°, 5%, 72% let s:syntax_color_renamed = '33a0ff' let s:syntax_color_added = '43d08a' From e4393a7621a34e05bd991bca0aac1f8fd45a1316 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 02:41:03 +0500 Subject: [PATCH 03/26] Tune light duo colors by hsv values. --- colors/two-firewatch.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index c42c32a..24b0cea 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -241,9 +241,9 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:uno_3 = 'B29762' " hsv 40 45 70 let s:uno_4 = 'b6ad9a' " hsv 41 14 71 - let s:duo_1 = '065289' " 205°, 96%, 54% - let s:duo_2 = '718ecd' " 221°, 45%, 80% - let s:duo_3 = 'aeb3b7' " 207°, 5%, 72% + let s:duo_1 = '0f5499' " 210°, 90%, 50% + let s:duo_2 = '528fcc' " 210°, 60%, 80% + let s:duo_3 = '919599' " 210°, 5%, 60% let s:syntax_color_renamed = '33a0ff' let s:syntax_color_added = '43d08a' From 844384c743135e180565b9fc98f41425ee0d3de0 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 02:53:46 +0500 Subject: [PATCH 04/26] Tune light uno colors by hsv values. --- colors/two-firewatch.vim | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 24b0cea..084ff30 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -236,11 +236,13 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 " Color definition --------------------------------------------------------{{{ if &background ==? 'light' - let s:uno_1 = '2d2006' " hsv 40 87 18 - let s:uno_2 = '896724' " hsv 40 74 54 - let s:uno_3 = 'B29762' " hsv 40 45 70 - let s:uno_4 = 'b6ad9a' " hsv 41 14 71 + " Blue. + let s:uno_1 = '332405' " 40°, 90%, 20% + let s:uno_2 = '8c6923' " 40°, 75%, 55% + let s:uno_3 = 'b29762' " 40°, 45%, 70% + let s:uno_4 = 'b3aa98' " 40°, 15%, 70% + " Orange. let s:duo_1 = '0f5499' " 210°, 90%, 50% let s:duo_2 = '528fcc' " 210°, 60%, 80% let s:duo_3 = '919599' " 210°, 5%, 60% From bb3c645476a31d26497c46e85fe6794ff4ffdefa Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 02:59:01 +0500 Subject: [PATCH 05/26] Darker uno 4. To make comments more visible. --- colors/two-firewatch.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 084ff30..ca88bd3 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -240,7 +240,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:uno_1 = '332405' " 40°, 90%, 20% let s:uno_2 = '8c6923' " 40°, 75%, 55% let s:uno_3 = 'b29762' " 40°, 45%, 70% - let s:uno_4 = 'b3aa98' " 40°, 15%, 70% + let s:uno_4 = '998f7a' " 40°, 20%, 60% " Orange. let s:duo_1 = '0f5499' " 210°, 90%, 50% From 334c16dfac7b959452949e52beb39ba5d1220ff3 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 03:51:16 +0500 Subject: [PATCH 06/26] light: annotate the rest of colors with hsv. --- colors/two-firewatch.vim | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index ca88bd3..237c47a 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -235,6 +235,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 "}}} " Color definition --------------------------------------------------------{{{ + " @see https://www.google.com/search?q=color+picker for conversion rgb->hsv if &background ==? 'light' " Blue. let s:uno_1 = '332405' " 40°, 90%, 20% @@ -247,18 +248,18 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:duo_2 = '528fcc' " 210°, 60%, 80% let s:duo_3 = '919599' " 210°, 5%, 60% + " Diff. let s:syntax_color_renamed = '33a0ff' let s:syntax_color_added = '43d08a' let s:syntax_color_modified = 'e0c285' let s:syntax_color_removed = 'e05252' let s:syntax_fg = s:uno_2 - let s:syntax_bg = 'FAF8F5' - let s:syntax_accent = '447EBB' - let s:syntax_gutter = 'EAE1D2' - let s:syntax_selection = 'E5DDCB' - let s:syntax_fold_bg = 'd1cec7' - let s:syntax_cursor_line = 'F3EFE7' + let s:syntax_bg = 'FAF8F5' " 36°, 2%, 98% + let s:syntax_accent = s:uno_2 + let s:syntax_selection = 'E5DDCB' " 42°, 11%, 90% + let s:syntax_fold_bg = 'ccc5b8' " 40°, 10%, 80% + let s:syntax_cursor_line = 'F3EFE7' " 40°, 5%, 95% else let s:uno_1 = 'd6e9ff' let s:uno_2 = 'abb2bf' @@ -277,7 +278,6 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_fg = s:uno_2 let s:syntax_bg = '282c34' let s:syntax_accent = '56b6c2' - let s:syntax_gutter = '636d83' let s:syntax_selection = '3e4452' let s:syntax_fold_bg = '5c6370' let s:syntax_cursor_line = '2c323c' @@ -312,7 +312,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('CursorColumn', '', s:syntax_cursor_line, '') call X('CursorLine', '', s:syntax_cursor_line, '') call X('Directory', s:uno_1, '', '') - call X('ErrorMsg', s:syntax_color_removed, s:syntax_bg, 'none') + call X('ErrorMsg', s:syntax_color_removed, s:syntax_bg, 'none') call X('VertSplit', s:syntax_fold_bg, '', 'none') call X('Folded', s:syntax_bg, s:syntax_fold_bg, '') call X('FoldColumn', s:uno_3, s:syntax_cursor_line, '') @@ -321,7 +321,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('CursorLineNr', s:uno_2, '', 'none') call X('MatchParen', s:syntax_accent, s:syntax_bg, '') call X('Italic', '', '', 'italic') - call X('ModeMsg', s:syntax_color_added, '', '') + call X('ModeMsg', s:syntax_color_added, '', '') call X('MoreMsg', s:syntax_fg, '', '') call X('NonText', s:uno_4, '', '') call X('PMenu', '', s:syntax_selection, '') From 8ebaec41205119c51fe9a6e335a6adc3fa67518f Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 03:52:47 +0500 Subject: [PATCH 07/26] light: swap labels for blue and orange. --- colors/two-firewatch.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 237c47a..423f3cc 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -237,13 +237,13 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 " Color definition --------------------------------------------------------{{{ " @see https://www.google.com/search?q=color+picker for conversion rgb->hsv if &background ==? 'light' - " Blue. + " Orange. let s:uno_1 = '332405' " 40°, 90%, 20% let s:uno_2 = '8c6923' " 40°, 75%, 55% let s:uno_3 = 'b29762' " 40°, 45%, 70% let s:uno_4 = '998f7a' " 40°, 20%, 60% - " Orange. + " Blue. let s:duo_1 = '0f5499' " 210°, 90%, 50% let s:duo_2 = '528fcc' " 210°, 60%, 80% let s:duo_3 = '919599' " 210°, 5%, 60% From 8b325f786eaeb17f089281e9b2504fbe7c434f47 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 04:25:13 +0500 Subject: [PATCH 08/26] light: lighter signcolumn. --- colors/two-firewatch.vim | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 423f3cc..cef137e 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -255,11 +255,12 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_color_removed = 'e05252' let s:syntax_fg = s:uno_2 - let s:syntax_bg = 'FAF8F5' " 36°, 2%, 98% + let s:syntax_bg = 'faf8f5' " 36°, 2%, 98% let s:syntax_accent = s:uno_2 - let s:syntax_selection = 'E5DDCB' " 42°, 11%, 90% + let s:syntax_selection = 'e6decf' " 40°, 10%, 90% + let s:syntax_signcolumn = 'ebe7df' " 40°, 5%, 92% let s:syntax_fold_bg = 'ccc5b8' " 40°, 10%, 80% - let s:syntax_cursor_line = 'F3EFE7' " 40°, 5%, 95% + let s:syntax_cursor_line = 'f3efe7' " 40°, 5%, 95% else let s:uno_1 = 'd6e9ff' let s:uno_2 = 'abb2bf' @@ -279,6 +280,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_bg = '282c34' let s:syntax_accent = '56b6c2' let s:syntax_selection = '3e4452' + let s:syntax_signcolumn = s:uno_4 let s:syntax_fold_bg = '5c6370' let s:syntax_cursor_line = '2c323c' endif @@ -343,7 +345,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('TooLong', s:syntax_accent, '', '') call X('WildMenu', s:syntax_fg, s:uno_4, '') call X('Normal', s:syntax_fg, s:syntax_bg, '') - call X('SignColumn', '', s:uno_4, '') + call X('SignColumn', '', s:syntax_signcolumn, '') call X('Special', s:duo_2, '', '') " }}} From 1712390e7900293db48599f4b4362f2931fbe961 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 06:32:35 +0500 Subject: [PATCH 09/26] Tune diff colors. + todo, error. --- colors/two-firewatch.vim | 50 +++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index cef137e..ca7a7c5 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -235,6 +235,13 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 "}}} " Color definition --------------------------------------------------------{{{ + + " Diff colors. + let s:color_diff_change = 'cdcdfd' " #cdcdfd + let s:color_diff_delete = 'ffcddc' " #ffcddc + let s:color_diff_add = 'c9e6c9' " #c9e6c9 + let s:color_diff_text = 'b6f2b6' " #b6f2b6 + " @see https://www.google.com/search?q=color+picker for conversion rgb->hsv if &background ==? 'light' " Orange. @@ -248,14 +255,14 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:duo_2 = '528fcc' " 210°, 60%, 80% let s:duo_3 = '919599' " 210°, 5%, 60% - " Diff. - let s:syntax_color_renamed = '33a0ff' - let s:syntax_color_added = '43d08a' - let s:syntax_color_modified = 'e0c285' - let s:syntax_color_removed = 'e05252' - + " let s:syntax_fg = s:uno_2 let s:syntax_bg = 'faf8f5' " 36°, 2%, 98% + + " + let s:syntax_todo = 'add9ad' " 120°, 20%, 85% + let s:syntax_error = 'cc7a7a' " 0°, 40%, 80% + let s:syntax_accent = s:uno_2 let s:syntax_selection = 'e6decf' " 40°, 10%, 90% let s:syntax_signcolumn = 'ebe7df' " 40°, 5%, 92% @@ -271,13 +278,13 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:duo_2 = 'e06c75' let s:duo_3 = 'dd672c' - let s:syntax_color_renamed = '33a0ff' - let s:syntax_color_added = '43d08a' - let s:syntax_color_modified = 'e0c285' - let s:syntax_color_removed = 'e05252' - let s:syntax_fg = s:uno_2 let s:syntax_bg = '282c34' + + " + let s:syntax_todo = s:color_diff_add + let s:syntax_error = 'cc3d3d' + let s:syntax_accent = '56b6c2' let s:syntax_selection = '3e4452' let s:syntax_signcolumn = s:uno_4 @@ -314,7 +321,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('CursorColumn', '', s:syntax_cursor_line, '') call X('CursorLine', '', s:syntax_cursor_line, '') call X('Directory', s:uno_1, '', '') - call X('ErrorMsg', s:syntax_color_removed, s:syntax_bg, 'none') + call X('ErrorMsg', s:syntax_error, s:syntax_bg, 'none') call X('VertSplit', s:syntax_fold_bg, '', 'none') call X('Folded', s:syntax_bg, s:syntax_fold_bg, '') call X('FoldColumn', s:uno_3, s:syntax_cursor_line, '') @@ -323,7 +330,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('CursorLineNr', s:uno_2, '', 'none') call X('MatchParen', s:syntax_accent, s:syntax_bg, '') call X('Italic', '', '', 'italic') - call X('ModeMsg', s:syntax_color_added, '', '') + call X('ModeMsg', s:color_diff_add, '', '') call X('MoreMsg', s:syntax_fg, '', '') call X('NonText', s:uno_4, '', '') call X('PMenu', '', s:syntax_selection, '') @@ -383,8 +390,8 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('Debug', '', '', '') call X('Underlined', s:duo_1, '', 'underline') call X('Ignore', '', '', '') - call X('Error', s:syntax_color_removed, s:syntax_bg, 'bold') - call X('Todo', s:syntax_color_added, s:syntax_bg, '') + call X('Error', s:syntax_error, s:syntax_bg, 'bold') + call X('Todo', s:syntax_todo, s:syntax_bg, 'bold') " }}} " Asciidoc highlighting ---------------------------------------------------{{{ @@ -407,15 +414,10 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 " }}} " Diff highlighting -------------------------------------------------------{{{ - call X('DiffAdd', s:syntax_color_added, s:syntax_selection, '') - call X('DiffChange', s:syntax_color_modified, s:syntax_selection, '') - call X('DiffDelete', s:syntax_color_removed, s:syntax_selection, '') - call X('DiffText', s:uno_2, s:syntax_selection, '') - call X('DiffAdded', s:duo_2, s:syntax_selection, '') - call X('DiffFile', s:syntax_accent, s:syntax_selection, '') - call X('DiffNewFile', s:duo_2, s:syntax_selection, '') - call X('DiffLine', s:uno_2, s:syntax_selection, '') - call X('DiffRemoved', s:syntax_accent, s:syntax_selection, '') + call X('DiffAdd', '000000', s:color_diff_add, '') + call X('DiffChange', '000000', s:color_diff_change, '') + call X('DiffDelete', '000000', s:color_diff_delete, '') + call X('DiffText', '000000', s:color_diff_text, '') " }}} " C/C++ and other languages like that -------------------------------------{{{ From e897dd4b503b403d0100ac8db2ca218a88862bbb Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 06:56:34 +0500 Subject: [PATCH 10/26] Change `Todo`: just use `s:duo_1`. --- colors/two-firewatch.vim | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index ca7a7c5..0a5c06b 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -259,8 +259,6 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_fg = s:uno_2 let s:syntax_bg = 'faf8f5' " 36°, 2%, 98% - " - let s:syntax_todo = 'add9ad' " 120°, 20%, 85% let s:syntax_error = 'cc7a7a' " 0°, 40%, 80% let s:syntax_accent = s:uno_2 @@ -282,7 +280,6 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_bg = '282c34' " - let s:syntax_todo = s:color_diff_add let s:syntax_error = 'cc3d3d' let s:syntax_accent = '56b6c2' @@ -391,7 +388,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('Underlined', s:duo_1, '', 'underline') call X('Ignore', '', '', '') call X('Error', s:syntax_error, s:syntax_bg, 'bold') - call X('Todo', s:syntax_todo, s:syntax_bg, 'bold') + call X('Todo', s:duo_1, s:syntax_bg, '') " }}} " Asciidoc highlighting ---------------------------------------------------{{{ From ef0733e64d1e3c050dde240c6fbe46f62fa99fa0 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 07:15:15 +0500 Subject: [PATCH 11/26] Dark: annotate colors. + Change bg. --- colors/two-firewatch.vim | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 0a5c06b..df798cc 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -267,17 +267,19 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_fold_bg = 'ccc5b8' " 40°, 10%, 80% let s:syntax_cursor_line = 'f3efe7' " 40°, 5%, 95% else - let s:uno_1 = 'd6e9ff' - let s:uno_2 = 'abb2bf' - let s:uno_3 = '6e88a6' - let s:uno_4 = '55606d' + " Bluish. + let s:uno_1 = 'd6e9ff' " 212°, 16%, 100% + let s:uno_2 = 'abb2bf' " 219°, 10%, 75% + let s:uno_3 = '6e88a6' " 212°, 34%, 65% + let s:uno_4 = '55606d' " 213°, 22%, 43% - let s:duo_1 = 'c8ae9d' - let s:duo_2 = 'e06c75' - let s:duo_3 = 'dd672c' + " Reddish. + let s:duo_1 = 'c8ae9d' " 24°, 22%, 78% + let s:duo_2 = 'e06c75' " 355°, 52%, 88% + let s:duo_3 = 'dd672c' " 20°, 80%, 87% let s:syntax_fg = s:uno_2 - let s:syntax_bg = '282c34' + let s:syntax_bg = '23272e' " 218°, 24%, 18% " let s:syntax_error = 'cc3d3d' @@ -289,7 +291,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_cursor_line = '2c323c' endif - " neovim :terminal colors + " neovim :terminal colors {{{ let g:terminal_color_0 = "#282c34" let g:terminal_color_8 = "#282c34" let g:terminal_color_1 = "#e06c75" @@ -306,6 +308,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let g:terminal_color_14 = "#56b6c2" let g:terminal_color_7 = "#dcdfe4" let g:terminal_color_15 = "#dcdfe4" + " }}} "}}} From 01ac24e729df26900efea6f7a3e7ffcda034a02b Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 07:23:58 +0500 Subject: [PATCH 12/26] Dark: make comments more visible. --- colors/two-firewatch.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index df798cc..58700a5 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -266,12 +266,12 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_signcolumn = 'ebe7df' " 40°, 5%, 92% let s:syntax_fold_bg = 'ccc5b8' " 40°, 10%, 80% let s:syntax_cursor_line = 'f3efe7' " 40°, 5%, 95% - else + else " Dark. " Bluish. let s:uno_1 = 'd6e9ff' " 212°, 16%, 100% let s:uno_2 = 'abb2bf' " 219°, 10%, 75% let s:uno_3 = '6e88a6' " 212°, 34%, 65% - let s:uno_4 = '55606d' " 213°, 22%, 43% + let s:uno_4 = '7a8799' " 215°, 20%, 70 " Reddish. let s:duo_1 = 'c8ae9d' " 24°, 22%, 78% @@ -286,7 +286,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let s:syntax_accent = '56b6c2' let s:syntax_selection = '3e4452' - let s:syntax_signcolumn = s:uno_4 + let s:syntax_signcolumn = '55606d' " 213°, 22%, 43% let s:syntax_fold_bg = '5c6370' let s:syntax_cursor_line = '2c323c' endif From 564c9b09bd3f89eeb140b916ea0555bb6c3b68fd Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 07:53:29 +0500 Subject: [PATCH 13/26] Terminal: make colors 7 and 15 darker. To make visible on light bg. --- colors/two-firewatch.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 58700a5..106cb13 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -306,8 +306,8 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let g:terminal_color_13 = "#c678dd" let g:terminal_color_6 = "#56b6c2" let g:terminal_color_14 = "#56b6c2" - let g:terminal_color_7 = "#dcdfe4" - let g:terminal_color_15 = "#dcdfe4" + let g:terminal_color_7 = "#a1a7b3" + let g:terminal_color_15 = "#a1a7b3" " }}} "}}} From 430e4ed6694bba2b99acafdedd0a76d02bd260e0 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 19 Oct 2019 09:09:43 +0500 Subject: [PATCH 14/26] 1.matchParen:bold 2.lighterNonText --- colors/two-firewatch.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 106cb13..1d5bfdd 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -328,11 +328,11 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('IncSearch', s:syntax_bg, s:uno_4, '') call X('LineNr', s:syntax_fold_bg, '', '') call X('CursorLineNr', s:uno_2, '', 'none') - call X('MatchParen', s:syntax_accent, s:syntax_bg, '') + call X('MatchParen', s:syntax_accent, s:syntax_bg, 'bold') call X('Italic', '', '', 'italic') call X('ModeMsg', s:color_diff_add, '', '') call X('MoreMsg', s:syntax_fg, '', '') - call X('NonText', s:uno_4, '', '') + call X('NonText', s:syntax_signcolumn, '', '') call X('PMenu', '', s:syntax_selection, '') call X('PMenuSel', '', s:syntax_bg, '') call X('PMenuSbar', '', s:syntax_bg, '') From 2906d832e7e53ac333c19baa163fb36dc324666b Mon Sep 17 00:00:00 2001 From: shofel Date: Tue, 22 Oct 2019 00:54:19 +0500 Subject: [PATCH 15/26] Hide EndOfBuffer --- colors/two-firewatch.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 1d5bfdd..83516ac 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -333,6 +333,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 call X('ModeMsg', s:color_diff_add, '', '') call X('MoreMsg', s:syntax_fg, '', '') call X('NonText', s:syntax_signcolumn, '', '') + call X('EndOfBuffer', s:syntax_bg, '', '') call X('PMenu', '', s:syntax_selection, '') call X('PMenuSel', '', s:syntax_bg, '') call X('PMenuSbar', '', s:syntax_bg, '') From b2cdcbce6d0614a72112c77ec6906be91f0370ae Mon Sep 17 00:00:00 2001 From: shofel Date: Tue, 22 Oct 2019 01:02:00 +0500 Subject: [PATCH 16/26] Remove support for cterm. Delete most of the helper functions. --- colors/two-firewatch.vim | 214 ++------------------------------------- 1 file changed, 6 insertions(+), 208 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 83516ac..6b9c5e3 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -7,11 +7,11 @@ hi clear syntax reset -"if exists('g:colors_name') - "unlet g:colors_name -"endif + +" To switch properly between light and dark. let g:colors_name = 'two-firewatch' +" Default options. if !exists('g:two_firewatch_italics') let g:two_firewatch_italics = 0 endif @@ -20,200 +20,6 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 " functions " returns an approximate grey index for the given grey level - " Utility functions -------------------------------------------------------{{{ - fun grey_number(x) - if &t_Co == 88 - if a:x < 23 - return 0 - elseif a:x < 69 - return 1 - elseif a:x < 103 - return 2 - elseif a:x < 127 - return 3 - elseif a:x < 150 - return 4 - elseif a:x < 173 - return 5 - elseif a:x < 196 - return 6 - elseif a:x < 219 - return 7 - elseif a:x < 243 - return 8 - else - return 9 - endif - else - if a:x < 14 - return 0 - else - let l:n = (a:x - 8) / 10 - let l:m = (a:x - 8) % 10 - if l:m < 5 - return l:n - else - return l:n + 1 - endif - endif - endif - endfun - - " returns the actual grey level represented by the grey index - fun grey_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 46 - elseif a:n == 2 - return 92 - elseif a:n == 3 - return 115 - elseif a:n == 4 - return 139 - elseif a:n == 5 - return 162 - elseif a:n == 6 - return 185 - elseif a:n == 7 - return 208 - elseif a:n == 8 - return 231 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 8 + (a:n * 10) - endif - endif - endfun - - " returns the palette index for the given grey index - fun grey_color(n) - if &t_Co == 88 - if a:n == 0 - return 16 - elseif a:n == 9 - return 79 - else - return 79 + a:n - endif - else - if a:n == 0 - return 16 - elseif a:n == 25 - return 231 - else - return 231 + a:n - endif - endif - endfun - - " returns an approximate color index for the given color level - fun rgb_number(x) - if &t_Co == 88 - if a:x < 69 - return 0 - elseif a:x < 172 - return 1 - elseif a:x < 230 - return 2 - else - return 3 - endif - else - if a:x < 75 - return 0 - else - let l:n = (a:x - 55) / 40 - let l:m = (a:x - 55) % 40 - if l:m < 20 - return l:n - else - return l:n + 1 - endif - endif - endif - endfun - - " returns the actual color level for the given color index - fun rgb_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 139 - elseif a:n == 2 - return 205 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 55 + (a:n * 40) - endif - endif - endfun - - " returns the palette index for the given R/G/B color indices - fun rgb_color(x, y, z) - if &t_Co == 88 - return 16 + (a:x * 16) + (a:y * 4) + a:z - else - return 16 + (a:x * 36) + (a:y * 6) + a:z - endif - endfun - - " returns the palette index to approximate the given R/G/B color levels - fun color(r, g, b) - " get the closest grey - let l:gx = grey_number(a:r) - let l:gy = grey_number(a:g) - let l:gz = grey_number(a:b) - - " get the closest color - let l:x = rgb_number(a:r) - let l:y = rgb_number(a:g) - let l:z = rgb_number(a:b) - - if l:gx == l:gy && l:gy == l:gz - " there are two possibilities - let l:dgr = grey_level(l:gx) - a:r - let l:dgg = grey_level(l:gy) - a:g - let l:dgb = grey_level(l:gz) - a:b - let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) - let l:dr = rgb_level(l:gx) - a:r - let l:dg = rgb_level(l:gy) - a:g - let l:db = rgb_level(l:gz) - a:b - let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) - if l:dgrey < l:drgb - " use the grey - return grey_color(l:gx) - else - " use the color - return rgb_color(l:x, l:y, l:z) - endif - else - " only one possibility - return rgb_color(l:x, l:y, l:z) - endif - endfun - - " returns the palette index to approximate the 'rrggbb' hex string - fun rgb(rgb) - let l:r = ('0x' . strpart(a:rgb, 0, 2)) + 0 - let l:g = ('0x' . strpart(a:rgb, 2, 2)) + 0 - let l:b = ('0x' . strpart(a:rgb, 4, 2)) + 0 - - return color(l:r, l:g, l:b) - endfun - " sets the highlighting for the given group fun X(group, fg, bg, attr) let l:attr = a:attr @@ -222,13 +28,13 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 endif if a:fg !=? '' - exec 'hi ' . a:group . ' guifg=#' . a:fg . ' ctermfg=' . rgb(a:fg) + exec 'hi ' . a:group . ' guifg=#' . a:fg endif if a:bg !=? '' - exec 'hi ' . a:group . ' guibg=#' . a:bg . ' ctermbg=' . rgb(a:bg) + exec 'hi ' . a:group . ' guibg=#' . a:bg endif if a:attr !=? '' - exec 'hi ' . a:group . ' gui=' . l:attr . ' cterm=' . l:attr + exec 'hi ' . a:group . ' gui=' . l:attr endif endfun @@ -682,14 +488,6 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 " Delete functions =========================================================={{{ delf X - delf rgb - delf color - delf rgb_color - delf rgb_level - delf rgb_number - delf grey_color - delf grey_level - delf grey_number "}}} endif From 13e10814824a0da57f500a01da73d3c78c2b1692 Mon Sep 17 00:00:00 2001 From: shofel Date: Tue, 22 Oct 2019 01:09:22 +0500 Subject: [PATCH 17/26] Fixup deleting helper functions. --- colors/two-firewatch.vim | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 6b9c5e3..6c47a5f 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -16,10 +16,6 @@ if !exists('g:two_firewatch_italics') let g:two_firewatch_italics = 0 endif -if has('gui_running') || &t_Co == 88 || &t_Co == 256 - " functions - " returns an approximate grey index for the given grey level - " sets the highlighting for the given group fun X(group, fg, bg, attr) let l:attr = a:attr @@ -38,7 +34,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 endif endfun - "}}} +"}}} " Color definition --------------------------------------------------------{{{ @@ -116,7 +112,7 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 let g:terminal_color_15 = "#a1a7b3" " }}} - "}}} +"}}} color definition " Vim editor color --------------------------------------------------------{{{ call X('bold', '', '', 'bold') @@ -490,8 +486,5 @@ if has('gui_running') || &t_Co == 88 || &t_Co == 256 delf X "}}} -endif -"}}} - " vim: set fdl=0 fdm=marker: From 5979e977eba4ebaa27b575e9c60fb0b5ea116052 Mon Sep 17 00:00:00 2001 From: shofel Date: Tue, 22 Oct 2019 01:10:06 +0500 Subject: [PATCH 18/26] reindent X. --- colors/two-firewatch.vim | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 6c47a5f..c295b55 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -16,23 +16,23 @@ if !exists('g:two_firewatch_italics') let g:two_firewatch_italics = 0 endif - " sets the highlighting for the given group - fun X(group, fg, bg, attr) - let l:attr = a:attr - if g:two_firewatch_italics == 0 && l:attr ==? 'italic' - let l:attr = 'none' - endif - - if a:fg !=? '' - exec 'hi ' . a:group . ' guifg=#' . a:fg - endif - if a:bg !=? '' - exec 'hi ' . a:group . ' guibg=#' . a:bg - endif - if a:attr !=? '' - exec 'hi ' . a:group . ' gui=' . l:attr - endif - endfun +" sets the highlighting for the given group +fun X(group, fg, bg, attr) + let l:attr = a:attr + if g:two_firewatch_italics == 0 && l:attr ==? 'italic' + let l:attr = 'none' + endif + + if a:fg !=? '' + exec 'hi ' . a:group . ' guifg=#' . a:fg + endif + if a:bg !=? '' + exec 'hi ' . a:group . ' guibg=#' . a:bg + endif + if a:attr !=? '' + exec 'hi ' . a:group . ' gui=' . l:attr + endif +endfun "}}} From d4e8bf275113b4f47f041c663e5c85ff70d7b84c Mon Sep 17 00:00:00 2001 From: shofel Date: Tue, 22 Oct 2019 01:48:59 +0500 Subject: [PATCH 19/26] copy-paste functions to convert color from hsl. --- colors/two-firewatch.vim | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index c295b55..337d460 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -16,6 +16,48 @@ if !exists('g:two_firewatch_italics') let g:two_firewatch_italics = 0 endif +" Converting Colors. +" https://github.com/norcalli/nvim-colorizer.lua/blob/master/lua/colorizer.lua#L145 + +function! HueToRGB(p, q, t) + if (a:t < 0) + let a:t = a:t + 1 + endif + if (a:t > 1) + let a:t = a:t - 1 + endif + if (a:t < 1/6) + return a:p + (a:q - a:p) * 6 * t + endif + if (a:t < 1/2) + return a:q + endif + if (a:t < 2/3) + return a:p + (a:q - a:p) * (2/3 - a:t) * 6 + endif + return a:p +endfunction + +function HSLtoRGB(h, s, l) + if (a:h > 1 || a:s > 1 || a:l > 1) + return end + endif + if (a:s == 0) + let l:r = a:l * 255 + return l:r, l:r, l:r + endif + + if (l < 0.5) + let l:q = a:l * (1 + a:s) + else + let l:q = a:l + a:s - a:l * a:s + endif + let l:p = 2 * a:l - l:q + return 255*a:hue_to_rgb(l:p, l:q, a:h + 1/3), 255*a:hue_to_rgb(l:p, l:q, a:h), 255*a:hue_to_rgb(l:p, l:q, a:h - 1/3) +endfunction + +" hsl(0,90%,90%); + " sets the highlighting for the given group fun X(group, fg, bg, attr) let l:attr = a:attr From 546e143b6f5944f7d010cbc294f6ce6e0647cf47 Mon Sep 17 00:00:00 2001 From: shofel Date: Tue, 22 Oct 2019 03:30:59 +0500 Subject: [PATCH 20/26] Fixup the hsl functions. But they don't work anyway. --- colors/two-firewatch.vim | 76 ++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 15 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 337d460..fda0d1d 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -20,43 +20,89 @@ endif " https://github.com/norcalli/nvim-colorizer.lua/blob/master/lua/colorizer.lua#L145 function! HueToRGB(p, q, t) - if (a:t < 0) - let a:t = a:t + 1 + let l:t = a:t + + if (l:t < 0) + let l:t = l:t + 1 endif - if (a:t > 1) - let a:t = a:t - 1 + if (l:t > 1) + let l:t = l:t - 1 endif - if (a:t < 1/6) - return a:p + (a:q - a:p) * 6 * t + if (l:t < 1.0 / 6) + return a:p + (a:q - a:p) * 6 * l:t endif - if (a:t < 1/2) + if (l:t < 1.0 / 2) return a:q endif - if (a:t < 2/3) - return a:p + (a:q - a:p) * (2/3 - a:t) * 6 + if (l:t < 2.0 / 3) + return a:p + (a:q - a:p) * (4 - l:t * 6) endif return a:p endfunction -function HSLtoRGB(h, s, l) +function! HSLtoRGB(h, s, l) if (a:h > 1 || a:s > 1 || a:l > 1) - return end + return [0, 0, 0] endif if (a:s == 0) let l:r = a:l * 255 - return l:r, l:r, l:r + return [l:r, l:r, l:r] endif - if (l < 0.5) + let l:q = 0 + + if (a:l < 0.5) let l:q = a:l * (1 + a:s) else let l:q = a:l + a:s - a:l * a:s endif let l:p = 2 * a:l - l:q - return 255*a:hue_to_rgb(l:p, l:q, a:h + 1/3), 255*a:hue_to_rgb(l:p, l:q, a:h), 255*a:hue_to_rgb(l:p, l:q, a:h - 1/3) + return [ + \ 255 * HueToRGB(l:p, l:q, a:h + 1.0 / 3), + \ 255 * HueToRGB(l:p, l:q, a:h), + \ 255 * HueToRGB(l:p, l:q, a:h - 1.0 / 3)] +endfunction + +function! Dec2hex(x) + let l:d = { + \ 10: 'a', + \ 11: 'b', + \ 12: 'c', + \ 13: 'd', + \ 14: 'e', + \ 15: 'f' + \ } + + let l:d1 = float2nr(a:x) / 16 + let l:d2 = float2nr(a:x) % 16 + + let l:d1 = get(l:d, l:d1, l:d1) + let l:d2 = get(l:d, l:d2, l:d2) + + return l:d1 . l:d2 +endfunction + +function ParseHsl(s) + let l:_ = a:s + let l:_ = substitute(l:_, 'hsl(', '[', '') + let l:_ = substitute(l:_, ')', ']', '') + let l:_ = substitute(l:_, '%', '', 'g') + let l:_ = eval(l:_) + let [l:h, l:s, l:l] = [ + \ l:_[0] * 1.0 / 360, + \ l:_[1] * 1.0 / 255, + \ l:_[2] * 1.0 / 255] + return [l:h, l:s, l:l] endfunction -" hsl(0,90%,90%); +function! Hsl(cssfn) + let [l:h, l:s, l:l] = ParseHsl(a:cssfn) + let [d1, d2, d3] = HSLtoRGB(l:h, l:s, l:l) + return Dec2hex(d1) . Dec2hex(d2) . Dec2hex(d3) +endfunction + + +" hsl(0, 70%, 40%); " sets the highlighting for the given group fun X(group, fg, bg, attr) From 0ac53b9a98dd2cc40e16cc4bf528a47fd9f1a6a7 Mon Sep 17 00:00:00 2001 From: shofel Date: Tue, 22 Oct 2019 03:37:25 +0500 Subject: [PATCH 21/26] Fixup color notation. You can see previews!. --- colors/two-firewatch.vim | 98 ++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index fda0d1d..9337a8b 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -16,7 +16,7 @@ if !exists('g:two_firewatch_italics') let g:two_firewatch_italics = 0 endif -" Converting Colors. +" Converting Colors. {{{ " https://github.com/norcalli/nvim-colorizer.lua/blob/master/lua/colorizer.lua#L145 function! HueToRGB(p, q, t) @@ -101,8 +101,8 @@ function! Hsl(cssfn) return Dec2hex(d1) . Dec2hex(d2) . Dec2hex(d3) endfunction - " hsl(0, 70%, 40%); +"}}} parse colors " sets the highlighting for the given group fun X(group, fg, bg, attr) @@ -112,10 +112,10 @@ fun X(group, fg, bg, attr) endif if a:fg !=? '' - exec 'hi ' . a:group . ' guifg=#' . a:fg + exec 'hi ' . a:group . ' guifg=' . a:fg endif if a:bg !=? '' - exec 'hi ' . a:group . ' guibg=#' . a:bg + exec 'hi ' . a:group . ' guibg=' . a:bg endif if a:attr !=? '' exec 'hi ' . a:group . ' gui=' . l:attr @@ -127,76 +127,76 @@ endfun " Color definition --------------------------------------------------------{{{ " Diff colors. - let s:color_diff_change = 'cdcdfd' " #cdcdfd - let s:color_diff_delete = 'ffcddc' " #ffcddc - let s:color_diff_add = 'c9e6c9' " #c9e6c9 - let s:color_diff_text = 'b6f2b6' " #b6f2b6 + let s:color_diff_change = '#cdcdfd' + let s:color_diff_delete = '#ffcddc' + let s:color_diff_add = '#c9e6c9' + let s:color_diff_text = '#b6f2b6' " @see https://www.google.com/search?q=color+picker for conversion rgb->hsv if &background ==? 'light' - " Orange. - let s:uno_1 = '332405' " 40°, 90%, 20% - let s:uno_2 = '8c6923' " 40°, 75%, 55% - let s:uno_3 = 'b29762' " 40°, 45%, 70% - let s:uno_4 = '998f7a' " 40°, 20%, 60% + " First color. + let s:uno_1 = '#332405' " 40°, 90%, 20% + let s:uno_2 = '#8c6923' " 40°, 75%, 55% + let s:uno_3 = '#b29762' " 40°, 45%, 70% + let s:uno_4 = '#998f7a' " 40°, 20%, 60% - " Blue. - let s:duo_1 = '0f5499' " 210°, 90%, 50% - let s:duo_2 = '528fcc' " 210°, 60%, 80% - let s:duo_3 = '919599' " 210°, 5%, 60% + " Second color. + let s:duo_1 = '#0f5499' " 210°, 90%, 50% + let s:duo_2 = '#528fcc' " 210°, 60%, 80% + let s:duo_3 = '#919599' " 210°, 5%, 60% " let s:syntax_fg = s:uno_2 - let s:syntax_bg = 'faf8f5' " 36°, 2%, 98% + let s:syntax_bg = '#faf8f5' " 36°, 2%, 98% - let s:syntax_error = 'cc7a7a' " 0°, 40%, 80% + let s:syntax_error = '#cc7a7a' " 0°, 40%, 80% let s:syntax_accent = s:uno_2 - let s:syntax_selection = 'e6decf' " 40°, 10%, 90% - let s:syntax_signcolumn = 'ebe7df' " 40°, 5%, 92% - let s:syntax_fold_bg = 'ccc5b8' " 40°, 10%, 80% - let s:syntax_cursor_line = 'f3efe7' " 40°, 5%, 95% + let s:syntax_selection = '#e6decf' " 40°, 10%, 90% + let s:syntax_signcolumn = '#ebe7df' " 40°, 5%, 92% + let s:syntax_fold_bg = '#ccc5b8' " 40°, 10%, 80% + let s:syntax_cursor_line = '#f3efe7' " 40°, 5%, 95% else " Dark. - " Bluish. - let s:uno_1 = 'd6e9ff' " 212°, 16%, 100% - let s:uno_2 = 'abb2bf' " 219°, 10%, 75% - let s:uno_3 = '6e88a6' " 212°, 34%, 65% - let s:uno_4 = '7a8799' " 215°, 20%, 70 + " First color. + let s:uno_1 = '#d6e9ff' " 212°, 16%, 100% + let s:uno_2 = '#abb2bf' " 219°, 10%, 75% + let s:uno_3 = '#6e88a6' " 212°, 34%, 65% + let s:uno_4 = '#7a8799' " 215°, 20%, 70 - " Reddish. - let s:duo_1 = 'c8ae9d' " 24°, 22%, 78% - let s:duo_2 = 'e06c75' " 355°, 52%, 88% - let s:duo_3 = 'dd672c' " 20°, 80%, 87% + " Second color. + let s:duo_1 = '#c8ae9d' " 24°, 22%, 78% + let s:duo_2 = '#e06c75' " 355°, 52%, 88% + let s:duo_3 = '#dd672c' " 20°, 80%, 87% let s:syntax_fg = s:uno_2 - let s:syntax_bg = '23272e' " 218°, 24%, 18% + let s:syntax_bg = '#23272e' " 218°, 24%, 18% " - let s:syntax_error = 'cc3d3d' + let s:syntax_error = '#cc3d3d' - let s:syntax_accent = '56b6c2' - let s:syntax_selection = '3e4452' - let s:syntax_signcolumn = '55606d' " 213°, 22%, 43% - let s:syntax_fold_bg = '5c6370' - let s:syntax_cursor_line = '2c323c' + let s:syntax_accent = '#56b6c2' + let s:syntax_selection = '#3e4452' + let s:syntax_signcolumn = '#55606d' " 213°, 22%, 43% + let s:syntax_fold_bg = '#5c6370' + let s:syntax_cursor_line = '#2c323c' endif " neovim :terminal colors {{{ - let g:terminal_color_0 = "#282c34" - let g:terminal_color_8 = "#282c34" - let g:terminal_color_1 = "#e06c75" - let g:terminal_color_9 = "#e06c75" - let g:terminal_color_2 = "#98c379" + let g:terminal_color_0 = "#282c34" + let g:terminal_color_8 = "#282c34" + let g:terminal_color_1 = "#e06c75" + let g:terminal_color_9 = "#e06c75" + let g:terminal_color_2 = "#98c379" let g:terminal_color_10 = "#98c379" - let g:terminal_color_3 = "#e5c07b" + let g:terminal_color_3 = "#e5c07b" let g:terminal_color_11 = "#e5c07b" - let g:terminal_color_4 = "#61afef" + let g:terminal_color_4 = "#61afef" let g:terminal_color_12 = "#61afef" - let g:terminal_color_5 = "#c678dd" + let g:terminal_color_5 = "#c678dd" let g:terminal_color_13 = "#c678dd" - let g:terminal_color_6 = "#56b6c2" + let g:terminal_color_6 = "#56b6c2" let g:terminal_color_14 = "#56b6c2" - let g:terminal_color_7 = "#a1a7b3" + let g:terminal_color_7 = "#a1a7b3" let g:terminal_color_15 = "#a1a7b3" " }}} From fd57adc4ff512e1845b036f12d51cdd9942f34f4 Mon Sep 17 00:00:00 2001 From: shofel Date: Fri, 25 Oct 2019 16:14:11 +0500 Subject: [PATCH 22/26] Terminal: different colors for light and dark. --- colors/two-firewatch.vim | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 9337a8b..02f54e2 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -35,7 +35,7 @@ function! HueToRGB(p, q, t) return a:q endif if (l:t < 2.0 / 3) - return a:p + (a:q - a:p) * (4 - l:t * 6) + return a:p + (a:q - a:p) * (2.0 / 3 - l:t) * 6 endif return a:p endfunction @@ -90,8 +90,8 @@ function ParseHsl(s) let l:_ = eval(l:_) let [l:h, l:s, l:l] = [ \ l:_[0] * 1.0 / 360, - \ l:_[1] * 1.0 / 255, - \ l:_[2] * 1.0 / 255] + \ l:_[1] * 1.0 / 100, + \ l:_[2] * 1.0 / 100] return [l:h, l:s, l:l] endfunction @@ -182,8 +182,8 @@ endfun endif " neovim :terminal colors {{{ - let g:terminal_color_0 = "#282c34" - let g:terminal_color_8 = "#282c34" + let g:terminal_color_0 = "" + let g:terminal_color_8 = "" let g:terminal_color_1 = "#e06c75" let g:terminal_color_9 = "#e06c75" let g:terminal_color_2 = "#98c379" @@ -196,8 +196,20 @@ endfun let g:terminal_color_13 = "#c678dd" let g:terminal_color_6 = "#56b6c2" let g:terminal_color_14 = "#56b6c2" - let g:terminal_color_7 = "#a1a7b3" - let g:terminal_color_15 = "#a1a7b3" + let g:terminal_color_7 = "" + let g:terminal_color_15 = "" + + if &background ==? 'light' + let g:terminal_color_0 = "#282c34" + let g:terminal_color_8 = "#4d4d4d" + let g:terminal_color_7 = "#737780" + let g:terminal_color_15 = "#a1a7b3" + else " Dark + let g:terminal_color_0 = "#000000" + let g:terminal_color_8 = "#4d4d4d" + let g:terminal_color_7 = "#737780" + let g:terminal_color_15 = "#a1a7b3" + endif " }}} "}}} color definition From 746574cc5df1e150dcd6bfbe5408275398ca1848 Mon Sep 17 00:00:00 2001 From: shofel Date: Fri, 25 Oct 2019 16:17:06 +0500 Subject: [PATCH 23/26] Add folds for light, dark, terminal. --- colors/two-firewatch.vim | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index 02f54e2..fa5036a 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -134,6 +134,7 @@ endfun " @see https://www.google.com/search?q=color+picker for conversion rgb->hsv if &background ==? 'light' + " {{{ Light " First color. let s:uno_1 = '#332405' " 40°, 90%, 20% let s:uno_2 = '#8c6923' " 40°, 75%, 55% @@ -156,7 +157,9 @@ endfun let s:syntax_signcolumn = '#ebe7df' " 40°, 5%, 92% let s:syntax_fold_bg = '#ccc5b8' " 40°, 10%, 80% let s:syntax_cursor_line = '#f3efe7' " 40°, 5%, 95% - else " Dark. + " }}} + else + " {{{ Dark " First color. let s:uno_1 = '#d6e9ff' " 212°, 16%, 100% let s:uno_2 = '#abb2bf' " 219°, 10%, 75% @@ -179,9 +182,10 @@ endfun let s:syntax_signcolumn = '#55606d' " 213°, 22%, 43% let s:syntax_fold_bg = '#5c6370' let s:syntax_cursor_line = '#2c323c' + " }}} endif - " neovim :terminal colors {{{ + " Terminal colors {{{ let g:terminal_color_0 = "" let g:terminal_color_8 = "" let g:terminal_color_1 = "#e06c75" From f276d2c9ec08cfb5ccb372cf6dada2f34bf0aad1 Mon Sep 17 00:00:00 2001 From: shofel Date: Mon, 2 Dec 2019 20:41:30 +0500 Subject: [PATCH 24/26] diff colors: copy for fugitive.vim. --- colors/two-firewatch.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index fa5036a..a16b36e 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -325,6 +325,10 @@ endfun call X('DiffChange', '000000', s:color_diff_change, '') call X('DiffDelete', '000000', s:color_diff_delete, '') call X('DiffText', '000000', s:color_diff_text, '') + + " fugitive.vim + call X('diffAdded', g:terminal_color_2, '', '') + call X('diffRemoved', g:terminal_color_1, '', '') " }}} " C/C++ and other languages like that -------------------------------------{{{ @@ -427,8 +431,6 @@ endfun hi link GitGutterAdd SignifySignAdd hi link GitGutterChange SignifySignChange hi link GitGutterDelete SignifySignDelete - call X('diffAdded', s:duo_2, '', '') - call X('diffRemoved', s:syntax_accent, '', '') " }}} " HTML highlighting -------------------------------------------------------{{{ From d8626ff635b5ecc252bc3f4ce79194c0a5fce7e8 Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 8 May 2021 19:40:45 +0500 Subject: [PATCH 25/26] make titles of closed folds more visible. --- colors/two-firewatch.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index a16b36e..dc95aa4 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -219,6 +219,7 @@ endfun "}}} color definition " Vim editor color --------------------------------------------------------{{{ + " group fg bg attr call X('bold', '', '', 'bold') call X('ColorColumn', '', s:syntax_cursor_line, '') call X('Conceal', '', '', '') @@ -229,7 +230,7 @@ endfun call X('Directory', s:uno_1, '', '') call X('ErrorMsg', s:syntax_error, s:syntax_bg, 'none') call X('VertSplit', s:syntax_fold_bg, '', 'none') - call X('Folded', s:syntax_bg, s:syntax_fold_bg, '') + call X('Folded', s:uno_1, s:syntax_fold_bg, '') call X('FoldColumn', s:uno_3, s:syntax_cursor_line, '') call X('IncSearch', s:syntax_bg, s:uno_4, '') call X('LineNr', s:syntax_fold_bg, '', '') From 5e7fc1b8ab76c9f38f506dfca273c95ccf9579ae Mon Sep 17 00:00:00 2001 From: shofel Date: Sat, 8 May 2021 19:44:37 +0500 Subject: [PATCH 26/26] fixup linting issues: "->'; add scriptencoding. --- colors/two-firewatch.vim | 49 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/colors/two-firewatch.vim b/colors/two-firewatch.vim index dc95aa4..23ac964 100644 --- a/colors/two-firewatch.vim +++ b/colors/two-firewatch.vim @@ -2,6 +2,7 @@ " Author: Ramzi Akremi " License: MIT " Version: 1.0.0 +scriptencoding utf-8 " Global setup =============================================================={{{ @@ -186,33 +187,33 @@ endfun endif " Terminal colors {{{ - let g:terminal_color_0 = "" - let g:terminal_color_8 = "" - let g:terminal_color_1 = "#e06c75" - let g:terminal_color_9 = "#e06c75" - let g:terminal_color_2 = "#98c379" - let g:terminal_color_10 = "#98c379" - let g:terminal_color_3 = "#e5c07b" - let g:terminal_color_11 = "#e5c07b" - let g:terminal_color_4 = "#61afef" - let g:terminal_color_12 = "#61afef" - let g:terminal_color_5 = "#c678dd" - let g:terminal_color_13 = "#c678dd" - let g:terminal_color_6 = "#56b6c2" - let g:terminal_color_14 = "#56b6c2" - let g:terminal_color_7 = "" - let g:terminal_color_15 = "" + let g:terminal_color_0 = '' + let g:terminal_color_8 = '' + let g:terminal_color_1 = '#e06c75' + let g:terminal_color_9 = '#e06c75' + let g:terminal_color_2 = '#98c379' + let g:terminal_color_10 = '#98c379' + let g:terminal_color_3 = '#e5c07b' + let g:terminal_color_11 = '#e5c07b' + let g:terminal_color_4 = '#61afef' + let g:terminal_color_12 = '#61afef' + let g:terminal_color_5 = '#c678dd' + let g:terminal_color_13 = '#c678dd' + let g:terminal_color_6 = '#56b6c2' + let g:terminal_color_14 = '#56b6c2' + let g:terminal_color_7 = '' + let g:terminal_color_15 = '' if &background ==? 'light' - let g:terminal_color_0 = "#282c34" - let g:terminal_color_8 = "#4d4d4d" - let g:terminal_color_7 = "#737780" - let g:terminal_color_15 = "#a1a7b3" + let g:terminal_color_0 = '#282c34' + let g:terminal_color_8 = '#4d4d4d' + let g:terminal_color_7 = '#737780' + let g:terminal_color_15 = '#a1a7b3' else " Dark - let g:terminal_color_0 = "#000000" - let g:terminal_color_8 = "#4d4d4d" - let g:terminal_color_7 = "#737780" - let g:terminal_color_15 = "#a1a7b3" + let g:terminal_color_0 = '#000000' + let g:terminal_color_8 = '#4d4d4d' + let g:terminal_color_7 = '#737780' + let g:terminal_color_15 = '#a1a7b3' endif " }}}