diff --git a/colors/paper-custom.erb b/colors/paper-custom.erb index 80426ba..5ad68ec 100644 --- a/colors/paper-custom.erb +++ b/colors/paper-custom.erb @@ -81,9 +81,7 @@ [ "Normal", bg, fg, "NONE" ], [ "Special", "NONE", color_primary_strong, "bold" ], - [ "SpecialKey", "NONE", ui_fg_weak, "NONE"], - [ "NonText", "NONE", ui_fg_weak, "NONE"], - [ "Noise", "NONE", ui_fg_weak, "NONE"], + [ "NonText", "NONE", color_primary_strong, "NONE" ], [ "Tag", color_primary_weak, "NONE", "NONE" ], [ "Identifier", "NONE", color_primary, "bold" ], @@ -152,6 +150,8 @@ [ "PmenuSel", ui_bg, ui_fg_strong, "bold" ], [ "PmenuThumb", ui_bg, ui_fg, "NONE" ], + [ "SpecialKey", "NONE", color_primary_strong, "NONE" ], + [ "IncSearch", ui_incsearch, bg, "NONE" ], [ "Search", ui_search, ui_fg_strong, "NONE" ], diff --git a/colors/paper-custom.vim b/colors/paper-custom.vim index 9126198..009c452 100644 --- a/colors/paper-custom.vim +++ b/colors/paper-custom.vim @@ -23,9 +23,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi Normal ctermbg=234 ctermfg=243 cterm=NONE guibg=#ffffff guifg=#8c8c8c gui=NONE set background=light hi Special ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#ad006d gui=bold - hi SpecialKey ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#bbbbbb gui=NONE - hi NonText ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#bbbbbb gui=NONE - hi Noise ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#bbbbbb gui=NONE + hi NonText ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#ad006d gui=NONE hi Tag ctermbg=164 ctermfg=NONE cterm=NONE guibg=#e846ac guifg=NONE gui=NONE hi Identifier ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#d70087 gui=bold hi Function ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#d70087 gui=NONE @@ -76,6 +74,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi PmenuSbar ctermbg=238 ctermfg=243 cterm=NONE guibg=#efefef guifg=#929292 gui=NONE hi PmenuSel ctermbg=238 ctermfg=255 cterm=bold guibg=#efefef guifg=#555555 gui=bold hi PmenuThumb ctermbg=238 ctermfg=243 cterm=NONE guibg=#efefef guifg=#929292 gui=NONE + hi SpecialKey ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#ad006d gui=NONE hi IncSearch ctermbg=17 ctermfg=234 cterm=NONE guibg=#beced5 guifg=#ffffff gui=NONE hi Search ctermbg=17 ctermfg=255 cterm=NONE guibg=#dce5ed guifg=#555555 gui=NONE hi Visual ctermbg=17 ctermfg=NONE cterm=NONE guibg=#ced8e0 guifg=NONE gui=NONE @@ -338,9 +337,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi Normal ctermbg=black ctermfg=gray cterm=NONE set background=light hi Special ctermbg=NONE ctermfg=magenta cterm=bold - hi SpecialKey ctermbg=NONE ctermfg=gray cterm=NONE - hi NonText ctermbg=NONE ctermfg=gray cterm=NONE - hi Noise ctermbg=NONE ctermfg=gray cterm=NONE + hi NonText ctermbg=NONE ctermfg=magenta cterm=NONE hi Tag ctermbg=magenta ctermfg=NONE cterm=NONE hi Identifier ctermbg=NONE ctermfg=magenta cterm=bold hi Function ctermbg=NONE ctermfg=magenta cterm=NONE @@ -391,6 +388,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi PmenuSbar ctermbg=gray ctermfg=gray cterm=NONE hi PmenuSel ctermbg=gray ctermfg=white cterm=bold hi PmenuThumb ctermbg=gray ctermfg=gray cterm=NONE + hi SpecialKey ctermbg=NONE ctermfg=magenta cterm=NONE hi IncSearch ctermbg=darkblue ctermfg=black cterm=NONE hi Search ctermbg=darkblue ctermfg=white cterm=NONE hi Visual ctermbg=darkblue ctermfg=NONE cterm=NONE diff --git a/init.vim b/init.vim index ef0e0c4..38f6951 100644 --- a/init.vim +++ b/init.vim @@ -298,9 +298,9 @@ set statusline+=%-7(:%c\ %((%V)%)%) " separator, highlight color set statusline+=%=%#StatusLineNC# " Ale errors -set statusline+=%{AleLinterStatus()}\ +set statusline+=%{AleLinterStatus()} " CoC status -set statusline+=%{coc#status()} +set statusline+=%{coc#status()}\ " separator set statusline+=%=%#StatusLine# set statusline+=%y\