From 44c2288a43c7b52d1aaf0728fa1ea75dbae4656e Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Mon, 11 Apr 2022 14:09:07 -0400
Subject: [PATCH] Update nix inputs and kak-lsp

---
 flake.lock           |  6 +++---
 home/kakoune/kak.nix | 50 ++++++++++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index bfbbd05..366577c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -210,11 +210,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1649117019,
-        "narHash": "sha256-ID7nw/8MDgqj/cbJ0wy6AtQ9wp58hSnE6+weZwuHnso=",
+        "lastModified": 1649490789,
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ccb90fb9e11459aeaf83cc28d5f8910816d90dd0",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
         "type": "github"
       },
       "original": {
diff --git a/home/kakoune/kak.nix b/home/kakoune/kak.nix
index e648535..5f372a6 100644
--- a/home/kakoune/kak.nix
+++ b/home/kakoune/kak.nix
@@ -27,28 +27,37 @@ let
 
   kak-lsp =
     let
-      rev = "v12.1.0";
-      # version = "r${builtins.substring 0 6 rev}";
-      version = rev;
+      rev = "e98868235515664aeb42f0784073128dcda63ce1";
+      version = "r${builtins.substring 0 6 rev}";
+      # version = rev;
     in
-    pkgs.kak-lsp.overrideAttrs (drv: rec {
-      inherit rev version;
-      buildInputs = drv.buildInputs ++
-        (with pkgs; lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration);
-      src = pkgs.fetchFromGitHub {
-        owner = "kak-lsp";
-        repo = "kak-lsp";
-        rev = rev;
-        sha256 = "sha256-5sPw95lSbswIUbNIZ4mpA3WeZt7u+a5s4KxkTnN14Sw=";
-        # sha256 = lib.fakeSha256;
-      };
+    pkgs.unstable.rustPlatform.buildRustPackage
+      rec {
+        inherit rev version;
+        pname = "kak-lsp";
 
-      cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
-        inherit src;
-        outputHash = "sha256-Ezp9Lf2RacJlbMeiaSIDKdTQSg9pXgLyJcbBLJbqS5k=";
-        # outputHash = lib.fakeSha256;
-      });
-    });
+        src = pkgs.fetchFromGitHub {
+          owner = pname;
+          repo = pname;
+          rev = "v${version}";
+          sha256 = "sha256-xjfYdwDNp2Ak7t0dfp0SWJcFVve2iDcEKzDukcxVmzI=";
+          # sha256 = lib.fakeSha256;
+        };
+
+        cargoSha256 = "sha256-xfo/LPx8KC4e5KbVkLs6+ezqcZrjjqIE3egB8aSWxo4=";
+        # cargoSha256 = lib.fakeSha256;
+
+        buildInputs = (with pkgs;
+          lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ])
+        );
+
+        meta = with lib; {
+          description = "Kakoune Language Server Protocol Client";
+          homepage = "https://github.com/kak-lsp/kak-lsp";
+          license = with licenses; [ unlicense /* or */ mit ];
+          maintainers = [ maintainers.spacekookie ];
+        };
+      };
 in
 {
   imports = [ ../modules/programs/my-kakoune ./kaktex.nix ];
@@ -158,3 +167,4 @@ in
     }
   ];
 }
+