From fd12d1a4a08d6bb68be70c37e81957606d5f8418 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Jul 2025 09:26:54 -0500 Subject: [PATCH] Improve conform config --- home/.config/nvim/lua/plugins/conform.lua | 29 +++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/home/.config/nvim/lua/plugins/conform.lua b/home/.config/nvim/lua/plugins/conform.lua index 5d555609..f64add40 100644 --- a/home/.config/nvim/lua/plugins/conform.lua +++ b/home/.config/nvim/lua/plugins/conform.lua @@ -1,4 +1,24 @@ -local prettier = { "prettierd", "prettier", stop_after_first = true } +-- Build the formatters_by_ft table +local formatters_by_ft = { + lua = { "stylua" }, + python = { "black" }, + toml = { "taplo" }, +} +-- +-- Format with prettierd if available, fall back to prettier +local prettierd = { "prettierd", "prettier", stop_after_first = true } +local prettier_fts = { + "css", + "html", + "javascript", + "json", + "yaml", +} + +-- Add Prettier filetypes +for _, ft in ipairs(prettier_fts) do + formatters_by_ft[ft] = prettierd +end -- Formatter plugin --- @type LazyPluginSpec @@ -6,12 +26,7 @@ return { "stevearc/conform.nvim", event = "VeryLazy", opts = { - formatters_by_ft = { - lua = { "stylua" }, - javascript = prettier, - json = prettier, - python = { "black" }, - }, + formatters_by_ft = formatters_by_ft, }, keys = { {