From 360db2c0de31be24c3db5ec8cec1ca61071a8b80 Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Wed, 4 Feb 2026 14:58:16 +0000
Subject: [PATCH 1/3] feat(nvim): replace intelephense with devsense phptools

---
 nvim/lua/lsp/init.lua             | 3 ++-
 nvim/lua/lsp/servers/phptools.lua | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 nvim/lua/lsp/servers/phptools.lua

diff --git a/nvim/lua/lsp/init.lua b/nvim/lua/lsp/init.lua
index f820b2b..c2e34ca 100644
--- a/nvim/lua/lsp/init.lua
+++ b/nvim/lua/lsp/init.lua
@@ -33,7 +33,8 @@ local servers = {
   -- 'eslint',
   'gopls',
   'html',
-  'intelephense',
+  -- 'intelephense',
+  'phptools',
   'jsonls',
   'lemminx',
   'lua_ls',
diff --git a/nvim/lua/lsp/servers/phptools.lua b/nvim/lua/lsp/servers/phptools.lua
new file mode 100644
index 0000000..d3b50ef
--- /dev/null
+++ b/nvim/lua/lsp/servers/phptools.lua
@@ -0,0 +1,9 @@
+return function(capabilities)
+  return {
+    capabilities = capabilities,
+    filetypes = {
+      'php',
+      'blade',
+    },
+  }
+end

From 95170e91e1bd0d7f719d79a91cc0ebb007f3541b Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Wed, 4 Feb 2026 16:05:16 +0000
Subject: [PATCH 2/3] remove orphaned cargo package

---
 shell/functions | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shell/functions b/shell/functions
index 847da19..85d5c00 100644
--- a/shell/functions
+++ b/shell/functions
@@ -343,7 +343,6 @@ install_pip_packages() {
 
 install_cargo_packages() {
   PACKAGES=(
-    tree-sitter-cli
     stylua
   )
 

From 0ac2a67c79b1a374ab8eb5eaf52429b65bc811ac Mon Sep 17 00:00:00 2001
From: codepuncher <lee.hanbury@gmail.com>
Date: Wed, 4 Feb 2026 16:05:32 +0000
Subject: [PATCH 3/3] fix cargo integration

---
 shell/zshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/zshrc b/shell/zshrc
index cd81e15..b008014 100644
--- a/shell/zshrc
+++ b/shell/zshrc
@@ -55,8 +55,8 @@ if type luarocks &>/dev/null; then
 fi
 
 # Cargo
-if type cargo &>/dev/null; then
-	export PATH="${PATH}:${HOME}/.cargo/bin"
+if [ -f "${HOME}/.cargo/env" ]; then
+  source "${HOME}/.cargo/env"
 fi
 
 # Pyenv