From c97e8e34250c7fe5d4e0c3333a0ca4a9d28957d0 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 13 Dec 2025 16:43:16 +0000
Subject: [PATCH] modules/lsp: move `packages.nix` from plugins.lsp

Move plugins/lsp/lsp-packages.nix -> modules/lsp/servers/packages.nix
---
 modules/lsp/servers/default.nix                               | 4 ++--
 .../lsp/lsp-packages.nix => modules/lsp/servers/packages.nix  | 0
 plugins/lsp/language-servers/default.nix                      | 2 +-
 tests/generated.nix                                           | 4 ++--
 tests/test-sources/modules/lsp.nix                            | 2 +-
 typos.toml                                                    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename plugins/lsp/lsp-packages.nix => modules/lsp/servers/packages.nix (100%)

diff --git a/modules/lsp/servers/default.nix b/modules/lsp/servers/default.nix
index 3427f81d..67cb5244 100644
--- a/modules/lsp/servers/default.nix
+++ b/modules/lsp/servers/default.nix
@@ -60,11 +60,11 @@ let
       default = { };
     };
 
-  # Combine `packages` and `customCmd` sets from `lsp-packages.nix`
+  # Combine `packages` and `customCmd` sets from `packages.nix`
   # We use this set to generate the package-option defaults
   serverPackages =
     let
-      inherit (import ../../../plugins/lsp/lsp-packages.nix)
+      inherit (import ./packages.nix)
         packages
         customCmd
         ;
diff --git a/plugins/lsp/lsp-packages.nix b/modules/lsp/servers/packages.nix
similarity index 100%
rename from plugins/lsp/lsp-packages.nix
rename to modules/lsp/servers/packages.nix
diff --git a/plugins/lsp/language-servers/default.nix b/plugins/lsp/language-servers/default.nix
index 672cbd78..78ebcf04 100644
--- a/plugins/lsp/language-servers/default.nix
+++ b/plugins/lsp/language-servers/default.nix
@@ -212,7 +212,7 @@ let
     };
   };
 
-  lspPackages = import ../lsp-packages.nix;
+  lspPackages = import ../../../modules/lsp/servers/packages.nix;
 
   generatedServers = lib.pipe ../../../generated/lspconfig-servers.json [
     lib.importJSON
diff --git a/tests/generated.nix b/tests/generated.nix
index 5b80ea90..31520809 100644
--- a/tests/generated.nix
+++ b/tests/generated.nix
@@ -45,11 +45,11 @@ let
   errors = lib.concatStringsSep "\n" (
     checkDeclarations (
       let
-        inherit (import ../plugins/lsp/lsp-packages.nix) unpackaged packages customCmd;
+        inherit (import ../modules/lsp/servers/packages.nix) unpackaged packages customCmd;
       in
       {
         name = "lsp";
-        declarationFile = "plugins/lsp/lsp-packages.nix";
+        declarationFile = "modules/lsp/servers/packages.nix";
 
         packages = builtins.attrValues packages;
 
diff --git a/tests/test-sources/modules/lsp.nix b/tests/test-sources/modules/lsp.nix
index 7bdaee08..b0e839a2 100644
--- a/tests/test-sources/modules/lsp.nix
+++ b/tests/test-sources/modules/lsp.nix
@@ -272,7 +272,7 @@
       packageOpt = (serverOpt.type.getSubOptions serverOpt.loc).package;
 
       # The lua_ls package attr to remove from pkgs
-      packageName = lib.pipe ../../../plugins/lsp/lsp-packages.nix [
+      packageName = lib.pipe ../../../modules/lsp/servers/packages.nix [
         import
         (lib.getAttr "packages")
         (lib.getAttr "lua_ls")
diff --git a/typos.toml b/typos.toml
index 86fe0d2a..f0665dd4 100644
--- a/typos.toml
+++ b/typos.toml
@@ -13,7 +13,7 @@ Highligt = "Highligt"         # TODO: ./plugins/utils/neogen.nix
 Annote = "Annote"             # TODO: ./plugins/lsp/fidget.nix
 ket = "ket"                   # ./plugins/utils/sandwich.nix
 tro = "tro"                   # ./plugins/utils/spectre.nix
-protols = "protols"           # ./plugins/lsp/lsp-packages.nix
+protols = "protols"           # ./modules/lsp/servers/packages.nix
 compatibilty = "compatibilty" # ./plugins/by-name/visual-multi/default.nix
 Maco = "Maco"                 # ./plugins/by-name/femaco
 enew = "enew"                 # ./tests/test-sources/plugins/by-name/tv/default.nix