From ac8c786195b495da02da5c86280586e5fadd0170 Mon Sep 17 00:00:00 2001 From: Taken Date: Fri, 27 Sep 2024 19:49:32 +0200 Subject: [PATCH] Added configs --- lua/taken/plugins/conform.lua | 24 ++++++++++++++++++++---- lua/taken/plugins/lsp/lspconfig.lua | 2 ++ lua/taken/plugins/lsp/mason.lua | 2 ++ lua/taken/plugins/otherplugins.lua | 3 +++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lua/taken/plugins/conform.lua b/lua/taken/plugins/conform.lua index 84944a2..08cf4e2 100644 --- a/lua/taken/plugins/conform.lua +++ b/lua/taken/plugins/conform.lua @@ -3,13 +3,29 @@ return { "stevearc/conform.nvim", event = { "BufReadPre", "BufNewFile" }, config = function() + function checkPrettierConfig() + local prettier_config = vim.fn.glob(".prettierrc*", 0, 1) + if prettier_config[1] == nil then + return false + end + end + + function dprintOrPrettier() + if checkPrettierConfig() then + return { "prettier" } + else + return { "dprint" } + end + end + require("conform").setup({ formatters_by_ft = { lua = { "stylua" }, - javascript = { "dprint" }, - typescript = { "dprint" }, - json = { "dprint" }, - markdown = { "dprint" }, + javascript = dprintOrPrettier(), + typescript = dprintOrPrettier(), + json = dprintOrPrettier(), + markdown = dprintOrPrettier(), + svelte = { "prettier" }, }, format_on_save = { timeout_ms = 500, diff --git a/lua/taken/plugins/lsp/lspconfig.lua b/lua/taken/plugins/lsp/lspconfig.lua index a89b3d7..da9a3fc 100644 --- a/lua/taken/plugins/lsp/lspconfig.lua +++ b/lua/taken/plugins/lsp/lspconfig.lua @@ -33,6 +33,8 @@ return { "yamlls", "eslint", "bashls", + "svelte", + "tailwindcss", } for _, lsp in ipairs(defaultLsps) do diff --git a/lua/taken/plugins/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua index 20dbae1..7793978 100644 --- a/lua/taken/plugins/lsp/mason.lua +++ b/lua/taken/plugins/lsp/mason.lua @@ -35,6 +35,8 @@ return { "rust_analyzer", "yamlls", "bashls", + "svelte", + "tailwindcss", }, automatic_installation = true, }) diff --git a/lua/taken/plugins/otherplugins.lua b/lua/taken/plugins/otherplugins.lua index 93294ea..d6f603c 100644 --- a/lua/taken/plugins/otherplugins.lua +++ b/lua/taken/plugins/otherplugins.lua @@ -80,6 +80,9 @@ return { "windwp/nvim-ts-autotag", dependencies = "nvim-treesitter", event = { "BufReadPre", "BufNewFile" }, + config = function() + require("nvim-ts-autotag").setup() + end, }, { "szw/vim-maximizer",