diff --git a/.config/kak/autoload/fishr/fishr.kak b/.config/kak/autoload/fishr/fishr.kak
index e3a471a4..d8dc6a20 100644
--- a/.config/kak/autoload/fishr/fishr.kak
+++ b/.config/kak/autoload/fishr/fishr.kak
@@ -1,5 +1,16 @@
 provide-module fishr %~
 
+def sh -params .. %{
+    eval eval "%%sh{""$@"" # %sh{printf '%s ' ""$@"" | grep -o 'kak_\w\+' | tr '\n' ' '}}"
+}
+
+def fishtest %{
+    sh fish -c %{
+        echo "info -- $kak_buffile"
+        notify-send "$kak_buffile"
+    }
+}
+
 define-command fish -params 1.. -docstring %{
 	fish [code]: Execute provided fish code, evaluating its output as Kakoune commands.
 } %{
@@ -7,11 +18,11 @@ define-command fish -params 1.. -docstring %{
     	vars=$(
         	printf %s "$1" | grep -o 'kak_\w*' | sort -u | tr '\n' ' '
     	)
-    	notify-send "$1"
-    	args='"$1"'
-    	printf %s "eval %sh{ fish -c \"eval $1\" # $vars } " >/tmp/fish-test
-    	printf %s "eval %sh{ fish -c \"eval $1\" # $vars } "
-    	}
+    	# notify-send "$1"
+    	tmp="$(mktemp)"
+    	printf "%s\n%s" "#!/bin/env fish" "$1">"$tmp"
+    	printf %s "eval %sh{ fish $tmp # $vars } ">/tmp/fish-test
+	}
 }
 
 define-command fish-keys -params 1.. -docstring %{
diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index 7330d411..6fe25b2f 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -2,9 +2,11 @@ eval %sh{ kak-tree-sitter -vvvvv -dks --init $kak_session }
 colorscheme ashen
 require-module fishr
 
-fish %{
-    notify-send $kak_buffile
-    notify-send "$kak_buffile"
+def fishtest %{
+    sh fish -c %{
+        echo "info -- $kak_buffile"
+        notify-send "$kak_buffile"
+    }
 }
 
 set-option global ashen_dynamic_cursor true