fix(conform): provide configuration as its expected by lazyvim

This commit is contained in:
2023-10-17 13:54:25 +03:00
parent 0f6ae4b3e2
commit c2ceb48389
3 changed files with 6 additions and 51 deletions

View File

@@ -19,10 +19,10 @@ require("lazy").setup({
{ import = "lazyvim.plugins.extras.lang.python" },
{ import = "lazyvim.plugins.extras.lang.terraform" },
{ import = "lazyvim.plugins.extras.lang.yaml" },
{ import = "lazyvim.plugins.extras.lang.markdown" },
{ import = "lazyvim.plugins.extras.ui.mini-animate" },
{ import = "plugins.tokyonight" },
{ import = "plugins.telescope" },
{ import = "plugins.lang.markdown" },
{ import = "plugins.lang.shell" },
},
defaults = {

View File

@@ -1,44 +0,0 @@
return {
{
"williamboman/mason.nvim",
opts = function(_, opts)
opts.ensure_installed = opts.ensure_installed or {}
vim.list_extend(opts.ensure_installed, {
"marksman",
"mdformat",
})
end,
},
{
"stevearc/conform.nvim",
event = { "BufWritePre" },
cmd = { "ConformInfo" },
opts = {
formatters_by_ft = {
["md"] = { "mdformat" },
["markdown"] = { "mdformat" },
["markdown.mdx"] = { "mdformat" },
},
format_on_save = { timeout_ms = 500, lsp_fallback = true },
},
},
{
"neovim/nvim-lspconfig",
opts = {
servers = {
marksman = {},
},
},
},
{
"nvim-treesitter/nvim-treesitter",
opts = function(_, opts)
if type(opts.ensure_installed) == "table" then
vim.list_extend(opts.ensure_installed, {
"markdown",
"markdown_inline",
})
end
end,
},
}

View File

@@ -19,13 +19,12 @@ return {
["sh"] = { "shfmt" },
["command"] = { "shfmt" },
},
format_on_save = { timeout_ms = 500, lsp_fallback = true },
formatters = {
shfmt = {
prepend_args = { "-i", "2", "-ci" },
},
},
},
config = function(_, opts)
local util = require("conform.util")
util.add_formatter_args(require("conform.formatters.shfmt"), { "-i", "2" })
require("conform").setup(opts)
end,
},
{
"neovim/nvim-lspconfig",