modules/lsp: move packages.nix from plugins.lsp

Move plugins/lsp/lsp-packages.nix -> modules/lsp/servers/packages.nix

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
         ;

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

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;
 

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")

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