From 575e241fa2a27bdf1f3767894a00bb12d37786ee Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 11 Dec 2025 14:17:52 +0100
Subject: [PATCH] plugins/efmls-configs: inline efm language settings
 (cosmetic)

---
 plugins/by-name/efmls-configs/default.nix | 52 +++++++++++------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/plugins/by-name/efmls-configs/default.nix b/plugins/by-name/efmls-configs/default.nix
index a70c7447..5f94eb22 100644
--- a/plugins/by-name/efmls-configs/default.nix
+++ b/plugins/by-name/efmls-configs/default.nix
@@ -183,32 +183,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
         map (
           tool: if lib.isString tool then lib.nixvim.mkRaw "require 'efmls-configs.${kind}.${tool}'" else tool
         ) (lib.toList opt);
-
-      setupOptions =
-        (lib.mapAttrs
-          (
-            _:
-            {
-              linter ? [ ],
-              formatter ? [ ],
-            }:
-            (mkToolValue "linters" linter) ++ (mkToolValue "formatters" formatter)
-          )
-          (
-            builtins.removeAttrs cfg.languages [
-              "all"
-              # Rename aliases added 2025-06-25 in https://github.com/nix-community/nixvim/pull/3503
-              "warnings"
-              "HTML"
-              "JSON"
-            ]
-          )
-        )
-        // {
-          "=" =
-            (mkToolValue "linters" cfg.languages.all.linter)
-            ++ (mkToolValue "formatters" cfg.languages.all.formatter);
-        };
     in
     {
       # TODO: print the location of the offending options
@@ -223,7 +197,31 @@ lib.nixvim.plugins.mkNeovimPlugin {
 
       lsp.servers.efm = {
         enable = true;
-        config.settings.languages = setupOptions;
+        config.settings.languages =
+          (lib.mapAttrs
+            (
+              _:
+              {
+                linter ? [ ],
+                formatter ? [ ],
+              }:
+              (mkToolValue "linters" linter) ++ (mkToolValue "formatters" formatter)
+            )
+            (
+              builtins.removeAttrs cfg.languages [
+                "all"
+                # Rename aliases added 2025-06-25 in https://github.com/nix-community/nixvim/pull/3503
+                "warnings"
+                "HTML"
+                "JSON"
+              ]
+            )
+          )
+          // {
+            "=" =
+              (mkToolValue "linters" cfg.languages.all.linter)
+              ++ (mkToolValue "formatters" cfg.languages.all.formatter);
+          };
       };
 
       extraPackages = map (name: cfg.toolPackages.${name}) nixvimPkgs.right;