From 12a76dd12beccd8d18249b05d10d6acda4e722e0 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 15 Dec 2025 10:34:08 +0000
Subject: [PATCH] modules/lsp/servers: simplify `displayName` and `packageName`

Move the `let in` block defining `displayName` and `packageName` up so
it doesn't have to deal with the module arg `name` shadowing `args.name`.

This simplifies the implementation and reduces repetition.
---
 modules/lsp/servers/server.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/lsp/servers/server.nix b/modules/lsp/servers/server.nix
index 3243c120..9991b106 100644
--- a/modules/lsp/servers/server.nix
+++ b/modules/lsp/servers/server.nix
@@ -4,6 +4,10 @@
   package ? null,
   config ? null,
 }@args:
+let
+  displayName = name;
+  packageName = package.name or args.name or "language server";
+in
 {
   lib,
   name,
@@ -13,8 +17,6 @@
 }:
 let
   inherit (lib) types;
-  displayName = args.name or "the language server";
-  packageName = package.name or (lib.strings.removePrefix "the " displayName);
 in
 {
   options = {