From 7891699ec53755fb830a7304a4226e93d520b802 Mon Sep 17 00:00:00 2001
From: lelgenio <lelgenio@disroot.org>
Date: Fri, 25 Nov 2022 16:13:01 -0300
Subject: [PATCH] Add nil lsp

---
 flake.lock            | 63 +++++++++++++++++++++++++++++++++++++++++++
 flake.nix             |  3 +++
 overlays/default.nix  |  1 +
 user/home.nix         |  1 +
 user/kak/kak-lsp.toml |  2 +-
 5 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index cce8bad..867df88 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,6 +73,21 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -131,6 +146,28 @@
         "type": "github"
       }
     },
+    "nil-lsp": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1669391194,
+        "narHash": "sha256-4oWcXqyBYPHF+Wt8AxRhWk70O1qVJPkyBw2IhxJtj6k=",
+        "owner": "oxalica",
+        "repo": "nil",
+        "rev": "afec5fed829ee193de7e8c62e1fb4bd55140f4ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "nil",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1659219666,
@@ -231,6 +268,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "material-wifi-icons": "material-wifi-icons",
+        "nil-lsp": "nil-lsp",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
@@ -257,6 +295,31 @@
         "type": "github"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "nil-lsp",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nil-lsp",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1669170936,
+        "narHash": "sha256-TKPH4Pzkjw5gAPo9hejs3O4mWJW6V/RSiOj8UuSFRTs=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "c90c223c4aef334356029b89c72bb65e26f7efe6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sea-orm-cli": {
       "locked": {
         "lastModified": 1659947860,
diff --git a/flake.nix b/flake.nix
index 26c5b8e..09b5d93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,9 @@
 
     sea-orm-cli.url = "github:lucperkins/nixpkgs/lperkins/sea-orm-cli";
 
+    nil-lsp.url = "github:oxalica/nil";
+    nil-lsp.inputs.nixpkgs.follows = "nixpkgs-unstable";
+
     # my stuff
     dhist.url = "github:lelgenio/dhist";
   };
diff --git a/overlays/default.nix b/overlays/default.nix
index 299f42a..975a605 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,6 +12,7 @@
         dhist = inputs.dhist.packages.${system}.dhist;
         mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper;
         sea-orm-cli = inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli;
+        nil-lsp = inputs.nil-lsp.packages.${prev.system}.nil;
         alacritty = (prev.unstable.alacritty.overrideAttrs (old-alacritty: rec {
           src = inputs.alacritty-sixel;
           cargoDeps = old-alacritty.cargoDeps.overrideAttrs (prev.lib.const {
diff --git a/user/home.nix b/user/home.nix
index daaec9c..7acfc1c 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -103,6 +103,7 @@ in {
     nodePackages.uglify-js
 
     flow # js lsp server
+    nil-lsp # nix lsp server
 
     # cargo
     cargo-edit
diff --git a/user/kak/kak-lsp.toml b/user/kak/kak-lsp.toml
index e5b63ed..62607d5 100644
--- a/user/kak/kak-lsp.toml
+++ b/user/kak/kak-lsp.toml
@@ -108,7 +108,7 @@ command = "nimlsp"
 [language.nix]
 filetypes = ["nix"]
 roots = ["flake.nix", "shell.nix", ".git"]
-command = "rnix-lsp"
+command = "nil"
 
 [language.ocaml]
 filetypes = ["ocaml"]