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