Replace Deoplete with Completor, cleanup vimrc

Signed-off-by: Tomas Slusny <[email protected]>

.gitmodules

@@ -68,9 +68,6 @@
 [submodule "vim/.vim/bundle/vim-javacomplete2"]
 	path = vim/.vim/bundle/vim-javacomplete2
 	url = https://github.com/artur-shaik/vim-javacomplete2
-[submodule "vim/.vim/bundle/deoplete.nvim"]
-	path = vim/.vim/bundle/deoplete.nvim
-	url = https://github.com/Shougo/deoplete.nvim
 [submodule "vim/.vim/bundle/yang.vim"]
 	path = vim/.vim/bundle/yang.vim
 	url = https://github.com/nathanalderson/yang.vim
@@ -119,3 +116,6 @@
 [submodule "zsh/.zsh/bundle/alias-tips"]
 	path = zsh/.zsh/bundle/alias-tips
 	url = https://github.com/djui/alias-tips
+[submodule "vim/.vim/bundle/completor.vim"]
+	path = vim/.vim/bundle/completor.vim
+	url = https://github.com/maralla/completor.vim

irssi/.irssi/config

@@ -54,10 +54,4 @@ statusbar = {
   };
 };
 
-keyboard = (
-  {
-    key = "^R";
-    id = "command";
-    data = "history_search ";
-  }
-);
+keyboard = ( { key = "^R"; id = "command"; data = "history_search "; } );

neovim/.config/nvim/ftplugin

@@ -0,0 +1 @@
+../../../vim/.vim/ftplugin

qutebrowser/.config/qutebrowser/qutebrowser.conf

@@ -922,7 +922,7 @@ cache-size =
 #     download button in the pdf.js viewer.
 #     Valid values: true, false
 #     Default: false
-allow-images = true
+allow-images = false
 allow-javascript = true
 allow-plugins = true
 webgl = true

vim/.vim/ftplugin/c.vim

@@ -0,0 +1 @@
+setlocal omnifunc=ccomplete#Complete

vim/.vim/ftplugin/css.vim

@@ -0,0 +1 @@
+setlocal omnifunc=csscomplete#CompleteCSS

vim/.vim/ftplugin/html.vim

@@ -0,0 +1,2 @@
+setlocal omnifunc=htmlcomplete#CompleteTags
+let g:syntastic_html_checkers = ['htmlhint']

vim/.vim/ftplugin/java.vim

@@ -0,0 +1,21 @@
+setlocal omnifunc=javacomplete#Complete
+let g:JavaComplete_ImportSortType = 'packageName'
+let g:JavaComplete_ImportOrder = ['*']
+set makeprg=mvn\ $*
+set errorformat=\[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m,
+      \\[%t%[A-Z]%#]\ %f:%l:\ %m,
+      \\%A%f:[%l\\,%c]\ %m,
+      \\%Csymbol%.%#:\ %m,
+      \\%Zlocation%.%#:\ %m,
+      \\%AEmbedded\ error:%.%#\ -\ %f:%l:\ %m,
+      \\%-Z\ %p^,
+      \\%A%f:%l:\ %m,
+      \\%-Z\ %p^,
+      \\%ARunning\ %f,
+      \\%+ZTests\ run%.%#FAILURE!%.%#,
+      \\%ARunning\ %f,
+      \\%C%.%#,
+      \\%+ZTests\ run%.%#FAILURE!%.%#,
+      \\%-G%.%#
+
+let g:completor_java_omni_trigger = '\w+$|[\w\)\]\}\\\'\"]+\.\w*$'

vim/.vim/ftplugin/javascript.vim

@@ -0,0 +1 @@
+setlocal omnifunc=javascriptcomplete#CompleteJS

vim/.vim/ftplugin/markdown.vim

@@ -0,0 +1,2 @@
+setlocal omnifunc=htmlcomplete#CompleteTags
+

vim/.vim/ftplugin/python.vim

@@ -0,0 +1 @@
+setlocal omnifunc=pythoncomplete#Complete

vim/.vim/ftplugin/typescript.vim

@@ -0,0 +1,7 @@
+" Deoplete plugin integration
+let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{})
+let g:deoplete#omni#input_patterns.typescript = ['[^. \t0-9]\.\w*']
+
+" Tsuquyomi and synstatic integration
+let g:tsuquyomi_disable_quickfix = 1
+let g:syntastic_typescript_checkers = ['tsuquyomi']

vim/.vim/ftplugin/vim.vim

@@ -0,0 +1 @@
+let g:syntastic_vim_checkers = ['vint']

vim/.vim/ftplugin/xml.vim

@@ -0,0 +1 @@
+setlocal omnifunc=xmlcomplete#CompleteTags

vim/.vimrc

@@ -248,15 +248,6 @@
         \|   exe 'normal! g`"zvzz'
         \| endif
 
-  " Enable omni completion. (Ctrl-X Ctrl-O)
-  autocmd VimRc FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
-  autocmd VimRc FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
-  autocmd VimRc FileType python setlocal omnifunc=pythoncomplete#Complete
-  autocmd VimRc FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
-  autocmd VimRc FileType css set omnifunc=csscomplete#CompleteCSS
-  autocmd VimRc FileType c set omnifunc=ccomplete#Complete
-  autocmd VimRc FileType java set omnifunc=javacomplete#Complete
-
   " use syntax complete if nothing else available
   autocmd VimRc Filetype *
         \	if &omnifunc == "" |
@@ -368,10 +359,12 @@
   let g:EditorConfig_core_mode = 'external_command' " Speed up editorconfig plugin
   let g:EditorConfig_exclude_patterns = ['fugitive://.*'] " Fix EditorConfig for fugitive
 
-  " Completion
-  if has('nvim') && has('python3')
-    call deoplete#enable()
-  endif
+  " Completor and UltiSnips
+  let g:UltiSnipsExpandTrigger="<c-j>"
+  let g:completor_auto_trigger = 0
+  inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<C-x>\<C-u>\<C-p>"
+	inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+	inoremap <expr> <cr> pumvisible() ? "\<C-y>\<cr>" : "\<cr>"
 
   " Fugitive
   autocmd VimRc BufReadPost fugitive://* set bufhidden=delete
@@ -388,8 +381,6 @@
   nmap <silent> <leader>mf :SyntasticCheck<CR>
   nmap <silent> <leader>mF :make<CR>
   let g:syntastic_always_populate_loc_list = 1
-  let g:syntastic_vim_checkers = ['vint']
-  let g:syntastic_html_checkers = ['htmlhint']
   set statusline+=%#warningmsg#%{SyntasticStatuslineFlag()}%*
 
   " Vim Test
@@ -398,37 +389,6 @@
   nmap <silent> <leader>mT :TestSuite<CR>
   nmap <silent> <leader>mtt :TestNearest<CR>
 
-  " Language specific {{{
-    " TypeScript
-    let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{})
-    let g:deoplete#omni#input_patterns.typescript = ['[^. \t0-9]\.\w*']
-    let g:tsuquyomi_disable_quickfix = 1
-    let g:syntastic_typescript_checkers = ['tsuquyomi']
-
-    " Java
-    autocmd VimRc FileType java :call EnableJava()
-    function! EnableJava()
-      let g:JavaComplete_ImportSortType = 'packageName'
-      let g:JavaComplete_ImportOrder = ['*']
-      set makeprg=mvn\ $*
-      set errorformat=\[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m,
-            \\[%t%[A-Z]%#]\ %f:%l:\ %m,
-            \\%A%f:[%l\\,%c]\ %m,
-            \\%Csymbol%.%#:\ %m,
-            \\%Zlocation%.%#:\ %m,
-            \\%AEmbedded\ error:%.%#\ -\ %f:%l:\ %m,
-            \\%-Z\ %p^,
-            \\%A%f:%l:\ %m,
-            \\%-Z\ %p^,
-            \\%ARunning\ %f,
-            \\%+ZTests\ run%.%#FAILURE!%.%#,
-            \\%ARunning\ %f,
-            \\%C%.%#,
-            \\%+ZTests\ run%.%#FAILURE!%.%#,
-            \\%-G%.%#
-    endfunction
-  " }}}
-
   " FZF {{{
     " rg command suffix, [options]
     function! VRg_raw(command_suffix, ...)

zsh/.zshrc

@@ -14,10 +14,6 @@
 
 # Aliases & functions {{{
 
-  # Switch to neovim
-  alias vim='nvim'
-  alias vimdiff='nvim -d'
-
   # Alias xclip copy/paste
   if command -v xclip >/dev/null 2>&1; then
     alias xcopy='xclip -i -selection clipboard'