Make serverPackages less functional and more declarative

Author: MattSturgeon

modules/lsp/default.nix

@@ -64,15 +64,14 @@ let
   # 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);
+    let
+      inherit (import ../../plugins/lsp/lsp-packages.nix)
+        packages
+        customCmd
+        ;
+      normalisedPackages = builtins.mapAttrs (_: package: { inherit package; }) packages;
+    in
+    normalisedPackages // customCmd;
 in
 {
   options.lsp = {