From 6d645999f2a1d392883c10ec640f4ba0e5748d4c Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sun, 15 Feb 2026 17:03:34 +0000
Subject: [PATCH] Add phpactor support to neovim with default settings

---
 bootstrap.sh            |  2 ++
 neovim/init.lua         |  3 +++
 neovim/lsp/phpactor.lua | 10 ++++++++++
 zshrc.zsh               |  3 +++
 4 files changed, 18 insertions(+)
 create mode 100644 neovim/lsp/phpactor.lua

diff --git a/bootstrap.sh b/bootstrap.sh
index f33f927..9cd1588 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/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
 
 # .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 cc1eeb5..3386f06 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -21,3 +21,6 @@ vim.opt.spell = true
 
 -- 24-bit colour support
 vim.opt.termguicolors = true
+
+-- LSP/PHP setup
+vim.lsp.enable('phpactor')
diff --git a/neovim/lsp/phpactor.lua b/neovim/lsp/phpactor.lua
new file mode 100644
index 0000000..d9d00b6
--- /dev/null
+++ b/neovim/lsp/phpactor.lua
@@ -0,0 +1,10 @@
+return {
+    cmd = { 'phpactor', 'language-server' },
+    filetypes = { 'php' },
+    root_markers = { '.git', 'composer.json', '.phpactor.json', '.phpactor.yml' },
+    workspace_required = true,
+    init_options = {
+        ["language_server_phpstan.enabled"] = false,
+        ["language_server_psalm.enabled"] = false,
+    }
+}
diff --git a/zshrc.zsh b/zshrc.zsh
index c567b8b..3237f82 100644
--- a/zshrc.zsh
+++ b/zshrc.zsh
@@ -68,6 +68,9 @@ export GRAVEYARD="$HOME/.local/share/Trash"
 # composer global
 export PATH="$PATH:$HOME/.composer/vendor/bin"
 
+# phpactor installed manually
+export PATH="$PATH:$HOME/git/phpactor/bin"
+
 # rust/cargo bin PATH
 export PATH="$PATH:$HOME/.cargo/bin"