X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=eae73f731b8ce59f9d9c803ddc04b3ee151f3702;hp=019c81e94a4b022f75589c320a4d7110d8dbb25a;hb=db4b6f6deafef656c17f410235d59925c55313fa;hpb=c7d02493ef0793e24f6c394952b87ef24dad6015

diff --git a/init.vim b/init.vim
index 019c81e..eae73f7 100644
--- a/init.vim
+++ b/init.vim
@@ -15,6 +15,7 @@ set scrolloff=5
 
 set encoding=utf-8
 
+set fillchars=vert:│,fold:\ 
 set listchars=tab:»­,trail:·,eol:$
 set virtualedit=block
 
@@ -32,6 +33,8 @@ set incsearch
 set hlsearch
 
 set foldcolumn=4
+set foldlevelstart=20
+
 set colorcolumn=+1
 set mouse=a
 set wildmenu
@@ -128,7 +131,6 @@ au InsertEnter * call deoplete#enable()
   "au FileType tex          call pencil#init()
 "augroup END
 
-let g:vim_markdown_folding_disabled=1
 let g:vim_markdown_frontmatter=1
 let g:vim_markdown_math=1
 
@@ -136,11 +138,11 @@ let g:vim_markdown_math=1
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some filetype-specific settings
 
-au FileType text,markdown,mail,tex,gitcommit,mediawiki,vimwiki setlocal spell
-au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki setlocal formatoptions+=n
+au FileType text,markdown,asciidoc,mail,gitcommit,mediawiki,vimwiki,tex setlocal spell
+au FileType text,markdown,asciidoc,mail,gitcommit,mediawiki,vimwiki setlocal formatoptions+=n
 au Filetype mail setlocal formatoptions+=o
 " Add | for block quotation, such that gq respects it
-au Filetype mail setlocal comments+=n:\|
+au Filetype mail setlocal comments+=n:\|,
 
 au Filetype go setlocal shiftwidth=8 tabstop=8 noexpandtab
 au Filetype tex setlocal shiftwidth=2 tabstop=2
@@ -195,19 +197,6 @@ let g:vimwiki_global_ext = 0
 " Java completion
 au FileType java setlocal omnifunc=javacomplete#Complete
 au FileType java JCEnable
-" See https://github.com/artur-shaik/vim-Javacomplete2
-" <C-j>ji <leader>ji
-au FileType java nmap <F4> <Plug>(JavaComplete-Imports-AddSmart)
-au FileType java imap <F4> <Plug>(JavaComplete-Imports-AddSmart)
-" <C-j>ii <leader>jii
-au FileType java nmap <F5> <Plug>(JavaComplete-Imports-Add)
-au FileType java imap <F5> <Plug>(JavaComplete-Imports-Add)
-" <C-j>I <leader>jI
-au FileType java nmap <F6> <Plug>(JavaComplete-Imports-AddMissing)
-au FileType java imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
-" <C-j>R <leader>jR
-au FileType java nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
-au FileType java imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 
 let g:VimMailContactsProvider=['khard']
 let g:VimMailContactsCommands={
@@ -216,6 +205,92 @@ let g:VimMailContactsCommands={
         \'sync': "/bin/true"}
   \}
 
+let g:vimtex_fold_enabled = 1
+let g:vimtex_fold_levelmarker = '➜'
+
+" The denite settings are largely stolen from spacevim
+let s:denite_options = {
+      \ 'default' : {
+      \ 'winheight' : 15,
+      \ 'mode' : 'insert',
+      \ 'start_filter' : 1,
+      \ 'quit' : 1,
+      \ 'highlight_matched_char' : 'MoreMsg',
+      \ 'highlight_matched_range' : 'MoreMsg',
+      \ 'direction': 'rightbelow',
+      \ }}
+
+augroup spacevim_layer_denite
+  autocmd!
+  autocmd FileType denite call s:denite_my_settings()
+augroup END
+
+function! s:denite_my_settings() abort
+  nnoremap <silent><buffer><expr> i
+        \ denite#do_map('open_filter_buffer')
+  nnoremap <silent><buffer><expr> '
+        \ denite#do_map('toggle_select').'j'
+  nnoremap <silent><buffer><expr> q
+        \ denite#do_map('quit')
+  nnoremap <silent><buffer><expr> <C-t>
+        \ denite#do_map('do_action', 'tabopen')
+  nnoremap <silent><buffer><expr> <C-v>
+        \ denite#do_map('do_action', 'vsplit')
+  nnoremap <silent><buffer><expr> <C-s>
+        \ denite#do_map('do_action', 'split')
+  nnoremap <silent><buffer><expr> <CR>
+        \ denite#do_map('do_action')
+  nnoremap <silent><buffer><expr> p
+        \ denite#do_map('do_action', 'preview')
+  nnoremap <silent><buffer><Tab> j
+  nnoremap <silent><buffer><S-Tab> k
+endfunction
+
+" FIND and GREP COMMANDS
+if executable('rg')
+  " Ripgrep command on grep source
+  call denite#custom#var('grep', 'command', ['rg'])
+  call denite#custom#var('grep', 'default_opts',
+        \ ['--vimgrep', '--no-heading'])
+  call denite#custom#var('grep', 'recursive_opts', [])
+  call denite#custom#var('grep', 'pattern_opt', ['--regexp'])
+  call denite#custom#var('grep', 'separator', ['--'])
+  call denite#custom#var('grep', 'final_opts', [])
+endif
+
+let s:insert_mode_mappings = [
+      \ ['jk', '<denite:enter_mode:normal>', 'noremap'],
+      \ ['<Tab>', '<denite:move_to_next_line>', 'noremap'],
+      \ ['<C-j>', '<denite:move_to_next_line>', 'noremap'],
+      \ ['<S-tab>', '<denite:move_to_previous_line>', 'noremap'],
+      \ ['<C-k>', '<denite:move_to_previous_line>', 'noremap'],
+      \ ['<C-t>', '<denite:do_action:tabopen>', 'noremap'],
+      \ ['<C-v>', '<denite:do_action:vsplit>', 'noremap'],
+      \ ['<C-s>', '<denite:do_action:split>', 'noremap'],
+      \ ['<Esc>', '<denite:enter_mode:normal>', 'noremap'],
+      \ ['<C-N>', '<denite:assign_next_matched_text>', 'noremap'],
+      \ ['<C-P>', '<denite:assign_previous_matched_text>', 'noremap'],
+      \ ['<Up>', '<denite:assign_previous_text>', 'noremap'],
+      \ ['<Down>', '<denite:assign_next_text>', 'noremap'],
+      \ ['<C-Y>', '<denite:redraw>', 'noremap'],
+      \ ]
+
+let s:normal_mode_mappings = [
+      \ ["'", '<denite:toggle_select_down>', 'noremap'],
+      \ ['<C-n>', '<denite:jump_to_next_source>', 'noremap'],
+      \ ['<C-p>', '<denite:jump_to_previous_source>', 'noremap'],
+      \ ['<Tab>', '<denite:move_to_next_line>', 'noremap'],
+      \ ['<C-j>', '<denite:move_to_next_line>', 'noremap'],
+      \ ['<S-tab>', '<denite:move_to_previous_line>', 'noremap'],
+      \ ['<C-k>', '<denite:move_to_previous_line>', 'noremap'],
+      \ ['gg', '<denite:move_to_first_line>', 'noremap'],
+      \ ['<C-t>', '<denite:do_action:tabopen>', 'noremap'],
+      \ ['<C-v>', '<denite:do_action:vsplit>', 'noremap'],
+      \ ['<C-s>', '<denite:do_action:split>', 'noremap'],
+      \ ['q', '<denite:quit>', 'noremap'],
+      \ ['r', '<denite:redraw>', 'noremap'],
+      \ ]
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 runtime keymaps.vim