diff --git a/lua/custom/plugins/formatting.lua b/lua/custom/plugins/formatting.lua index ba2e1783..4fda24a1 100644 --- a/lua/custom/plugins/formatting.lua +++ b/lua/custom/plugins/formatting.lua @@ -1,30 +1,30 @@ return { - "stevearc/conform.nvim", - event = { "BufReadPre", "BufNewFile" }, + 'stevearc/conform.nvim', + event = { 'BufReadPre', 'BufNewFile' }, config = function() - local conform = require("conform") + local conform = require 'conform' - conform.setup({ + conform.setup { formatters_by_ft = { - javascript = { "eslint_d" }, - typescript = { "eslint_d" }, - javascriptreact = { "eslint_d" }, - typescriptreact = { "eslint_d" }, - svelte = { "prettier" }, - css = { "prettier" }, - html = { "prettier" }, - json = { "prettier" }, - yaml = { "prettier" }, - markdown = { "prettier" }, - graphql = { "prettier" }, - liquid = { "prettier" }, - lua = { "stylua" }, + javascript = { 'eslint_d' }, + typescript = { 'eslint_d' }, + javascriptreact = { 'eslint_d' }, + typescriptreact = { 'eslint_d' }, + svelte = { 'prettier' }, + css = { 'prettier' }, + html = { 'prettier' }, + json = { 'prettier' }, + yaml = { 'prettier' }, + markdown = { 'prettier' }, + graphql = { 'prettier' }, + liquid = { 'prettier' }, + lua = { 'stylua' }, }, format_on_save = { lsp_fallback = true, async = false, timeout_ms = 1000, }, - }) + } end, } diff --git a/lua/custom/plugins/mason.lua b/lua/custom/plugins/mason.lua index 736043f8..fae5fa8f 100644 --- a/lua/custom/plugins/mason.lua +++ b/lua/custom/plugins/mason.lua @@ -28,6 +28,7 @@ return { -- list of servers for mason to install ensure_installed = { 'ts_ls', + 'eslint', 'html', 'cssls', 'tailwindcss',