diff --git a/.gitmodules b/.gitmodules
index 420fdc0..7e0bacf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,12 @@
 [submodule "vim/bundle/gruvbox"]
 	path = vim/bundle/gruvbox
 	url = https://github.com/morhetz/gruvbox.git
+[submodule "neovim/pack/vendor/start/oil.nvim"]
+	path = neovim/pack/vendor/start/oil.nvim
+	url = https://github.com/stevearc/oil.nvim
+[submodule "neovim/pack/vendor/start/nvim-web-devicons"]
+	path = neovim/pack/vendor/start/nvim-web-devicons
+	url = https://github.com/nvim-tree/nvim-web-devicons
+[submodule "neovim/pack/vendor/start/gitsigns.nvim"]
+	path = neovim/pack/vendor/start/gitsigns.nvim
+	url = https://github.com/lewis6991/gitsigns.nvim
diff --git a/bootstrap.sh b/bootstrap.sh
index d0515c0..f8b077b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -35,6 +35,10 @@ test -d $HOME/.vim && rm -rf $HOME/.vim
 ln -s $BASEDIR/vim $HOME/.vim
 test -L $HOME/.vimrc || ln -f -s $HOME/.vim/vimrc $HOME/.vimrc
 
+echo "Setting up NeoVim"
+test -d $HOME/.config/nvim && rm -rf $HOME/.config/nvim
+ln -s $BASEDIR/neovim $HOME/.config/nvim
+
 # .gitconfig gets edited by .extra so we won’t symlink it, but copy it
 echo "For compatability we chall copy the global gitconfig"
 cp $BASEDIR/gitconfig $HOME/.gitconfig
diff --git a/neovim/init.lua b/neovim/init.lua
new file mode 100644
index 0000000..7b98b3f
--- /dev/null
+++ b/neovim/init.lua
@@ -0,0 +1,10 @@
+--[[
+My NeoVim configuration
+--]]
+
+require('nvim-web-devicons').setup()
+require('oil').setup()
+require('gitsigns').setup()
+
+vim.opt.spelllang = 'en_gb'
+vim.opt.spell = true
diff --git a/neovim/pack/vendor/start/gitsigns.nvim b/neovim/pack/vendor/start/gitsigns.nvim
new file mode 160000
index 0000000..e784e5a
--- /dev/null
+++ b/neovim/pack/vendor/start/gitsigns.nvim
@@ -0,0 +1 @@
+Subproject commit e784e5a078f993f7218b8a857cb581d5b9ca42dc
diff --git a/neovim/pack/vendor/start/nvim-web-devicons b/neovim/pack/vendor/start/nvim-web-devicons
new file mode 160000
index 0000000..c0cfc17
--- /dev/null
+++ b/neovim/pack/vendor/start/nvim-web-devicons
@@ -0,0 +1 @@
+Subproject commit c0cfc1738361b5da1cd0a962dd6f774cc444f856
diff --git a/neovim/pack/vendor/start/oil.nvim b/neovim/pack/vendor/start/oil.nvim
new file mode 160000
index 0000000..10fbfdd
--- /dev/null
+++ b/neovim/pack/vendor/start/oil.nvim
@@ -0,0 +1 @@
+Subproject commit 10fbfdd37b6904c0776c5db1a27ab47eecba335e
diff --git a/vim/autoload/vim-pathogen b/vim/autoload/vim-pathogen
index 8c91196..ac4dd94 160000
--- a/vim/autoload/vim-pathogen
+++ b/vim/autoload/vim-pathogen
@@ -1 +1 @@
-Subproject commit 8c91196cfd9c8fe619f35fac6f2ac81be10677f8
+Subproject commit ac4dd9494fa9008754e49dff85bff1b5746c89b4
diff --git a/vim/bundle/delimitMate b/vim/bundle/delimitMate
index 8bc47fd..537a1da 160000
--- a/vim/bundle/delimitMate
+++ b/vim/bundle/delimitMate
@@ -1 +1 @@
-Subproject commit 8bc47fd1c40cdad9ea1f36c0cf13592c70ea65e9
+Subproject commit 537a1da0fa5eeb88640425c37e545af933c56e1b
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
index 15445be..fbb71fc 160000
--- a/vim/bundle/nerdtree
+++ b/vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 15445be5fb2559829ac7a1f05af5d713586e8ec9
+Subproject commit fbb71fcd90602e3ec77f40b864b5f9b437c496c5
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
index c2c6a07..8d5e37c 160000
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit c2c6a075113adbfcc4f1ad5b1c0200a0d35ceeb6
+Subproject commit 8d5e37c29cf5952fbf300b9230bffe424c61a488
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
index 3439f99..8c8cdf4 160000
--- a/vim/bundle/vim-fugitive
+++ b/vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 3439f999b138254e4bb56187fc91f91f545b4b12
+Subproject commit 8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc
diff --git a/vim/bundle/vim-sensible b/vim/bundle/vim-sensible
index 9e91be7..0ce2d84 160000
--- a/vim/bundle/vim-sensible
+++ b/vim/bundle/vim-sensible
@@ -1 +1 @@
-Subproject commit 9e91be7e0fb42949831fe3161ef583363648aa58
+Subproject commit 0ce2d843d6f588bb0c8c7eec6449171615dc56d9