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 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 ) 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