diff --git a/bootstrap.sh b/bootstrap.sh
index 4953206..f33f927 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -35,8 +35,9 @@ chmod 640 $HOME/.gnupg/dirmngr.conf
 chmod 640 $HOME/.gnupg/gpg.conf
 
 echo "Setting up NeoVim"
-test -d $HOME/.config/nvim && rm -rf $HOME/.config/nvim
-ln -s $BASEDIR/neovim $HOME/.config/nvim
+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
 
 # .gitconfig gets edited by .extra so we won't symlink it, but copy it
 echo "For compatibility we shall copy the global gitconfig"
diff --git a/neovim/init.lua b/neovim/init.lua
index 6513254..cc1eeb5 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -3,12 +3,13 @@ My NeoVim configuration
 --]]
 
 -- Plugins
+vim.pack.add({"https://github.com/lewis6991/gitsigns.nvim"})
+
 -- nvim-tree recommends disabling netrw (vim’s file explorer)
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
---require("nvim-tree").setup()
-
---require('gitsigns').setup()
+vim.pack.add({"https://github.com/nvim-tree/nvim-tree.lua"})
+require("nvim-tree").setup()
 
 -- Editor options
 -- show line numbers