diff --git a/agignore b/agignore
deleted file mode 100644
index 294e220..0000000
--- a/agignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.git
-coverage*
-.dockerignore
-.DS_Store
-.idea
-node_modules/
-dist
-target
diff --git a/gvimrc b/ginit.vim
similarity index 91%
rename from gvimrc
rename to ginit.vim
index a0e09d3..67c71bb 100644
--- a/gvimrc
+++ b/ginit.vim
@@ -1,5 +1,5 @@
 " to allow specific fonts for specific OSes
-source ~/.gvimrc_local
+source ~/.config/nvim/glocal.vim
 
 set lines=65
 set columns=120
diff --git a/vimrc b/init.vim
similarity index 61%
rename from vimrc
rename to init.vim
index 7e00a51..c78f915 100644
--- a/vimrc
+++ b/init.vim
@@ -1,5 +1,5 @@
 " set the directory where my vimrc git project is located
-source ~/.vimrc_local
+source ~/.config/nvim/local.vim
 
 " it is a big fat key, after all
 " N.B. should come before plugins and plugin specific settings
@@ -19,12 +19,6 @@ source lsp.vim
 source autoformat.vim
 exec "cd " . oldwd
 
-" turn on file type plugins
-filetype plugin indent on
-" turn off compatibility mode
-set nocompatible
-" turn on syntax support
-syntax on
 " set up a line number on the current line but relative above and below to help
 " with motion commands
 set number
@@ -91,38 +85,5 @@ set pastetoggle=<F2>
 " save when moving away
 au FocusLost * :wa
 
-" open is OS X only, the closest equiv in line, xdg-open, doesn't allow an
-" argument for speciying a particular app
-if has('gui_macvim')
-    """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-    " Open current file with app given
-    """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-    function! s:OpenWith(appname)
-        noautocmd silent execute "!open -a \"" . a:appname . "\" " . expand("%:p")
-        if v:shell_error
-            echohl Error
-            echon "Problem opening the file."
-            echohl Normal
-        endif
-    endfunction
-
-    command! -bar -nargs=1 OpenWith call s:OpenWith(<f-args>)
-endif
-
-if has("gui_macvim")
-    let narrows = ['text', 'markdown']
-    " from the help, recommended for widest possible
-    " for text, narrow width to make side to side scanning easier
-    autocmd BufEnter * if index(narrows, &ft) >= 0 | set columns=120 | else | set columns=9999 | endif
-endif
-
 " make sure to set TERM to xterm-256color in terminal program or app
-colorscheme slate
-" set this here for terminal sessions, also set in gvimrc for graphical sessions
-hi CursorLine guibg=Grey10
-
-" fix for gundo with newer versions of python
-if has('python3')
-    let g:gundo_prefer_python3 = 1          " anything else breaks on Ubuntu 16.04+
-endif
-
+colorscheme desert
diff --git a/plug.vim b/plug.vim
index 3775b9c..b9289c3 100644
--- a/plug.vim
+++ b/plug.vim
@@ -1,4 +1,4 @@
-call plug#begin("~/.vim/plugged")
+call plug#begin("~/.config/nvim/plugged")
 
 " look for .editorconfig and merge into vim settings
 Plug 'editorconfig/editorconfig-vim'
@@ -36,10 +36,8 @@ Plug 'drmikehenry/vim-fontsize'
 Plug 'google/vim-jsonnet'
 " support for racer
 Plug 'racer-rust/vim-racer'
-" completions for JS
-"Plug 'marijnh/tern_for_vim'
-" completion engine, needed to expose racer and tern
-Plug 'valloric/youcompleteme'
+" completion using racer
+Plug 'roxma/nvim-cm-racer'
 " groovy syntax and indent
 Plug 'vim-scripts/groovy.vim'
 Plug 'vim-scripts/groovyindent-unix'
@@ -48,6 +46,8 @@ Plug 'autozimu/LanguageClient-neovim', {'tag': 'binary-*-x86_64-unknown-linux-mu
 " auto format all the things
 " https://github.com/Chiel92/vim-autoformat
 Plug 'Chiel92/vim-autoformat'
+" auto-completion framework
+Plug 'roxma/nvim-completion-manager'
 
 " All of your Plugins must be added before the following line
 call plug#end()            " required