From 9ac5fedc75078d0932c846eea1936a3ced13009c Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sat, 30 Mar 2024 14:48:55 +0100
Subject: [PATCH] Update kak to add indentation guides

---
 flake.lock         | 6 +++---
 home/kakoune/kakrc | 5 +++++
 overlay.nix        | 6 ------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 817b481..21fc9c1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -834,11 +834,11 @@
     "kakoune": {
       "flake": false,
       "locked": {
-        "lastModified": 1709208365,
-        "narHash": "sha256-ELe7LOpRXudxluxI/RDRd8+pMNiIQFFNd4PC7LXgWss=",
+        "lastModified": 1711536985,
+        "narHash": "sha256-Sm/m2fdjNLK2DUDQPAXKAD3vRPJ5tPeus1307MPc8Ro=",
         "owner": "mawww",
         "repo": "kakoune",
-        "rev": "504b074aa715b1d4893cd6f918f3cc333e5f3007",
+        "rev": "2f7568485ff6ac6aaf83f6ac5988de6a723083c4",
         "type": "github"
       },
       "original": {
diff --git a/home/kakoune/kakrc b/home/kakoune/kakrc
index 9644317..b413851 100644
--- a/home/kakoune/kakrc
+++ b/home/kakoune/kakrc
@@ -10,6 +10,11 @@ set global kts_sky "rgb:6aa622"
 colorscheme catppuccin-latte
 set global background default
 
+# Set indentation guides
+add-highlighter global/indent-guides show-whitespaces -tab " " -spc " " -lf " " -nbsp " "
+set-face global Whitespace default,default
+set-face global WhitespaceIndent +d@comment
+
 # Assistant
 set global ui_options terminal_assistant=cat
 
diff --git a/overlay.nix b/overlay.nix
index 6c0ab9f..527948e 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -57,12 +57,6 @@ let
         src = inputs.kakoune;
         patches = [
           # patches in the original package was already applied
-
-          # https://github.com/mawww/kakoune/pull/5108
-          (final.fetchpatch {
-            url = "https://github.com/mawww/kakoune/commit/64b3433905eeb33653ed617d61906ba68c686916.patch";
-            hash = "sha256-XYA4GcOEuWHsnDhMI0nXbg9Myv2o1UZ8qvzavIXbkJo=";
-          })
         ];
       });
   };