diff --git a/home/.config/nvim/autoload/plug.vim b/home/.config/nvim/autoload/plug.vim
new file mode 120000
index 0000000..fdac7be
--- /dev/null
+++ b/home/.config/nvim/autoload/plug.vim
@@ -0,0 +1 @@
+../../../../vim-plug/plug.vim
\ No newline at end of file
diff --git a/home/.vim/ftdetect/filetypes.vim b/home/.config/nvim/ftdetect/filetypes.vim
similarity index 100%
rename from home/.vim/ftdetect/filetypes.vim
rename to home/.config/nvim/ftdetect/filetypes.vim
diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim
index f182e5b..92743b1 100644
--- a/home/.config/nvim/init.vim
+++ b/home/.config/nvim/init.vim
@@ -1,3 +1,83 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath = &runtimepath
-source ~/.vimrc
+" Basic display
+set number
+set colorcolumn=80
+
+" Persistent undo
+set undofile
+set undolevels=4096
+set undoreload=16384
+
+" Search
+set ignorecase
+
+" Autoload settings from file
+set modeline
+
+" Use system clipboard
+set clipboard=unnamedplus
+
+" Jump to the last position
+if has("autocmd")
+  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
+    \| exe "normal! g`\"" | endif
+endif
+
+call plug#begin('~/.local/share/nvim/plugged')
+
+" Per-project vim settings
+Plug 'MarcWeber/vim-addon-local-vimrc'
+
+" Tagbar
+Plug 'majutsushi/tagbar'
+nmap <F8> :TagbarToggle<CR>
+
+" Snippets
+Plug 'SirVer/ultisnips'
+let g:UltiSnipsExpandTrigger = '<tab>'
+let g:UltiSnipsJumpForwardTrigger = '<tab>'
+let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
+Plug 'honza/vim-snippets'
+
+" Airline
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+let g:airline_powerline_fonts = 1
+let g:airline_solarized_bg='dark'
+let g:airline_theme='solarized'
+
+" Trailing whitespace highlighting
+Plug 'ntpeters/vim-better-whitespace'
+
+" Markdown live preview
+Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
+
+" Syntax highlighting/Language support
+Plug 'ElmCast/elm-vim', { 'for': 'elm' }
+Plug 'Glench/Vim-Jinja2-Syntax', { 'for': 'jinja' }
+Plug 'cespare/vim-toml', { 'for': 'toml' }
+Plug 'fatih/vim-go', { 'for': 'go', 'do': ':GoUpdateBinaries' }
+Plug 'mechatroner/rainbow_csv'
+Plug 'posva/vim-vue', { 'for': 'vue' }
+Plug 'sirtaj/vim-openscad', { 'for': 'openscad' }
+
+" LaTeX helpers
+Plug 'lervag/vimtex'
+let g:tex_flavor='latex'
+let g:vimtex_view_method='zathura'
+set conceallevel=1
+let g:tex_conceal='abdmg'
+" this disables some helful warnings that often have a reason why I ignore them
+let g:vimtex_quickfix_ignore_filters = [
+  \'Underfull \\hbox (badness [0-9]*) in paragraph at lines',
+  \'Overfull \\hbox ([0-9]*.[0-9]*pt too wide) in paragraph at lines',
+  \'Package hyperref Warning: Token not allowed in a PDF string',
+  \'Package typearea Warning: Bad type area settings!',
+  \]
+command Vtc VimtexCompile
+
+" Color schemes
+Plug 'altercation/vim-colors-solarized'
+call plug#end()
+
+set background=dark
+silent! colorscheme solarized
diff --git a/home/.vim/autoload/plug.vim b/home/.vim/autoload/plug.vim
deleted file mode 120000
index 710577f..0000000
--- a/home/.vim/autoload/plug.vim
+++ /dev/null
@@ -1 +0,0 @@
-../../../vim-plug/plug.vim
\ No newline at end of file
diff --git a/home/.vim/undo/.gitkeep b/home/.vim/undo/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/home/.vimrc b/home/.vimrc
deleted file mode 100644
index ae631de..0000000
--- a/home/.vimrc
+++ /dev/null
@@ -1,84 +0,0 @@
-" Basic display
-set number
-set colorcolumn=80
-
-" Persistent undo
-set undofile
-set undodir=$HOME/.vim/undo
-set undolevels=4096
-set undoreload=16384
-
-" Search
-set ignorecase
-
-" Autoload settings from file
-set modeline
-
-" Use system clipboard
-set clipboard=unnamedplus
-
-" Jump to the last position
-if has("autocmd")
-  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
-    \| exe "normal! g`\"" | endif
-endif
-
-call plug#begin('~/.vim/plugged')
-
-" Per-project vim settings
-Plug 'MarcWeber/vim-addon-local-vimrc'
-
-" Tagbar
-Plug 'majutsushi/tagbar'
-nmap <F8> :TagbarToggle<CR>
-
-" Snippets
-Plug 'SirVer/ultisnips'
-let g:UltiSnipsExpandTrigger = '<tab>'
-let g:UltiSnipsJumpForwardTrigger = '<tab>'
-let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
-Plug 'honza/vim-snippets'
-
-" Airline
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-let g:airline_powerline_fonts = 1
-let g:airline_solarized_bg='dark'
-let g:airline_theme='solarized'
-
-" Trailing whitespace highlighting
-Plug 'ntpeters/vim-better-whitespace'
-
-" Markdown live preview
-Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
-
-" Syntax highlighting/Language support
-Plug 'ElmCast/elm-vim', { 'for': 'elm' }
-Plug 'Glench/Vim-Jinja2-Syntax', { 'for': 'jinja' }
-Plug 'cespare/vim-toml', { 'for': 'toml' }
-Plug 'fatih/vim-go', { 'for': 'go', 'do': ':GoUpdateBinaries' }
-Plug 'mechatroner/rainbow_csv'
-Plug 'posva/vim-vue', { 'for': 'vue' }
-Plug 'sirtaj/vim-openscad', { 'for': 'openscad' }
-
-" LaTeX helpers
-Plug 'lervag/vimtex'
-let g:tex_flavor='latex'
-let g:vimtex_view_method='zathura'
-set conceallevel=1
-let g:tex_conceal='abdmg'
-" this disables some helful warnings that often have a reason why I ignore them
-let g:vimtex_quickfix_ignore_filters = [
-  \'Underfull \\hbox (badness [0-9]*) in paragraph at lines',
-  \'Overfull \\hbox ([0-9]*.[0-9]*pt too wide) in paragraph at lines',
-  \'Package hyperref Warning: Token not allowed in a PDF string',
-  \'Package typearea Warning: Bad type area settings!',
-  \]
-command Vtc VimtexCompile
-
-" Color schemes
-Plug 'altercation/vim-colors-solarized'
-call plug#end()
-
-set background=dark
-silent! colorscheme solarized