From 3b6cbf84065a90b993cd4b93092c83adc6a41d7c Mon Sep 17 00:00:00 2001
From: Daniel Fichtinger <daniel@ficd.ca>
Date: Fri, 16 May 2025 22:13:01 -0400
Subject: [PATCH] AutoYADM commit: 2025-05-16 22:13:01

---
 .config/kak/autoload/fishr/fishr.kak | 20 +++++++++++++++++---
 .config/kak/kakrc                    |  1 +
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.config/kak/autoload/fishr/fishr.kak b/.config/kak/autoload/fishr/fishr.kak
index f2d343c0..8a2db89f 100644
--- a/.config/kak/autoload/fishr/fishr.kak
+++ b/.config/kak/autoload/fishr/fishr.kak
@@ -1,13 +1,27 @@
-declare-option -hidden str fishr_path %sh{ dirname "$kak_source" }
-
 provide-module fishr %~
 
 define-command fish -params 1.. -docstring %{
-	fish [args...] code: Execute provided fish code, evaluating its output as Kakoune commands.
+	fish [code]: Execute provided fish code, evaluating its output as Kakoune commands.
 } %{
 	evaluate-commands %sh{
 		fish -c "eval $@"
 	}
 }
 
+define-command fish-keys -params 1.. -docstring %{
+	fish-keys [code]: Execute provided fish code, executing its output with execute-keys.
+} %{
+	execute-keys %sh{
+		fish -c "eval $@"
+	} 
+}
+
+require-module fish
+require-module kak
+
+add-highlighter shared/kakrc/code/fish regex (?:\s|\A)\K(fish|fish-keys)(?:(?=\s)|\z) 0:keyword
+add-highlighter shared/kakrc/fish1 region -recurse '\{' '(^|\h)(fish|fish-keys)([\s{}\w%/$-|''"])* %\{\K' '\}' ref fish
+add-highlighter shared/kakrc/fish2 region -recurse '\(' '(^|\h)(fish|fish-keys)([\s{}\w%/$-|''"])* %\(\K' '\)' ref fish
+add-highlighter shared/kakrc/fish3 region -recurse '\[' '(^|\h)(fish|fish-keys)([\s{}\w%/$-|''"])* %\[\K' '\]' ref fish
+add-highlighter shared/kakrc/fish4 region -recurse '<' '(^|\h)(fish|fish-keys)([\s{}\w%/$-|''"])* %<\K' '>' ref fish
 ~
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 270dffe3..36cb56d3 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -1,5 +1,6 @@
 eval %sh{ kak-tree-sitter -vvvvv -dks --init $kak_session }
 colorscheme ashen
+require-module fishr
 set-option global ashen_dynamic_cursor true
 set-option global ashen_eol_cursor true
 # disable clippy