From f8dc16a29f56d60ef7a8f2cf79a80b1ae441d452 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang <59727193+horriblename@users.noreply.github.com> Date: Sat, 22 Nov 2025 03:36:00 +0100 Subject: [PATCH] languages/nix: always use conform for formatter (#1236) --- modules/plugins/languages/nix.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index 44e1e219..f03806f9 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -15,25 +15,11 @@ cfg = config.vim.languages.nix; - formattingCmd = mkIf (cfg.format.enable && cfg.lsp.enable) { - formatting = mkMerge [ - (mkIf (cfg.format.type == "alejandra") { - command = [(getExe pkgs.alejandra) "--quiet"]; - }) - (mkIf (cfg.format.type == "nixfmt") { - command = [(getExe pkgs.nixfmt-rfc-style)]; - }) - ]; - }; - defaultServers = ["nil"]; servers = { nil = { enable = true; cmd = [(getExe pkgs.nil)]; - settings = { - nil = formattingCmd; - }; filetypes = ["nix"]; root_markers = [".git" "flake.nix"]; }; @@ -41,9 +27,6 @@ nixd = { enable = true; cmd = [(getExe pkgs.nixd)]; - settings = { - nixd = formattingCmd; - }; filetypes = ["nix"]; root_markers = [".git" "flake.nix"]; }; @@ -152,7 +135,7 @@ in { cfg.lsp.servers; }) - (mkIf (cfg.format.enable && !cfg.lsp.enable) { + (mkIf cfg.format.enable { vim.formatter.conform-nvim = { enable = true; setupOpts = {