From c9ce0326170433f20a5b71e008d7c5448f78f98d Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sun, 13 Oct 2024 14:57:28 +0200 Subject: [PATCH] Neovim: Update conform config after update --- home/modules/neovim/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/home/modules/neovim/default.nix b/home/modules/neovim/default.nix index e1e8bd4a..9da2bd86 100644 --- a/home/modules/neovim/default.nix +++ b/home/modules/neovim/default.nix @@ -518,24 +518,29 @@ in { h = ["clang-format"]; cpp = ["clang-format"]; hpp = ["clang-format"]; - css = [["prettierd" "prettier"]]; - html = [["prettierd" "prettier"]]; + css = ["prettierd" "prettier"]; + html = ["prettierd" "prettier"]; java = ["google-java-format"]; - javascript = [["prettierd" "prettier"]]; + javascript = ["prettierd" "prettier"]; lua = ["stylua"]; - markdown = [["prettierd" "prettier"]]; + markdown = ["prettierd" "prettier"]; nix = ["alejandra"]; python = ["black"]; rust = ["rustfmt"]; }; + default_format_opts = { + lsp_format = "fallback"; + stop_after_first = true; + }; + format_on_save.__raw = '' function(bufnr) -- Disable with a global or buffer-local variable if vim.g.disable_autoformat then return end - return { timeout_ms = 500, lsp_fallback = true } + return { timeout_ms = 500, lsp_format = "fallback", } end ''; };