Replace nixd with nil_ls

This commit is contained in:
Oliver Davies 2024-03-19 14:19:20 +00:00
parent 026c4a3c1f
commit 298601c4e0
4 changed files with 2 additions and 64 deletions

View file

@ -17,45 +17,6 @@
"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": {
"locked": {
"lastModified": 1710631334,
@ -106,28 +67,9 @@
"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": {
"inputs": {
"flake-parts": "flake-parts",
"nixd-nightly": "nixd-nightly",
"nixpkgs": "nixpkgs",
"nixpkgs-2305": "nixpkgs-2305"
}

View file

@ -2,9 +2,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
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, ... }:

View file

@ -257,7 +257,6 @@ in rec {
mkExtraPackages = { system }:
let
inherit (inputs) nixd-nightly;
inherit (pkgs) nodePackages lua54Packages php82Packages;
pkgs = import inputs.nixpkgs {
@ -272,7 +271,6 @@ in rec {
# Language servers
lua54Packages.luacheck
nixd-nightly.packages.${system}.nixd
nodePackages."@tailwindcss/language-server"
nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs
@ -285,6 +283,7 @@ in rec {
nodePackages.yaml-language-server
pkgs.gopls
pkgs.lua-language-server
pkgs.nil
pkgs.phpactor
pkgs.terraform-ls

View file

@ -96,7 +96,7 @@ local servers = {
},
},
},
nixd = {},
nil_ls = {},
tailwindcss = {
filetypes = { "html", "html.twig", "javascript", "typescript", "vue" },