diff --git a/apps/neovim/bindings.vim b/apps/neovim/bindings.vim
index 042ad10..ee142ee 100644
--- a/apps/neovim/bindings.vim
+++ b/apps/neovim/bindings.vim
@@ -132,6 +132,8 @@ nnoremap <C-j> :bprevious<CR>
 nnoremap <leader>c ciw
 nnoremap <leader>C ciW
 
+inoremap <silent> <expr> <CR> ncm2_ultisnips#expand_or("\<CR>", 'n')
+
 " bash-like deletion
 inoremap <C-BS> <C-w>
 inoremap <A-BS> <C-w>
diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim
index 88e432a..34a6b13 100644
--- a/apps/neovim/plugins.vim
+++ b/apps/neovim/plugins.vim
@@ -79,14 +79,26 @@ let g:ale_completion_enabled = 0
 
 " Plug 'neomake/neomake' " syntax checker
 
-if has('nvim')
-	Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-else
-	Plug 'Shougo/deoplete.nvim'
-	Plug 'roxma/nvim-yarp'
-	Plug 'roxma/vim-hug-neovim-rpc'
-endif
-let g:deoplete#enable_at_startup = 1
+" if has('nvim')
+" 	Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+" else
+" 	Plug 'Shougo/deoplete.nvim'
+" 	Plug 'roxma/nvim-yarp'
+" 	Plug 'roxma/vim-hug-neovim-rpc'
+" endif
+" let g:deoplete#enable_at_startup = 1
+
+" Plug 'neoclide/coc.nvim', {'do': { -> coc#util#install()}}
+
+Plug 'ncm2/ncm2'
+Plug 'roxma/nvim-yarp'
+
+Plug 'ncm2/ncm2-bufword'
+Plug 'ncm2/ncm2-tmux'
+Plug 'ncm2/ncm2-path'
+
+Plug 'ncm2/ncm2-ultisnips'
+Plug 'SirVer/ultisnips'
 
 Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding
 Plug 'junegunn/fzf.vim' " helpers for using fzf in vim
diff --git a/apps/neovim/settings.vim b/apps/neovim/settings.vim
index 4418d23..d694d70 100644
--- a/apps/neovim/settings.vim
+++ b/apps/neovim/settings.vim
@@ -9,6 +9,17 @@ let g:LanguageClient_serverCommands = {
     \ 'python': ['/usr/local/bin/pyls'],
     \ }
 
+" call deoplete#custom#source('javacomplete2', 'max_abbr_width', 1000)
+" call deoplete#custom#source('javacomplete2', 'max_kind_width', 1000)
+" call deoplete#custom#source('javacomplete2', 'max_menu_width', 1000)
+" 
+" call deoplete#custom#source('rust', 'max_kind_width', 1000)
+" call deoplete#custom#source('rust', 'max_abbr_width', 1000)
+" call deoplete#custom#source('rust', 'max_menu_width', 1000)
+
+autocmd BufEnter * call ncm2#enable_for_buffer()
+set completeopt=noinsert,menuone,noselect
+
 " fix neovim cursor
 let $NVIM_TUI_ENABLE_CURSOR_SHAPE = 1