From 771cb3c8520caa0c51c749bfe14d16212c241d12 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 16 Dec 2025 13:47:46 +0000
Subject: [PATCH] plugins/lsp: inline explicit server option declarations

---
 modules/lsp/servers/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/lsp/servers/default.nix b/modules/lsp/servers/default.nix
index 08ef2a21..fc057225 100644
--- a/modules/lsp/servers/default.nix
+++ b/modules/lsp/servers/default.nix
@@ -32,7 +32,7 @@ let
   # Create a server option
   # Used below for the `lsp.servers.*` options
   mkServerOption =
-    name: args:
+    { name, ... }@args:
     let
       homepage = lib.pipe options.lsp.servers [
         # Get suboptions of `lsp.servers`
@@ -59,11 +59,6 @@ let
       '';
       default = { };
     };
-
-  # Read package-option defaults from `packages.nix`
-  serverPackages = builtins.mapAttrs (name: package: {
-    inherit name package;
-  }) (import ./packages.nix).packages;
 in
 {
   options.lsp = {
@@ -73,7 +68,10 @@ in
           freeformType = types.attrsOf (mkServerType { });
         }
         {
-          options = builtins.mapAttrs mkServerOption serverPackages;
+          # Declare explicit options for each `packages.nix` entry with a known package
+          options = builtins.mapAttrs (
+            name: package: mkServerOption { inherit name package; }
+          ) (import ./packages.nix).packages;
         }
         {
           # `*` is effectively a meta server, where shared config & defaults can be set.