diff options
| -rw-r--r-- | nvim/.config/nvim/lua/efmls-configs/formatters/djlint.lua | 14 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/conform.lua | 12 |
2 files changed, 9 insertions, 17 deletions
diff --git a/nvim/.config/nvim/lua/efmls-configs/formatters/djlint.lua b/nvim/.config/nvim/lua/efmls-configs/formatters/djlint.lua deleted file mode 100644 index fa25151..0000000 --- a/nvim/.config/nvim/lua/efmls-configs/formatters/djlint.lua +++ /dev/null @@ -1,14 +0,0 @@ --- Metadata --- languages: python,go,php,html --- url: https://djlint.com/ - -local fs = require("efmls-configs.fs") - -local bin = fs.executable("djlint") -local args = "--reformat ${--indent:tabSize} --profile=django -" -local command = string.format("%s %s", bin, args) - -return { - formatCommand = command, - formatStdin = true, -} diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua index 0f2fd82..42ea559 100644 --- a/nvim/.config/nvim/lua/plugins/conform.lua +++ b/nvim/.config/nvim/lua/plugins/conform.lua @@ -10,7 +10,7 @@ local M = { django = { "djlint" }, htmldjango = { "djlint" }, ["jinja.html"] = { "djlint" }, - markdown = { "markdownlint", "cbfmt" }, + markdown = { "prettier", "markdownlint", "cbfmt" }, python = { "black" }, sass = { "stylua" }, scss = { "stylua" }, @@ -35,15 +35,21 @@ local M = { } function M:init() + local args = { lsp_fallback = "always" } vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" vim.keymap.set({ "n", "v" }, "gqq", function() - return require("conform").format() + return require("conform").format(args) end, { desc = "format" }) vim.keymap.set({ "n", "v" }, "<leader>lf", function() - return require("conform").format() + return require("conform").format(args) end, { desc = "format" }) end +function M:config(opts) + require("conform.util").add_formatter_args(require("conform.formatters.prettier"), { "--prose-wrap", "always" }) + require("conform").setup(opts) +end + return M |