From d3b54ea92149877a0d6c754e99c67a967c48adf1 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonathan.barnes@buildempire.co.uk>
Date: Sun, 31 May 2026 20:33:23 +0100
Subject: [PATCH] Updated neovim config for v0.12

---
 bootstrap.sh                  |  2 ++
 neovim/config/diagnostics.lua | 18 ++++++++++++++++++
 neovim/config/init.lua        |  3 +++
 neovim/config/lsp.lua         |  1 +
 neovim/config/options.lua     |  8 ++++++++
 neovim/init.lua               | 27 +--------------------------
 6 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 neovim/config/diagnostics.lua
 create mode 100644 neovim/config/init.lua
 create mode 100644 neovim/config/lsp.lua
 create mode 100644 neovim/config/options.lua

diff --git a/bootstrap.sh b/bootstrap.sh
index 50b85a4..5fe041b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -38,6 +38,8 @@ 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/lua || mkdir -p $HOME/.config/nvim/lua
+test -L $HOME/.config/nvim/lua/config || ln -f -s $BASEDIR/neovim/config $HOME/.config/nvim/lua/config
 test -d $HOME/.config/nvim/lsp || mkdir -p $HOME/.config/nvim/lsp
 test -L $HOME/.config/nvim/lsp/phpactor.lua || ln -f -s $BASEDIR/neovim/lsp/phpactor.lua $HOME/.config/nvim/lsp/phpactor.lua
 
diff --git a/neovim/config/diagnostics.lua b/neovim/config/diagnostics.lua
new file mode 100644
index 0000000..d09ad3f
--- /dev/null
+++ b/neovim/config/diagnostics.lua
@@ -0,0 +1,18 @@
+local sev = vim.diagnostic.severity
+
+vim.diagnostic.config({
+  severity_sort = true,
+  update_in_insert = false,
+  float = {
+    border = 'rounded',
+    source = true,
+  },
+  signs = {
+    text = {
+      [sev.ERROR] = 'E',
+      [sev.WARN]  = 'W',
+      [sev.INFO]  = 'I',
+      [sev.HINT]  = 'H',
+    },
+  },
+})
diff --git a/neovim/config/init.lua b/neovim/config/init.lua
new file mode 100644
index 0000000..f9db727
--- /dev/null
+++ b/neovim/config/init.lua
@@ -0,0 +1,3 @@
+require('config.options')
+require('config.diagnostics')
+require('config.lsp')
diff --git a/neovim/config/lsp.lua b/neovim/config/lsp.lua
new file mode 100644
index 0000000..53c06fa
--- /dev/null
+++ b/neovim/config/lsp.lua
@@ -0,0 +1 @@
+vim.lsp.enable('phpactor')
diff --git a/neovim/config/options.lua b/neovim/config/options.lua
new file mode 100644
index 0000000..5b0dff4
--- /dev/null
+++ b/neovim/config/options.lua
@@ -0,0 +1,8 @@
+vim.o.autocomplete = true
+vim.o.pumborder = 'rounded'
+vim.o.pummaxwidth = 40
+vim.o.completeopt = 'menu,menuone,noinsert,nearest'
+vim.o.number = true
+vim.o.spelllang = 'en_gb'
+vim.o.spell = true
+vim.o.termguicolors = true
diff --git a/neovim/init.lua b/neovim/init.lua
index 3386f06..b3fe4e3 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -1,26 +1 @@
---[[
-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
-vim.pack.add({"https://github.com/nvim-tree/nvim-tree.lua"})
-require("nvim-tree").setup()
-
--- Editor options
--- show line numbers
-vim.opt.number = true
-
--- set spelling to British English
-vim.opt.spelllang = 'en_gb'
-vim.opt.spell = true
-
--- 24-bit colour support
-vim.opt.termguicolors = true
-
--- LSP/PHP setup
-vim.lsp.enable('phpactor')
+require('config')