This commit is contained in:
ManjaroOne666 2018-11-02 20:25:06 +00:00
parent 380d84ef62
commit d3be8a2c55
3 changed files with 46 additions and 13 deletions

View File

@ -565,6 +565,15 @@
[ "CtrlPBufferCur", "NONE", gray7, "bold" ], [ "CtrlPBufferCur", "NONE", gray7, "bold" ],
[ "CtrlPBufferCurMod", "NONE", red_ui4, "NONE" ], [ "CtrlPBufferCurMod", "NONE", red_ui4, "NONE" ],
[ "CtrlPBufName", "NONE", red_ui4, "NONE" ],
[ "CtrlPTagKind", "NONE", red_ui4, "bold" ],
[ "CtrlPqfLineCol", "NONE", red_ui3, "bold" ],
[ "CtrlPUndoT", "NONE", gray5, "NONE" ],
[ "CtrlPUndoBr", "NONE", gray1, "NONE" ],
[ "CtrlPUndoNr", "NONE", gray2, "NONE" ],
[ "CtrlPUndoSv", "NONE", red_ui3, "NONE" ],
[ "CtrlPUndoPo", "NONE", gray7, "bold" ],
# to be implemented # to be implemented
# "" #shell highlighting # "" #shell highlighting

View File

@ -299,6 +299,14 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi CtrlPBufferVisMod ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#725454 gui=NONE hi CtrlPBufferVisMod ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#725454 gui=NONE
hi CtrlPBufferCur ctermbg=NONE ctermfg=250 cterm=bold guibg=NONE guifg=#aeadad gui=bold hi CtrlPBufferCur ctermbg=NONE ctermfg=250 cterm=bold guibg=NONE guifg=#aeadad gui=bold
hi CtrlPBufferCurMod ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#916c6c gui=NONE hi CtrlPBufferCurMod ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#916c6c gui=NONE
hi CtrlPBufName ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#916c6c gui=NONE
hi CtrlPTagKind ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#916c6c gui=bold
hi CtrlPqfLineCol ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold
hi CtrlPUndoT ctermbg=NONE ctermfg=244 cterm=NONE guibg=NONE guifg=#857f7f gui=NONE
hi CtrlPUndoBr ctermbg=NONE ctermfg=237 cterm=NONE guibg=NONE guifg=#333535 gui=NONE
hi CtrlPUndoNr ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494545 gui=NONE
hi CtrlPUndoSv ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#725454 gui=NONE
hi CtrlPUndoPo ctermbg=NONE ctermfg=250 cterm=bold guibg=NONE guifg=#aeadad gui=bold
elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
set t_Co=16 set t_Co=16
hi Normal ctermbg=black ctermfg=gray cterm=NONE hi Normal ctermbg=black ctermfg=gray cterm=NONE
@ -588,6 +596,14 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi CtrlPBufferVisMod ctermbg=NONE ctermfg=red cterm=NONE hi CtrlPBufferVisMod ctermbg=NONE ctermfg=red cterm=NONE
hi CtrlPBufferCur ctermbg=NONE ctermfg=white cterm=bold hi CtrlPBufferCur ctermbg=NONE ctermfg=white cterm=bold
hi CtrlPBufferCurMod ctermbg=NONE ctermfg=red cterm=NONE hi CtrlPBufferCurMod ctermbg=NONE ctermfg=red cterm=NONE
hi CtrlPBufName ctermbg=NONE ctermfg=red cterm=NONE
hi CtrlPTagKind ctermbg=NONE ctermfg=red cterm=bold
hi CtrlPqfLineCol ctermbg=NONE ctermfg=red cterm=bold
hi CtrlPUndoT ctermbg=NONE ctermfg=darkgray cterm=NONE
hi CtrlPUndoBr ctermbg=NONE ctermfg=black cterm=NONE
hi CtrlPUndoNr ctermbg=NONE ctermfg=gray cterm=NONE
hi CtrlPUndoSv ctermbg=NONE ctermfg=red cterm=NONE
hi CtrlPUndoPo ctermbg=NONE ctermfg=white cterm=bold
endif endif
augroup cursorlinebg augroup cursorlinebg

34
vimrc
View File

@ -266,23 +266,29 @@ xmap ih <Plug>GitGutterTextObjectInnerVisual
xmap ah <Plug>GitGutterTextObjectOuterVisual xmap ah <Plug>GitGutterTextObjectOuterVisual
"}}} "}}}
" Use the silver searcher ag command instead of grep{{{ " ctrlp {{{
" :h ctrlp-commands
" :h ctrlp-extensions
let g:ctrlp_extensions = ['tag', 'buffertag', 'quickfix', 'undo']
if executable('ag') if executable('ag')
" Use ag over grep
set grepprg=ag\ --nogroup\ --nocolor\ --ignore\ node_modules
" Use ag in CtrlP for listing files. Lightning fast and respects .gitignore " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
" ag is fast enough that CtrlP doesn't need to cache " ag is fast enough that CtrlP doesn't need to cache
let g:ctrlp_use_caching = 0 let g:ctrlp_use_caching = 0
endif endif
" Use ag over grep
if executable('ag')
set grepprg=ag\ --nogroup\ --nocolor\ --ignore\ node_modules
endif
"}}}
"vim-wiki "vim-wiki{{{
let g:vimwiki_list = [{'path': '~/vimwiki/', 'path_html': '~/vimwiki_html/'}] let g:vimwiki_list = [{'path': '~/vimwiki/', 'path_html': '~/vimwiki_html/'}]
"}}}
" emmet " emmet {{{
let g:user_emmet_leader_key=',,' let g:user_emmet_leader_key=',,'
let g:user_emmet_settings = { let g:user_emmet_settings = {
\ 'indentation': ' ', \ 'indentation': ' ',
@ -349,10 +355,6 @@ endfunction
set completefunc=CompleteSnippets set completefunc=CompleteSnippets
"}}} "}}}
" Netrw{{{ " Netrw{{{
@ -430,7 +432,7 @@ nnoremap <space>cc :call ToggleColorPreview()<CR>
nnoremap <space>ci :ColorVInsert<CR> nnoremap <space>ci :ColorVInsert<CR>
nnoremap <space>cp :ColorVPicker<CR> nnoremap <space>cp :ColorVPicker<CR>
function! ToggleColorPreview() abort function! ToggleColorPreview() abort "{{{
if !exists('w:colorv_is_previewing') if !exists('w:colorv_is_previewing')
let w:colorv_is_previewing = 0 let w:colorv_is_previewing = 0
endif endif
@ -441,7 +443,8 @@ function! ToggleColorPreview() abort
execute 'ColorVClear' execute 'ColorVClear'
let w:colorv_is_previewing = 0 let w:colorv_is_previewing = 0
endif endif
endfunction endfunction "}}}
"}}} "}}}
" vim-instant-markdown{{{ " vim-instant-markdown{{{
@ -892,6 +895,11 @@ set wildmenu
set wildmode=longest:full,full set wildmode=longest:full,full
set wildignore+=/node_modules/,dist/ set wildignore+=/node_modules/,dist/
" Use ag over grep
if executable('ag')
set grepprg=ag\ --nogroup\ --nocolor\ --ignore\ node_modules
endif
set hidden set hidden
set number relativenumber set number relativenumber