From 5ad13bcd09c5f9783a6348cc96c74acd772f1120 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri, 13 Feb 2026 21:04:50 +0000
Subject: [PATCH] Initial tidy up of neovim config

---
 .gitmodules                                | 15 ---------------
 bootstrap.sh                               | 17 ++---------------
 neovim/init.lua                            | 15 +++++++--------
 neovim/pack/vendor/start/gitsigns.nvim     |  1 -
 neovim/pack/vendor/start/nvim-lspconfig    |  1 -
 neovim/pack/vendor/start/nvim-tree         |  1 -
 neovim/pack/vendor/start/nvim-web-devicons |  1 -
 neovim/pack/vendor/start/oil.nvim          |  1 -
 8 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 neovim/pack/vendor/start/gitsigns.nvim
 delete mode 160000 neovim/pack/vendor/start/nvim-lspconfig
 delete mode 160000 neovim/pack/vendor/start/nvim-tree
 delete mode 160000 neovim/pack/vendor/start/nvim-web-devicons
 delete mode 160000 neovim/pack/vendor/start/oil.nvim

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 46ad99d..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,15 +0,0 @@
-[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 a9fa995..4953206 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,10 +3,6 @@
 # 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
@@ -42,17 +38,8 @@ echo "Setting up NeoVim"
 test -d $HOME/.config/nvim && rm -rf $HOME/.config/nvim
 ln -s $BASEDIR/neovim $HOME/.config/nvim
 
-# 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"
+# .gitconfig gets edited by .extra so we won't symlink it, but copy it
+echo "For compatibility we shall 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 15ed6bd..6513254 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -2,20 +2,19 @@
 My NeoVim configuration
 --]]
 
--- disable netrw at the very start of your init.lua
+-- Plugins
+-- nvim-tree recommends disabling netrw (vim’s file explorer)
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
+--require("nvim-tree").setup()
 
--- Plugins
-require('nvim-web-devicons').setup()
--- require('oil').setup()
-require('nvim-tree').setup()
-require('gitsigns').setup()
-require('lspconfig').phpactor.setup({})
+--require('gitsigns').setup()
 
 -- Editor options
-vim.wo.number = true
+-- show line numbers
+vim.opt.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
deleted file mode 160000
index e784e5a..0000000
--- a/neovim/pack/vendor/start/gitsigns.nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e784e5a078f993f7218b8a857cb581d5b9ca42dc
diff --git a/neovim/pack/vendor/start/nvim-lspconfig b/neovim/pack/vendor/start/nvim-lspconfig
deleted file mode 160000
index 3ad5627..0000000
--- a/neovim/pack/vendor/start/nvim-lspconfig
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3ad562700d0615818bf358268ac8914f6ce2b079
diff --git a/neovim/pack/vendor/start/nvim-tree b/neovim/pack/vendor/start/nvim-tree
deleted file mode 160000
index 2a268f6..0000000
--- a/neovim/pack/vendor/start/nvim-tree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2a268f631da85e83b7a95291be589bcddfc785d8
diff --git a/neovim/pack/vendor/start/nvim-web-devicons b/neovim/pack/vendor/start/nvim-web-devicons
deleted file mode 160000
index c0cfc17..0000000
--- a/neovim/pack/vendor/start/nvim-web-devicons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c0cfc1738361b5da1cd0a962dd6f774cc444f856
diff --git a/neovim/pack/vendor/start/oil.nvim b/neovim/pack/vendor/start/oil.nvim
deleted file mode 160000
index 10fbfdd..0000000
--- a/neovim/pack/vendor/start/oil.nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 10fbfdd37b6904c0776c5db1a27ab47eecba335e