From 40f0fd3c8804c5aedf94b896d7a489cb81db02f6 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sun, 30 Jan 2022 13:49:25 -0500
Subject: [PATCH] Update kak and kak-lsp

Should fix some bugs and bring back upper-case goto
---
 home/kakoune/kak.nix                         | 30 ++++++++++++++++++--
 home/kakoune/kakrc                           |  2 +-
 home/modules/programs/my-kakoune/kak-lsp.nix | 26 +----------------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/home/kakoune/kak.nix b/home/kakoune/kak.nix
index f000c3d..d8bf279 100644
--- a/home/kakoune/kak.nix
+++ b/home/kakoune/kak.nix
@@ -3,7 +3,7 @@
 let
   kakounePkg =
     let
-      rev = "9acd4e62dc485aa7e44a601a0300697f8825a98c";
+      rev = "d44d07bd801a939de65e5c237f65b54c187143c1";
     in
     pkgs.kakoune.override {
       kakoune = pkgs.kakoune-unwrapped.overrideAttrs (oldAttrs: {
@@ -12,11 +12,36 @@ let
           repo = "kakoune";
           owner = "mawww";
           rev = rev;
-          sha256 = "sha256-d0s1wA/GRpq3F6JRBWJaZQPY8UqzTzW5/hx0NlkIC6Q=";
+          sha256 = "sha256-32WTy5qQgg9Sly86KZcO0gEaHTfHUSNAT+E5+JnHkr8=";
           # sha256 = lib.fakeSha256;
         };
       });
     };
+
+  kak-lsp =
+    let
+      rev = "v12.0.1";
+      # 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-K2GMoLaH7D6UtPuL+GJMqsPFwriyyi7WMdfzBmOceSA=";
+        # sha256 = lib.fakeSha256;
+      };
+
+      cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
+        inherit src;
+        outputHash = "sha256-G7X/dZTryNlwY9n02LL/3yVpB2L1vWGx/lqYblFDAOM=";
+        # outputHash = lib.fakeSha256;
+      });
+    });
 in
 {
   imports = [ ../modules/programs/my-kakoune ./kaktex.nix ];
@@ -25,6 +50,7 @@ in
   programs.my-kakoune.enable = true;
   programs.my-kakoune.enable-fish-session = true;
   programs.kak-lsp.enable = true;
+  programs.kak-lsp.package = kak-lsp;
 
   programs.my-kakoune.package = kakounePkg;
   programs.my-kakoune.rc =
diff --git a/home/kakoune/kakrc b/home/kakoune/kakrc
index 504bb8b..806e8f5 100644
--- a/home/kakoune/kakrc
+++ b/home/kakoune/kakrc
@@ -38,7 +38,7 @@ map global normal <#> ': comment-line<ret>'
 map global normal <a-#> ': comment-block<ret>'
 
 # Go to grep-jump
-map global goto F -docstring "current grep-jump match" '<esc>: grep-jump<ret>'
+map global goto f -docstring "current grep-jump match" '<esc>: grep-jump<ret>'
 
 # System clipboard interactions
 hook global RegisterModified '"' %{ nop %sh{
diff --git a/home/modules/programs/my-kakoune/kak-lsp.nix b/home/modules/programs/my-kakoune/kak-lsp.nix
index 7018d42..1839e91 100644
--- a/home/modules/programs/my-kakoune/kak-lsp.nix
+++ b/home/modules/programs/my-kakoune/kak-lsp.nix
@@ -2,28 +2,6 @@
 
 with lib;
 let
-  rev = "744a1981b8cf669a96e329bc255d31e0c2bdcb14";
-  version = "r${builtins.substring 0 6 rev}";
-
-  kak-lsp = 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-eeONynT1oJafgJbfl8u/h4OJuORjropDrEUK0Raj8Jg=";
-      # sha256 = lib.fakeSha256;
-    };
-
-    cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
-      inherit src;
-      outputHash = "sha256-LqsCM4P6aJFZRGOxZtxXvSEbBSeQcC+4WbIwtlrO3e4=";
-      # outputHash = lib.fakeSha256;
-    });
-  });
-
   lspConfig =
     {
       language = {
@@ -231,7 +209,7 @@ in
 
     package = mkOption {
       type = types.package;
-      default = kak-lsp;
+      default = pkgs.kak-lsp;
     };
 
     enableSnippets = mkOption {
@@ -283,6 +261,4 @@ in
       '';
     };
   };
-
-
 }