Replace nixd
with nil_ls
This commit is contained in:
parent
026c4a3c1f
commit
298601c4e0
58
flake.lock
58
flake.lock
|
@ -17,45 +17,6 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709336216,
|
|
||||||
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixd-nightly": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1710553072,
|
|
||||||
"narHash": "sha256-g80GlUrlCdHQVaJq9r8myCIzLmQp59e6jiGfxkodNYo=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nixd",
|
|
||||||
"rev": "a436786fbd8ed5aafea4b0512cb1170a6e0e39df",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nixd",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710631334,
|
"lastModified": 1710631334,
|
||||||
|
@ -106,28 +67,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-lib_2": {
|
|
||||||
"locked": {
|
|
||||||
"dir": "lib",
|
|
||||||
"lastModified": 1709237383,
|
|
||||||
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"dir": "lib",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"nixd-nightly": "nixd-nightly",
|
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-2305": "nixpkgs-2305"
|
"nixpkgs-2305": "nixpkgs-2305"
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,9 +2,6 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-2305.url = "github:NixOS/nixpkgs/nixos-23.05";
|
nixpkgs-2305.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||||
|
|
||||||
nixd-nightly.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
nixd-nightly.url = "github:nix-community/nixd";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, flake-parts, ... }:
|
outputs = inputs@{ self, flake-parts, ... }:
|
||||||
|
|
|
@ -257,7 +257,6 @@ in rec {
|
||||||
|
|
||||||
mkExtraPackages = { system }:
|
mkExtraPackages = { system }:
|
||||||
let
|
let
|
||||||
inherit (inputs) nixd-nightly;
|
|
||||||
inherit (pkgs) nodePackages lua54Packages php82Packages;
|
inherit (pkgs) nodePackages lua54Packages php82Packages;
|
||||||
|
|
||||||
pkgs = import inputs.nixpkgs {
|
pkgs = import inputs.nixpkgs {
|
||||||
|
@ -272,7 +271,6 @@ in rec {
|
||||||
|
|
||||||
# Language servers
|
# Language servers
|
||||||
lua54Packages.luacheck
|
lua54Packages.luacheck
|
||||||
nixd-nightly.packages.${system}.nixd
|
|
||||||
nodePackages."@tailwindcss/language-server"
|
nodePackages."@tailwindcss/language-server"
|
||||||
nodePackages.bash-language-server
|
nodePackages.bash-language-server
|
||||||
nodePackages.dockerfile-language-server-nodejs
|
nodePackages.dockerfile-language-server-nodejs
|
||||||
|
@ -285,6 +283,7 @@ in rec {
|
||||||
nodePackages.yaml-language-server
|
nodePackages.yaml-language-server
|
||||||
pkgs.gopls
|
pkgs.gopls
|
||||||
pkgs.lua-language-server
|
pkgs.lua-language-server
|
||||||
|
pkgs.nil
|
||||||
pkgs.phpactor
|
pkgs.phpactor
|
||||||
pkgs.terraform-ls
|
pkgs.terraform-ls
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,7 @@ local servers = {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
nixd = {},
|
nil_ls = {},
|
||||||
tailwindcss = {
|
tailwindcss = {
|
||||||
filetypes = { "html", "html.twig", "javascript", "typescript", "vue" },
|
filetypes = { "html", "html.twig", "javascript", "typescript", "vue" },
|
||||||
|
|
||||||
|
|
Reference in a new issue