diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..46ad99d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,15 @@
+[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
+[submodule "neovim/pack/vendor/start/nvim-lspconfig"]
+	path = neovim/pack/vendor/start/nvim-lspconfig
+	url = https://github.com/neovim/nvim-lspconfig
+[submodule "neovim/pack/vendor/start/nvim-tree"]
+	path = neovim/pack/vendor/start/nvim-tree
+	url = https://github.com/nvim-tree/nvim-tree.lua.git
diff --git a/bootstrap.sh b/bootstrap.sh
index f33f927..a9fa995 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,6 +3,10 @@
 # Current dir
 BASEDIR=$(pwd)
 
+# Update git submodules
+echo "Updating git submodules"
+git submodule init && git submodule update
+
 # ln the various files
 echo "Sym-linking the various config files"
 test -L $HOME/.gitignore || ln -f -s $BASEDIR/gitignore $HOME/.gitignore
@@ -35,12 +39,20 @@ chmod 640 $HOME/.gnupg/dirmngr.conf
 chmod 640 $HOME/.gnupg/gpg.conf
 
 echo "Setting up NeoVim"
-test -d $HOME/.config/nvim || mkdir -p $HOME/.config/nvim
-test -d $HOME/.local/share/nvim || mkdir -p $HOME/.local/share/nvim
-test -L $HOME/.config/nvim/init.lua || ln -f -s $BASEDIR/neovim/init.lua $HOME/.config/nvim/init.lua
+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 compatibility we shall copy the global gitconfig"
+# Clean up old vim configuration if it exists
+if [ -L "$HOME/.vimrc" ] || [ -f "$HOME/.vimrc" ]; then
+    echo "Removing old vim configuration"
+    rm -f $HOME/.vimrc
+fi
+if [ -L "$HOME/.vim" ] || [ -d "$HOME/.vim" ]; then
+    rm -rf $HOME/.vim
+fi
+
+# .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
 
 # Copy the progs into the local bin dir
diff --git a/neovim/init.lua b/neovim/init.lua
index cc1eeb5..15ed6bd 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -2,20 +2,20 @@
 My NeoVim configuration
 --]]
 
--- Plugins
-vim.pack.add({"https://github.com/lewis6991/gitsigns.nvim"})
-
--- nvim-tree recommends disabling netrw (vim’s file explorer)
+-- disable netrw at the very start of your init.lua
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
-vim.pack.add({"https://github.com/nvim-tree/nvim-tree.lua"})
-require("nvim-tree").setup()
+
+-- Plugins
+require('nvim-web-devicons').setup()
+-- require('oil').setup()
+require('nvim-tree').setup()
+require('gitsigns').setup()
+require('lspconfig').phpactor.setup({})
 
 -- Editor options
--- show line numbers
-vim.opt.number = true
+vim.wo.number = true
 
--- set spelling to British English
 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-lspconfig b/neovim/pack/vendor/start/nvim-lspconfig
new file mode 160000
index 0000000..3ad5627
--- /dev/null
+++ b/neovim/pack/vendor/start/nvim-lspconfig
@@ -0,0 +1 @@
+Subproject commit 3ad562700d0615818bf358268ac8914f6ce2b079
diff --git a/neovim/pack/vendor/start/nvim-tree b/neovim/pack/vendor/start/nvim-tree
new file mode 160000
index 0000000..2a268f6
--- /dev/null
+++ b/neovim/pack/vendor/start/nvim-tree
@@ -0,0 +1 @@
+Subproject commit 2a268f631da85e83b7a95291be589bcddfc785d8
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