diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua index c44b105..aa21a36 100644 --- a/lua/plugins/formatting.lua +++ b/lua/plugins/formatting.lua @@ -3,6 +3,7 @@ return { "stevearc/conform.nvim", opts = { formatters_by_ft = { + blade = { "blade-formatter" }, css = { "prettierd" }, scss = { "prettierd" }, html = { "djlint" }, @@ -12,7 +13,7 @@ return { javascriptreact = { "prettierd" }, json = { "prettierd" }, jsonc = { "prettierd" }, - php = { "php_cs_fixer" }, + php = { "pint", "php_cs_fixer", stop_after_first = true }, toml = { "taplo" }, typescript = { "prettierd" }, typescriptreact = { "prettierd" }, @@ -52,7 +53,9 @@ return { "WhoIsSethDaniel/mason-tool-installer.nvim", opts = { ensure_installed = { + "blade-formatter", "djlint", + "phpcs", "php-cs-fixer", "prettierd", "proselint", diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 131e859..3f62b50 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -11,7 +11,7 @@ return { "eslint", "html", "lua_ls", - "psalm", -- .php + "phpactor", -- php "taplo", -- .toml "ts_ls", "twiggy_language_server", -- .twig @@ -38,9 +38,9 @@ return { }) end, }, - lua_ls = {}, html = {}, - psalm = {}, + lua_ls = {}, + phpactor = {}, taplo = {}, ts_ls = {}, twiggy_language_server = {}, diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 9398d46..99a83ae 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -4,10 +4,10 @@ return { version = false, build = ":TSUpdate", event = { "VeryLazy" }, - lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline + lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline opts = { ensure_installed = { - "graphql", + "graphql", "html", "htmldjango", "javascript", @@ -18,6 +18,7 @@ return { "markdown", "markdown_inline", "php", + "php_only", "pug", "tsx", "twig",