From 4c491f359c303f34e18654d9c0b510fafa8c4c49 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sun, 10 Dec 2023 01:58:58 +0100
Subject: [PATCH] Replace rnix-lsp with nil

---
 flake.lock                                   | 77 +-------------------
 flake.nix                                    |  1 -
 home/common.nix                              |  1 -
 home/modules/programs/my-kakoune/kak-lsp.nix |  2 +-
 overlay.nix                                  |  1 -
 5 files changed, 3 insertions(+), 79 deletions(-)

diff --git a/flake.lock b/flake.lock
index 60d77c0..4597090 100644
--- a/flake.lock
+++ b/flake.lock
@@ -816,27 +816,6 @@
       }
     },
     "naersk_2": {
-      "inputs": {
-        "nixpkgs": [
-          "rnix-lsp",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1655042882,
-        "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "naersk_3": {
       "inputs": {
         "nixpkgs": [
           "youmubot",
@@ -999,22 +978,6 @@
       }
     },
     "nixpkgs_11": {
-      "locked": {
-        "lastModified": 1656753965,
-        "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_12": {
       "locked": {
         "lastModified": 1685533922,
         "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=",
@@ -1201,26 +1164,6 @@
         "type": "github"
       }
     },
-    "rnix-lsp": {
-      "inputs": {
-        "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_11",
-        "utils": "utils_2"
-      },
-      "locked": {
-        "lastModified": 1669555118,
-        "narHash": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=",
-        "owner": "nix-community",
-        "repo": "rnix-lsp",
-        "rev": "95d40673fe43642e2e1144341e86d0036abd95d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "rnix-lsp",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "arion": "arion",
@@ -1241,7 +1184,6 @@
         "nixpkgs": "nixpkgs_10",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
-        "rnix-lsp": "rnix-lsp",
         "secrets": "secrets",
         "sops-nix": "sops-nix",
         "swayfx": "swayfx",
@@ -1577,26 +1519,11 @@
         "type": "github"
       }
     },
-    "utils_2": {
-      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "youmubot": {
       "inputs": {
         "flake-utils": "flake-utils_10",
-        "naersk": "naersk_3",
-        "nixpkgs": "nixpkgs_12"
+        "naersk": "naersk_2",
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
         "lastModified": 1701010022,
diff --git a/flake.nix b/flake.nix
index f270ee9..79f38e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,6 @@
 
     # ---
     # Imported apps
-    rnix-lsp.url = "github:nix-community/rnix-lsp";
     youmubot.url = "github:natsukagami/youmubot";
     swayfx = {
       url = github:WillPower3309/swayfx;
diff --git a/home/common.nix b/home/common.nix
index 829a69e..c12cac3 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -42,7 +42,6 @@ in
     yarn
     ## Nix
     cachix
-    rnix-lsp
     ## Latex
     tectonic
     texlab
diff --git a/home/modules/programs/my-kakoune/kak-lsp.nix b/home/modules/programs/my-kakoune/kak-lsp.nix
index fff9a5b..1a5bd8a 100644
--- a/home/modules/programs/my-kakoune/kak-lsp.nix
+++ b/home/modules/programs/my-kakoune/kak-lsp.nix
@@ -106,7 +106,7 @@ let
           roots = [ "*.nimble" ".git" ];
         };
         nix = {
-          command = "rnix-lsp";
+          command = "${pkgs.nil}/bin/nil";
           filetypes = [ "nix" ];
           roots = [ "flake.nix" "shell.nix" ".git" ];
         };
diff --git a/overlay.nix b/overlay.nix
index 38b509f..e15c6a7 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -13,7 +13,6 @@ let
     typst-lsp = final.unstable.typst-lsp;
   };
   overlay-imported = final: prev: {
-    rnix-lsp = inputs.rnix-lsp.defaultPackage."${final.system}";
     sway = prev.sway.override { sway-unwrapped = final.swayfx-unwrapped; };
     deploy-rs = inputs.deploy-rs.packages.default;
     dtth-phanpy = inputs.dtth-phanpy.packages.${final.system}.default;