From fd92f486770fd4dfe95e6d45d0093dd01a7f708f Mon Sep 17 00:00:00 2001 From: jdhao Date: Mon, 28 Oct 2019 10:48:07 +0800 Subject: [PATCH] Fix an issue with termguicolors option According to https://github.com/equalsraf/neovim-qt/issues/604, nvim-qt will set the termguicolors options when it is started. However, if we add `set notermguicolors` in init.vim, the nvim-qt setting will not take effect after nvim-qt is started. So we need to remove the `set notermguicolors` setting in the config. --- ui.vim | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/ui.vim b/ui.vim index c7d3e98..2c8b808 100644 --- a/ui.vim +++ b/ui.vim @@ -1,13 +1,10 @@ "{ Colorscheme and highlight settings "{{ General settings about colors -" Enable true colors support (Do not use this option if your terminal does not +" Enable true colors support. Do not use this option if your terminal does not " support true colors! For a comprehensive list of terminals supporting true -" colors, see https://github.com/termstandard/colors and -" https://bit.ly/2InF97t) +" colors, see https://github.com/termstandard/colors and https://bit.ly/2InF97t. if $TERM == "xterm-256color" set termguicolors -else - set notermguicolors endif " Use dark background set background=dark @@ -17,27 +14,16 @@ set background=dark """"""""""""""""""""""""""""gruvbox settings""""""""""""""""""""""""""" " We should check if theme exists before using it, otherwise you will get " error message when starting Nvim -if &termguicolors - if utils#HasColorscheme('gruvbox8') - " Italic options should be put before colorscheme setting, - " see https://goo.gl/8nXhcp - let g:gruvbox_italics=1 - let g:gruvbox_italicize_strings=1 - let g:gruvbox_filetype_hi_groups = 0 - let g:gruvbox_plugin_hi_groups = 0 - colorscheme gruvbox8_hard - else - colorscheme desert - endif +if utils#HasColorscheme('gruvbox8') + " Italic options should be put before colorscheme setting, + " see https://goo.gl/8nXhcp + let g:gruvbox_italics=1 + let g:gruvbox_italicize_strings=1 + let g:gruvbox_filetype_hi_groups = 0 + let g:gruvbox_plugin_hi_groups = 0 + colorscheme gruvbox8_hard else - if utils#HasColorscheme('badwolf') - let g:badwolf_darkgutter = 0 - " Make the tab line lighter than the background. - let g:badwolf_tabline = 2 - colorscheme badwolf - else - colorscheme desert - endif + colorscheme desert endif """"""""""""""""""""""""""" deus settings""""""""""""""""""""""""""""""""" @@ -58,5 +44,11 @@ endif " " theme_style can be 'default', 'dark' or 'palenight' " let g:material_theme_style = 'dark' " colorscheme material + +""""""""""""""""""""""""""" badwolf settings """"""""""""""""""""""""""""" +" let g:badwolf_darkgutter = 0 +" " Make the tab line lighter than the background. +" let g:badwolf_tabline = 2 +" colorscheme badwolf "}} "}