modules/plugins/languages/nix.nix

@@ -60,17 +60,7 @@
       '';
     };
 
-    nixd = let
+    nixd = {
-      settings.nixd = {
-        inherit (cfg.lsp) options;
-        formatting.command =
-          if !cfg.format.enable
-          then null
-          else if cfg.format.type == "alejandra"
-          then ["${cfg.format.package}/bin/alejandra" "--quiet"]
-          else ["${cfg.format.package}/bin/nixfmt"];
-      };
-    in {
       package = pkgs.nixd;
       internalFormatter = true;
       lspConfig = ''
@@ -82,7 +72,25 @@
           else noFormat
         },
           cmd = ${packageToCmd cfg.lsp.package "nixd"},
-          settings = ${toLuaObject settings},
+          options = ${toLuaObject cfg.lsp.options},
+        ${optionalString cfg.format.enable ''
+          settings = {
+            nixd = {
+          ${optionalString (cfg.format.type == "alejandra")
+            ''
+              formatting = {
+                command = {"${cfg.format.package}/bin/alejandra", "--quiet"},
+              },
+            ''}
+          ${optionalString (cfg.format.type == "nixfmt")
+            ''
+              formatting = {
+                command = {"${cfg.format.package}/bin/nixfmt"},
+              },
+            ''}
+            },
+          },
+        ''}
         }
       '';
     };