wip - start using lsp-packages.nix

Author: MattSturgeon

modules/lsp/default.nix

@@ -52,17 +52,27 @@ let
     {
       package ? null,
       description ? "The ${name} language server.",
+      # lsp-packages.nix tracks some custom commands, however this is currently not used by the server submodule
+      cmd ? null,
     }:
     lib.mkOption {
       type = mkServerSubmodule { inherit name package; };
       inherit description;
       default = { };
     };
 
-  # TODO: generate package defaults from lsp-packages.nix
-  serverSpecs = {
-    nixd.package = "nixd";
-  };
+  # Combine `packages` and `customCmd` sets from `lsp-packages.nix`
+  # We use this set to generate the package-option defaults
+  serverPackages =
+    (
+      {
+        unpackaged,
+        packages,
+        customCmd,
+      }:
+      builtins.mapAttrs (_: package: { inherit package; }) packages // customCmd
+    )
+      (import ../../plugins/lsp/lsp-packages.nix);
 in
 {
   options.lsp = {
@@ -81,7 +91,7 @@ in
     servers = lib.mkOption {
       type = types.submodule {
         freeformType = types.attrsOf (mkServerSubmodule { });
-        options = builtins.mapAttrs mkServerOption serverSpecs;
+        options = builtins.mapAttrs mkServerOption serverPackages;
       };
 
       description = ''