barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into tethys

Browse source
This commit is contained in:
Barak Michener 2018-01-03 00:20:07 -08:00
commit defb77ccee
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.vim/colors/baraknew.vim
View file

@ -414,3 +414,8 @@ hi CANCELED guifg=red guibg=NONE ctermfg=red ctermbg=NONE
hi STARTED guifg=yellow guibg=NONE ctermfg=yellow ctermbg=NONE
hi NEXT guifg=cyan guibg=NONE ctermfg=cyan ctermbg=NONE
hi DONE guifg=green guibg=NONE ctermfg=green ctermbg=NONE
" For denite.nvim
"
hi deniteMatchedChar guifg=#FFFFFF guibg=#5F87FF ctermfg=15 ctermbg=27

16
.vimrc
View file

@ -127,6 +127,7 @@ Plug 'whonore/coquille', {'branch': 'pathogen-bundle', 'for': 'coq'}
Plug 'mhartington/nvim-typescript'
Plug 'sheerun/vim-polyglot'
Plug 'Shougo/denite.nvim'
"Plug 'vim-scripts/fish-syntax'
"Plug 'kchmck/vim-coffee-script'
"Plug 'rodjek/vim-puppet'
@ -615,10 +616,17 @@ nnoremap <Leader>ss :SyntasticSetLoclist<CR>
nnoremap <Leader>fn :lnext<CR>
" Prev quickfix.
nnoremap <Leader>fp :lprev<CR>
" Ack (grep) for the word under the cursor.
nnoremap <Leader>aw :exe 'Ack ' . expand('<cword>')<CR>
" Ack prompt.
nnoremap <Leader>ac :Ack
nnoremap <silent> <Leader>aw :<C-u>DeniteCursorWord -mode=normal -buffer-name=search-buffer grep<CR>
call denite#custom#map('insert', '<Enter>', '<C-o>')
call denite#custom#var('grep', 'command', ['pt'])
call denite#custom#var('grep', 'default_opts',
\ ['--nogroup', '--nocolor', '--smart-case'])
call denite#custom#var('grep', 'recursive_opts', [])
call denite#custom#var('grep', 'pattern_opt', [])
call denite#custom#var('grep', 'separator', ['--'])
call denite#custom#var('grep', 'final_opts', [])
call denite#custom#option('search-buffer', 'highlight_matched_char', 'deniteMatchedChar')
nnoremap <silent> <Leader>g :<C-u>Denite -buffer-name=search-buffer grep<CR>
" For C++ -- A is a great plugin which allows you to jump from the c file to the
" header and vice-versa. Mneumonic here is headerheader.
nnoremap <Leader>hh :A<CR>