From 298601c4e09039afe632546db324460a4750d29d Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Tue, 19 Mar 2024 14:19:20 +0000
Subject: [PATCH] Replace `nixd` with `nil_ls`

---
 flake.lock                | 58 ---------------------------------------
 flake.nix                 |  3 --
 lib/default.nix           |  3 +-
 lua/opdavies/lsp/init.lua |  2 +-
 4 files changed, 2 insertions(+), 64 deletions(-)

diff --git a/flake.lock b/flake.lock
index efd56a2..d6311ea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -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"
       }
diff --git a/flake.nix b/flake.nix
index d6f93ef..fbb15ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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, ... }:
diff --git a/lib/default.nix b/lib/default.nix
index f5c40de..8463822 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -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
 
diff --git a/lua/opdavies/lsp/init.lua b/lua/opdavies/lsp/init.lua
index 28345d9..3519d04 100644
--- a/lua/opdavies/lsp/init.lua
+++ b/lua/opdavies/lsp/init.lua
@@ -96,7 +96,7 @@ local servers = {
       },
     },
   },
-  nixd = {},
+  nil_ls = {},
   tailwindcss = {
     filetypes = { "html", "html.twig", "javascript", "typescript", "vue" },