nix-community/nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-12-16 05:51:10 +01:00
Code Activity

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

Browse source 
Move plugins/lsp/lsp-packages.nix -> modules/lsp/servers/packages.nix
This commit is contained in:
Matt Sturgeon 2025-12-13 16:43:16 +00:00 • committed by Gaétan Lepage
parent 74136352cf
commit c97e8e3425
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/lsp/servers/default.nix
View file

@ -60,11 +60,11 @@ let
default = { }; 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 # We use this set to generate the package-option defaults
serverPackages = serverPackages =
let let
inherit (import ../../../plugins/lsp/lsp-packages.nix) inherit (import ./packages.nix)
packages packages
customCmd customCmd
; ;

0
plugins/lsp/lsp-packages.nix → modules/lsp/servers/packages.nix
View file

2
plugins/lsp/language-servers/default.nix
View file

@ -212,7 +212,7 @@ let
}; };
}; };
lspPackages = import ../lsp-packages.nix; lspPackages = import ../../../modules/lsp/servers/packages.nix;
generatedServers = lib.pipe ../../../generated/lspconfig-servers.json [ generatedServers = lib.pipe ../../../generated/lspconfig-servers.json [
lib.importJSON lib.importJSON

4
tests/generated.nix
View file

@ -45,11 +45,11 @@ let
errors = lib.concatStringsSep "\n" ( errors = lib.concatStringsSep "\n" (
checkDeclarations ( checkDeclarations (
let let
inherit (import ../plugins/lsp/lsp-packages.nix) unpackaged packages customCmd; inherit (import ../modules/lsp/servers/packages.nix) unpackaged packages customCmd;
in in
{ {
name = "lsp"; name = "lsp";
declarationFile = "plugins/lsp/lsp-packages.nix"; declarationFile = "modules/lsp/servers/packages.nix";
packages = builtins.attrValues packages; packages = builtins.attrValues packages;

2
tests/test-sources/modules/lsp.nix
View file

@ -272,7 +272,7 @@
packageOpt = (serverOpt.type.getSubOptions serverOpt.loc).package; packageOpt = (serverOpt.type.getSubOptions serverOpt.loc).package;
# The lua_ls package attr to remove from pkgs # 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 import
(lib.getAttr "packages") (lib.getAttr "packages")
(lib.getAttr "lua_ls") (lib.getAttr "lua_ls")

2
typos.toml
View file

@ -13,7 +13,7 @@ Highligt = "Highligt" # TODO: ./plugins/utils/neogen.nix
Annote = "Annote" # TODO: ./plugins/lsp/fidget.nix Annote = "Annote" # TODO: ./plugins/lsp/fidget.nix
ket = "ket" # ./plugins/utils/sandwich.nix ket = "ket" # ./plugins/utils/sandwich.nix
tro = "tro" # ./plugins/utils/spectre.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 compatibilty = "compatibilty" # ./plugins/by-name/visual-multi/default.nix
Maco = "Maco" # ./plugins/by-name/femaco Maco = "Maco" # ./plugins/by-name/femaco
enew = "enew" # ./tests/test-sources/plugins/by-name/tv/default.nix enew = "enew" # ./tests/test-sources/plugins/by-name/tv/default.nix