diff --git a/colors/paper-custom.erb b/colors/paper-custom.erb index 8b62d23..c82fa7e 100644 --- a/colors/paper-custom.erb +++ b/colors/paper-custom.erb @@ -73,7 +73,7 @@ ui_fg_error = ["#d70000", 196, "red"] ui_fg_warning = ["#d75f00", 166, "yellow"] - ui_fg_question = ["#56acd7", 247, "darkgray"] + ui_fg_question = ["#d7a100", 247, "darkgray"] # Step 3: highlights highlights = [ diff --git a/colors/paper-custom.vim b/colors/paper-custom.vim index 672bddc..29aed03 100644 --- a/colors/paper-custom.vim +++ b/colors/paper-custom.vim @@ -91,7 +91,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi ErrorMsg ctermbg=NONE ctermfg=196 cterm=italic guibg=NONE guifg=#d70000 gui=italic hi ModeMsg ctermbg=NONE ctermfg=255 cterm=italic guibg=NONE guifg=#555555 gui=italic hi MoreMsg ctermbg=NONE ctermfg=255 cterm=italic guibg=NONE guifg=#555555 gui=italic - hi Question ctermbg=NONE ctermfg=247 cterm=italic guibg=NONE guifg=#56acd7 gui=italic + hi Question ctermbg=NONE ctermfg=247 cterm=italic guibg=NONE guifg=#d7a100 gui=italic hi WarningMsg ctermbg=NONE ctermfg=166 cterm=italic guibg=NONE guifg=#d75f00 gui=italic hi CursorColumn ctermbg=250 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE hi EndOfBuffer ctermbg=234 ctermfg=234 cterm=NONE guibg=#ffffff guifg=#ffffff gui=NONE @@ -297,19 +297,14 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi link jsonValue String hi link jsonQuote Noise hi link octobercmsSectionDelimiter Noise - hi link CocErrorSign ErrorMsg - hi link CocWarningSign WarningMsg - hi link CocInfoSign Question - hi link CocHintSign Question - hi link CocHighlightText IncSearch - hi link CocUnderline Error + hi link LspDiagnosticsDefaultError ErrorMsg + hi link LspDiagnosticsDefaultWarning WarningMsg + hi link LspDiagnosticsDefaultInformation Question + hi link LspDiagnosticsDefaultHint Question hi link LspErrorText ErrorMsg hi link LspWarningText WarningMsg hi link LspInformationText Question hi link LspHintText Question - hi link ALEError CocUnderline - hi link ALEErrorSign ErrorMsg - hi link ALEErrorSign ErrorMsg hi link mkdCodeStart Comment hi link mkdListItem Conditional hi link netrwTreeBar Noise diff --git a/init.plugins.vim b/init.plugins.vim index 8531aa1..a881c26 100644 --- a/init.plugins.vim +++ b/init.plugins.vim @@ -50,6 +50,16 @@ let g:material_style = 'lighter' " setings after plug#end "}}} +" #nvim-cmp {{{ + " https://github.com/hrsh7th/nvim-cmp/ + " completion + Plug 'hrsh7th/nvim-cmp' + Plug 'hrsh7th/cmp-nvim-lsp' + Plug 'hrsh7th/cmp-buffer' + Plug 'hrsh7th/cmp-path' + " Plug 'hrsh7th/cmp-nvim-ultisnips' + + "}}} " keeping " #vim-hexokinase {{{ @@ -480,6 +490,35 @@ end EOF "}}} +" #cmp-nvim-ultisnips {{{ +lua <'] = cmp.mapping.complete(), + [''] = cmp.mapping.confirm({ select = true }), + [''] = cmp.mapping.abort(), + }, + sources = { + { name = 'buffer' }, + { name = 'nvim_lsp' }, + { name = 'path' }, + --{ name = 'ultisnips' }, + ... + } + }) +EOF + + "}}}