diff --git a/init.vim b/init.vim
index 1ab4b97..b1cf983 100644
--- a/init.vim
+++ b/init.vim
@@ -1,12 +1,9 @@
 source /etc/vimrc
 
-execute pathogen#infect()
-
-autocmd BufReadPost *
-  \ if line("'\"") > 0 && line ("'\"") <= line("$") |
-  \   exe "normal! g'\"" |
-  \ endif
-
+"autocmd BufReadPost *
+"  \ if line("'\"") > 0 && line ("'\"") <= line("$") |
+"  \   exe "normal! g'\"" |
+"  \ endif
 
 set modeline
 set nowrap
@@ -21,53 +18,11 @@ set sw=2
 set ts=2
 set et
 
-if has('nvim')
-  colorscheme vim
-endif
-
 set smartcase
 "set smarttab
 set nohlsearch
 
-highlight ExtraWhitespace ctermbg=darkgreen guibg=darkgreen
-match ExtraWhitespace /\s\+$\| \+\ze\t/
-
-au FileType python setlocal ts=4 sw=4 et
-au FileType c setlocal ts=8 sw=8 noet
-au FileType asciidoctor setlocal wrap lbr iskeyword+=-
-
-au BufRead,BufNewFile */templates/*.html set filetype=htmldjango
-
-autocmd BufNewFile *.h       0r ~/.vim/template/h
-autocmd BufNewFile *.html    0r ~/.vim/template/html5
-autocmd BufNewFile *.mk      0r ~/.vim/template/make
-autocmd BufNewFile Makefile  0r ~/.vim/template/make
-autocmd BufNewFile *.hs      0r ~/.vim/template/hs
-autocmd BufNewFile *.adoc    0r ~/.vim/template/adoc
-
-autocmd BufNewFile,BufRead *.pio setfiletype pioasm
-
-highlight Pmenu ctermbg=235 guibg=black
-highlight Pmenu ctermfg=white guifg=white
-highlight PmenuSel ctermbg=235 guibg=black
-highlight PmenuSel ctermfg=yellow guifg=yellow
-
-" For Pandoc
-let g:pandoc#spell#enabled=0
-let g:pandoc#modules#disabled=["bibliographies"]
-let g:jsx_ext_required = 0
-
-" How many files / lines to remember.
-set viminfo='20,<1000,s100
-
 if has('nvim')
-	lua require("init")
-	lua require("config.tab")
-	lua require("config.black")
-	lua require("config.isort")
-	lua require("config.prettier")
-	lua require("config.lsp")
-	lua require("config.clang-format")
+  exec 'source' expand('~/.config/nvim/nvim.vim')
+  "source nvim.vim
 endif
-
-" EOF
diff --git a/nvim.vim b/nvim.vim
new file mode 100644
index 0000000..7953936
--- /dev/null
+++ b/nvim.vim
@@ -0,0 +1,44 @@
+execute pathogen#infect()
+
+colorscheme vim
+
+highlight ExtraWhitespace ctermbg=darkgreen guibg=darkgreen
+match ExtraWhitespace /\s\+$\| \+\ze\t/
+
+au FileType python setlocal ts=4 sw=4 et
+au FileType c setlocal ts=8 sw=8 noet
+au FileType asciidoctor setlocal wrap lbr iskeyword+=-
+
+au BufRead,BufNewFile */templates/*.html set filetype=htmldjango
+
+autocmd BufNewFile *.h       0r ~/.vim/template/h
+autocmd BufNewFile *.html    0r ~/.vim/template/html5
+autocmd BufNewFile *.mk      0r ~/.vim/template/make
+autocmd BufNewFile Makefile  0r ~/.vim/template/make
+autocmd BufNewFile *.hs      0r ~/.vim/template/hs
+autocmd BufNewFile *.adoc    0r ~/.vim/template/adoc
+
+autocmd BufNewFile,BufRead *.pio setfiletype pioasm
+
+highlight Pmenu ctermbg=235 guibg=black
+highlight Pmenu ctermfg=white guifg=white
+highlight PmenuSel ctermbg=235 guibg=black
+highlight PmenuSel ctermfg=yellow guifg=yellow
+
+" For Pandoc
+let g:pandoc#spell#enabled=0
+let g:pandoc#modules#disabled=["bibliographies"]
+let g:jsx_ext_required = 0
+
+" How many files / lines to remember.
+set viminfo='20,<1000,s100
+
+lua require("init")
+lua require("config.tab")
+lua require("config.black")
+lua require("config.isort")
+lua require("config.prettier")
+lua require("config.lsp")
+lua require("config.clang-format")
+
+" EOF