modules/lsp: add per-server name option

This allows users to override the name used for a given `lsp.servers.*`
entry. The default is still the attr-name.

This may be useful to inject raw lua, or to configure the same server in
different ways via different attrs.

Author: MattSturgeon

modules/lsp/default.nix

@@ -66,31 +66,32 @@ in
 
   config =
     let
-      enabledServers = lib.filterAttrs (_: v: v.enable) cfg.servers;
-    in
-    {
-      extraPackages = lib.pipe enabledServers [
+      enabledServers = lib.pipe cfg.servers [
         builtins.attrValues
-        (builtins.catAttrs "package")
+        (builtins.filter (server: server.enable))
       ];
+    in
+    {
+      extraPackages = builtins.catAttrs "package" enabledServers;
 
       lsp.luaConfig.content =
         let
           mkServerConfig =
-            name: props:
+            server:
             let
-              luaName = toLuaObject name;
+              luaName = toLuaObject server.name;
+              luaCfg = toLuaObject server.config;
             in
             ''
-              vim.lsp.config(${luaName}, ${toLuaObject props.config})
+              vim.lsp.config(${luaName}, ${luaCfg})
             ''
-            + lib.optionalString props.activate ''
+            + lib.optionalString server.activate ''
               vim.lsp.enable(${luaName})
             '';
         in
         lib.mkMerge (
           lib.optional cfg.inlayHints.enable "vim.lsp.inlay_hint.enable(true)"
-          ++ lib.mapAttrsToList mkServerConfig enabledServers
+          ++ builtins.map mkServerConfig enabledServers
         );
 
       extraConfigLua = lib.mkIf (cfg.luaConfig.content != "") ''

modules/lsp/server.nix

@@ -1,11 +1,20 @@
-{ lib, ... }:
+{ lib, name, ... }:
 let
   inherit (lib) types;
 in
 {
   options = {
     enable = lib.mkEnableOption "the language server";
 
+    name = lib.mkOption {
+      type = types.maybeRaw types.str;
+      description = ''
+        The name of the language server, supplied to functions like `vim.lsp.enable()`.
+      '';
+      default = name;
+      defaultText = lib.literalMD "the attribute name";
+    };
+
     activate = lib.mkOption {
       type = types.bool;
       description = ''