From ef76c7d4628d035bba788f081e641ade6ea62238 Mon Sep 17 00:00:00 2001 From: crater2150 Date: Wed, 25 Jul 2018 14:15:00 +0200 Subject: [PATCH] Some plugins, mostly scala --- after/plugin/general.vim | 23 +++++++++++++++++++++++ init.vim | 7 +++---- packages.vim | 9 ++++++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/after/plugin/general.vim b/after/plugin/general.vim index 79222e4..603177c 100644 --- a/after/plugin/general.vim +++ b/after/plugin/general.vim @@ -1 +1,24 @@ let g:deoplete#enable_at_startup = 1 +if !exists('g:deoplete#omni#input_patterns') + let g:deoplete#omni#input_patterns = {} +endif + +" , : close popup and delete backword char. +inoremap deoplete#smart_close_popup()."\" +inoremap deoplete#smart_close_popup()."\" + +" : close popup and save indent. +inoremap =my_cr_function() +function! s:my_cr_function() abort + return deoplete#close_popup() . "\" +endfunction + +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ "\" + +function! s:check_back_space() + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~ '\s' +endfunction diff --git a/init.vim b/init.vim index a966c12..095040e 100644 --- a/init.vim +++ b/init.vim @@ -145,9 +145,9 @@ vmap gs :sort " Denite {{{ -call denite#custom#source('file_rec', 'matchers', ['matcher_cpsm']) -map gb :Denite -buffer-name=buffers buffer -map gf :Denite -buffer-name=files file_rec +"call denite#custom#source('file_rec', 'matchers', ['matcher_cpsm']) +"map gb :Denite -buffer-name=buffers buffer +"map gf :Denite -buffer-name=files file_rec " }}} @@ -165,5 +165,4 @@ let g:localvimrc_whitelist='/home/crater2150/code/.*' let g:localvimrc_sandbox=0 let g:UltiSnipsEnableSnipMate = 0 - " vi:foldmethod=marker sw=2 diff --git a/packages.vim b/packages.vim index c1cd836..01e5873 100644 --- a/packages.vim +++ b/packages.vim @@ -25,14 +25,18 @@ Plug 'vim-scripts/argtextobj.vim' Plug 'mhinz/vim-signify' Plug 'neomake/neomake' +Plug 'vim-syntastic/syntastic' +Plug 'Chiel92/vim-autoformat' " completion and snippets Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } -Plug 'nixprime/cpsm', { 'do': 'PY3=ON ./install.sh' } | Plug 'Shougo/denite.nvim' +"Plug 'nixprime/cpsm', { 'do': 'PY3=ON ./install.sh' } | Plug 'Shougo/denite.nvim' +Plug '/usr/share/vim/vimfiles' +Plug 'junegunn/fzf.vim' Plug 'bling/vim-airline' @@ -55,6 +59,8 @@ Plug 'derekwyatt/vim-fswitch' " other filetype specific plugins Plug 'derekwyatt/vim-scala' +Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' } + Plug 'jamessan/vim-gnupg' Plug 'powerman/vim-plugin-AnsiEsc' Plug 'tpope/vim-markdown' @@ -62,6 +68,7 @@ Plug 'LaTeX-Box-Team/LaTeX-Box' Plug 'ledger/vim-ledger' Plug 'elzr/vim-json' Plug 'kchmck/vim-coffee-script' +Plug 'gre/play2vim' function! BuildComposer(info) if a:info.status != 'unchanged' || a:info.force