diff --git a/.vim/indent/c.vim b/.config/vim/indent/c.vim
similarity index 100%
rename from .vim/indent/c.vim
rename to .config/vim/indent/c.vim
diff --git a/.vim/indent/cpp.vim b/.config/vim/indent/cpp.vim
similarity index 100%
rename from .vim/indent/cpp.vim
rename to .config/vim/indent/cpp.vim
diff --git a/.vim/indent/css.vim b/.config/vim/indent/css.vim
similarity index 100%
rename from .vim/indent/css.vim
rename to .config/vim/indent/css.vim
diff --git a/.vim/indent/html.vim b/.config/vim/indent/html.vim
similarity index 100%
rename from .vim/indent/html.vim
rename to .config/vim/indent/html.vim
diff --git a/.vim/indent/javascript.vim b/.config/vim/indent/javascript.vim
similarity index 100%
rename from .vim/indent/javascript.vim
rename to .config/vim/indent/javascript.vim
diff --git a/.vim/indent/python.vim b/.config/vim/indent/python.vim
similarity index 100%
rename from .vim/indent/python.vim
rename to .config/vim/indent/python.vim
diff --git a/.vim/indent/rust.vim b/.config/vim/indent/rust.vim
similarity index 100%
rename from .vim/indent/rust.vim
rename to .config/vim/indent/rust.vim
diff --git a/.vim/indent/sh.vim b/.config/vim/indent/sh.vim
similarity index 100%
rename from .vim/indent/sh.vim
rename to .config/vim/indent/sh.vim
diff --git a/.vim/indent/sql.vim b/.config/vim/indent/sql.vim
similarity index 100%
rename from .vim/indent/sql.vim
rename to .config/vim/indent/sql.vim
diff --git a/.vim/indent/vue.vim b/.config/vim/indent/vue.vim
similarity index 100%
rename from .vim/indent/vue.vim
rename to .config/vim/indent/vue.vim
diff --git a/.vimrc b/.config/vim/vimrc
similarity index 98%
rename from .vimrc
rename to .config/vim/vimrc
index b1d88e4..ead4c44 100644
--- a/.vimrc
+++ b/.config/vim/vimrc
@@ -4,7 +4,7 @@ filetype off
 " Install all plugins:
 " $ vim +PlugInstall
 
-call plug#begin('~/.vim/plugged')
+call plug#begin('~/.local/vim/plugged')
 Plug 'bling/vim-airline'             " Lean & mean status/tabline for vim that's light as air.
 Plug 'sjl/badwolf'                   " A Vim color scheme.
 Plug 'rust-lang/rust.vim'            " Vim configuration for Rust.
diff --git a/.gitignore b/.gitignore
index 300d96d..e45ea76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,6 @@ __pycache__/
 *$py.class
 
 # Vim
-.vim/plugged/*
-.vim/.netrwhist
 *.swp
 
 # Emacs
diff --git a/README.md b/README.md
index 95eafcd..dbed895 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,12 @@ yay -S cardpeek
 
 ## vim / neovim
 
+Compatibility workaround for NeoVim:
+
+```
+ln -s .config/vim/vimrc .vimrc
+```
+
 Plugins are managed by `vim-plug`, which is installed from the AUR.
 
 ``` sh