From 6b7642dc76175dd8adcb8509a20d07d6e3c599f0 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Fri, 9 Jun 2023 00:50:52 +0200
Subject: [PATCH] update and replace nixd with nil

---
 devshell.nix                             |  2 +-
 flake.lock                               | 58 ------------------------
 flake.nix                                |  4 --
 home/modules/helix/config/languages.toml |  2 +-
 outputs.nix                              |  2 -
 5 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/devshell.nix b/devshell.nix
index fd2bf2a..27b9799 100644
--- a/devshell.nix
+++ b/devshell.nix
@@ -8,7 +8,7 @@
     agenix
     nixpkgs-fmt
     nixos-rebuild
-    nixd
+    nil
   ];
 
   commands = [
diff --git a/flake.lock b/flake.lock
index 8d0ef0c..428f571 100644
--- a/flake.lock
+++ b/flake.lock
@@ -130,24 +130,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
-      "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-registry": {
       "flake": false,
       "locked": {
@@ -334,27 +316,6 @@
         "type": "github"
       }
     },
-    "nixd": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1686235158,
-        "narHash": "sha256-xnp65zqxlX4CaeWSbH2rRakSq2fgz8ukep/R3ga8UXA=",
-        "owner": "nix-community",
-        "repo": "nixd",
-        "rev": "b5079c4d79905048d3c0b39e1a2a6a66067f1111",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixd",
-        "type": "github"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1685840432,
@@ -441,24 +402,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib_2": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1685564631,
-        "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1629226339,
@@ -568,7 +511,6 @@
         "helix": "helix",
         "home-manager": "home-manager",
         "homePage": "homePage",
-        "nixd": "nixd",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
diff --git a/flake.nix b/flake.nix
index 4560b95..1248697 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,10 +32,6 @@
       flake = false;
     };
     helix.url = "github:helix-editor/helix/23.03";
-    nixd = {
-      url = "github:nix-community/nixd";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = { ... } @ args: import ./outputs.nix args;
diff --git a/home/modules/helix/config/languages.toml b/home/modules/helix/config/languages.toml
index b9ed5e7..07f8344 100644
--- a/home/modules/helix/config/languages.toml
+++ b/home/modules/helix/config/languages.toml
@@ -12,4 +12,4 @@ roots = []
 [[language]]
 name = "nix"
 file-types = ["nix"]
-language-server = { command = "nixd" }
+language-server = { command = "nil" }
diff --git a/outputs.nix b/outputs.nix
index a775153..90e3305 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -10,7 +10,6 @@
 , agenix
 , devshell
 , helix
-, nixd
 , ...
 } @ inputs:
 (flake-utils.lib.eachDefaultSystem (system:
@@ -25,7 +24,6 @@
           overlays = [
             agenix.overlay
             devshell.overlays.default
-            (final: prev: { nixd = nixd.packages.${system}.nixd; })
           ];
         };
         extraModules = [ "${devshell}/extra/git/hooks.nix" ];