diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index dc918b3..bb729b3 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -1,24 +1,28 @@
 call plug#begin('~/.config/nvim/plugged')
-Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+Plug 'roxma/nvim-yarp'
+Plug 'ncm2/ncm2'
 Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh' }
 
 Plug 'rhysd/vim-crystal'
 Plug 'elmcast/elm-vim'
+Plug 'ap/vim-css-color'
 
 Plug 'arcticicestudio/nord-vim'
-Plug 'ap/vim-css-color'
 
 Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
 Plug 'iamcco/markdown-preview.vim'
 call plug#end()
 
-set shiftwidth=4
-set expandtab
-set number
-set mouse=a
-set exrc
-set completeopt-=preview
-set signcolumn=yes
+set shiftwidth=4 " Make indents 4 chars wide
+set expandtab " Expand tabs into spaces
+set number " Set line numbers
+set mouse=a " Allow mouse
+set signcolumn=yes " Always show extra column
+
+autocmd BufEnter * call ncm2#enable_for_buffer() " Enable ncm2 for all buffers
+set completeopt=noinsert,menuone
+
+autocmd FileType crystal setlocal shiftwidth=2
 
 let g:LanguageClient_serverCommands = {
             \ 'haskell': ['hie', '--lsp'],
@@ -29,6 +33,5 @@ let g:LanguageClient_serverCommands = {
             \ 'javascript': ['javascript-typescript-stdio']
             \ }
 let g:deoplete#enable_at_startup = 1
-let g:LanguageClient_diagnosticsDisplay = {1: {"name": "Error","texthl": "ALEError","signText": ">>","signTexthl": "ALEErrorSign",},2: {"name": "Warning","texthl": "ALEWarning","signText": ">>","signTexthl": "ALEWarningSign",},3: {"name": "Information","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},4: {"name": "Hint","texthl": "ALEInfo","signText": ">>","signTexthl": "ALEInfoSign",},}
 
 colorscheme nord