diff --git a/lua/taken/plugins/conform.lua b/lua/taken/plugins/conform.lua index 10871f8..4f07d25 100644 --- a/lua/taken/plugins/conform.lua +++ b/lua/taken/plugins/conform.lua @@ -3,14 +3,14 @@ return { "stevearc/conform.nvim", event = { "BufReadPre", "BufNewFile" }, config = function() - function checkPrettierConfig() - local prettier_config = vim.fn.glob(".prettierrc*", 0, 1) + local function checkPrettierConfig() + local prettier_config = vim.fn.glob(".prettierrc*", false, 1) if prettier_config[1] == nil then return false end end - function dprintOrPrettier() + local function dprintOrPrettier() if checkPrettierConfig() then return "prettier" else @@ -27,6 +27,7 @@ return { typescriptreact = { "rustywind", dprintOrPrettier() }, json = { dprintOrPrettier() }, markdown = { dprintOrPrettier() }, + python = { "ruff_format" }, }, format_on_save = { timeout_ms = 500, diff --git a/lua/taken/plugins/lsp/lspconfig.lua b/lua/taken/plugins/lsp/lspconfig.lua index cb71895..7ca32ff 100644 --- a/lua/taken/plugins/lsp/lspconfig.lua +++ b/lua/taken/plugins/lsp/lspconfig.lua @@ -100,6 +100,11 @@ return { end, }) + lspconfig["ruff_lsp"].setup({ + capabilities = capabilities, + on_attach = on_attach, + }) + -- typescript lspconfig["ts_ls"].setup({ capabilities = capabilities, diff --git a/lua/taken/plugins/lsp/mason.lua b/lua/taken/plugins/lsp/mason.lua index 8431a88..7412fd9 100644 --- a/lua/taken/plugins/lsp/mason.lua +++ b/lua/taken/plugins/lsp/mason.lua @@ -45,6 +45,8 @@ return { "stylua", "prettier", "dprint", + "ruff", + "ruff-lsp", "rustywind", }, automatic_installation = true,