From 2e472975aeae810f34a13664520ef2e899a5bd1e Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sat, 17 Apr 2021 02:32:45 +0300
Subject: [PATCH] kakoune fixed tm

---
 overlays/kakoune.nix   |  9 +++++++++
 overlays/kcr.nix       | 17 +++++++++++++++++
 users/patriot/home.nix | 14 ++++++++++----
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 overlays/kakoune.nix
 create mode 100644 overlays/kcr.nix

diff --git a/overlays/kakoune.nix b/overlays/kakoune.nix
new file mode 100644
index 0000000..d2cb46d
--- /dev/null
+++ b/overlays/kakoune.nix
@@ -0,0 +1,9 @@
+final: prev: rec {
+  kakoune-unwrapped = prev.kakoune-unwrapped.overrideAttrs (old: {
+    version = "5696ed02";
+    src = builtins.fetchGit {
+      url = "https://github.com/mawww/kakoune.git";
+      rev = "5696ed02e49cb9ba076a9a8ce908597720e7df1c";
+    };
+  });
+}
diff --git a/overlays/kcr.nix b/overlays/kcr.nix
new file mode 100644
index 0000000..8a6e9bc
--- /dev/null
+++ b/overlays/kcr.nix
@@ -0,0 +1,17 @@
+final: prev: {
+  kcr = prev.stdenv.mkDerivation {
+    pname = "kcr";
+    version = "nightly";
+
+    src = prev.fetchzip {
+      url = "https://github.com/alexherbo2/kakoune.cr/releases/download/nightly/kakoune.cr-nightly-x86_64-unknown-linux-musl.zip";
+      stripRoot = false;
+      sha256 = "sha256-3OqhuSXKZE/gakbUN/0iSqcsjvQnnXBcVq/zc7vMO04=";
+    };
+
+    installPhase = ''
+      mkdir -p $out/bin
+      install bin/kcr $out/bin
+    '';
+  };
+}
diff --git a/users/patriot/home.nix b/users/patriot/home.nix
index 482b5bd..7a7c7b9 100644
--- a/users/patriot/home.nix
+++ b/users/patriot/home.nix
@@ -14,11 +14,10 @@ let
   fontComb = "${font} ${toString fontSize}";
   fontPackage = pkgs.iosevka;
 
-  kideSrc = pkgs.fetchgit {
+  kideSrc = builtins.fetchGit {
     url = "https://gitlab.com/yusdacra/kide.git";
-    rev = "2d76f8b668e7ff12fd686a101f0d26d50b6c0ece";
-    sha256 = "sha256-ONQmrJvNnmQ9W350od46VECW6Ir3KOMUJRnEMeVIsgg=";
-    fetchSubmodules = true;
+    rev = "778d68df0cfcb96d6113bfe6a59e5dfc71ee7d82";
+    submodules = true;
   };
   kideFiles =
     mapAttrs' (n: _: nameValuePair "kak/${n}" { source = "${kideSrc}/${n}"; })
@@ -31,6 +30,13 @@ let
     kak-lsp
     wl-clipboard
     xclip
+    shellcheck
+    perl
+    socat
+    gdb
+    kcr
+    jq
+    file
   ];
 
   chromiumWayland = pkgs.writeScriptBin "chromium-wayland" ''