wip - package defaults

Author: MattSturgeon

modules/lsp/default.nix

@@ -2,13 +2,67 @@
   lib,
   config,
   options,
+  pkgs,
   ...
 }:
 let
   inherit (lib) types;
   inherit (lib.nixvim) toLuaObject;
 
   cfg = config.lsp;
+
+  mkServerSubmodule =
+    {
+      name ? null,
+      package ? null,
+    }:
+    types.submodule [
+      ./server.nix
+      {
+        options.package =
+          let
+            extraDescription = ''
+
+
+              Alternatively, the language server should be available on your `$PATH`.
+            '';
+          in
+          if package == null then
+            lib.mkOption {
+              type = types.nullOr types.package;
+              default = null;
+              description = ''
+                Package to use for this language server.
+                ${extraDescription}
+              '';
+            }
+          else if lib.isOption package then
+            package
+          else
+            lib.mkPackageOption pkgs name {
+              nullable = true;
+              default = package;
+              inherit extraDescription;
+            };
+      }
+    ];
+
+  mkServerOption =
+    name:
+    {
+      package ? null,
+      description ? "The ${name} language server.",
+    }:
+    lib.mkOption {
+      type = mkServerSubmodule { inherit name package; };
+      inherit description;
+      default = { };
+    };
+
+  # TODO: generate package defaults from lsp-packages.nix
+  serverSpecs = {
+    nixd.package = "nixd";
+  };
 in
 {
   options.lsp = {
@@ -25,7 +79,11 @@ in
     };
 
     servers = lib.mkOption {
-      type = types.attrsOf (types.submodule ./server.nix);
+      type = types.submodule {
+        freeformType = types.attrsOf (mkServerSubmodule { });
+        options = builtins.mapAttrs mkServerOption serverSpecs;
+      };
+
       description = ''
         LSP servers to enable and/or configure.
 

modules/lsp/server.nix

@@ -24,16 +24,6 @@ in
       example = false;
     };
 
-    package = lib.mkOption {
-      type = with types; nullOr package;
-      default = null;
-      description = ''
-        Package to use for this language server.
-
-        Alternatively, the language server should be available on your `$PATH`.
-      '';
-    };
-
     config = lib.mkOption {
       type = with types; attrsOf anything;
       description = ''