From 903ae46b5d54e416c88c1d51df1f9b30cee10edc Mon Sep 17 00:00:00 2001
From: Justin Frank <jf.laelath@gmail.com>
Date: Sun, 23 Sep 2018 13:15:29 -0700
Subject: [PATCH 1/2] Added more kitty integration

---
 rc/extra/kitty.kak | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/rc/extra/kitty.kak b/rc/extra/kitty.kak
index 73c0b9e2..57b630e0 100644
--- a/rc/extra/kitty.kak
+++ b/rc/extra/kitty.kak
@@ -1,8 +1,13 @@
-hook global KakBegin .* %sh{
+declare-option -docstring %{window type that kitty creates on new and repl calls (kitty|os)} str kitty_window_type kitty
+
+hook -group kitty-hooks global KakBegin .* %sh{
     if [ "$TERM" = "xterm-kitty" ] && [ -z "$TMUX" ]; then
         echo "
             alias global new kitty-new
+            alias global new-tab kitty-new-tab
             alias global focus kitty-focus
+            alias global repl kitty-repl
+            alias global send-text kitty-send-text
         "
     fi
 }
@@ -12,7 +17,15 @@ Optional arguments are passed as arguments to the new client} \
     -params .. \
     -command-completion \
     kitty-new %{ nop %sh{
-        kitty @ new-window --no-response "$(command -v kak 2>/dev/null)" -c "${kak_session}" -e "$*"
+        kitty @ new-window --no-response --window-type $kak_opt_kitty_window_type "$(command -v kak 2>/dev/null)" -c "${kak_session}" -e "$*"
+}}
+
+define-command -docstring %{kitty-new-tab [<arguments>]: create a new tab
+All optional arguments are forwarded to the new kak client} \
+    -params .. \
+    -command-completion \
+    kitty-new-tab %{ nop %sh{
+        kitty @ new-window --no-response --new-tab "$(command -v kak 2>/dev/null)" -c "${kak_session}" -e "$*"
 }}
 
 define-command -params ..1 -client-completion \
@@ -22,7 +35,25 @@ If no client is passed then the current one is used} \
         if [ $# -eq 1 ]; then
             printf %s\\n "evaluate-commands -client '$1' focus"
         else
+            # need the no-response switch to get added to focus-tab first
+            # kitty @ focus-tab --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID
             kitty @ focus-window --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID
         fi
+}}
+
+define-command -docstring %{kitty-repl [<arguments>]: create a new window for repl interaction
+All optional parameters are forwarded to the new window} \
+    -params .. \
+    -shell-candidates %{
+        find $(echo $PATH | tr ':' ' ') -mindepth 1 -maxdepth 1 -executable -printf "%f\n"
+    } \
+    kitty-repl %{ evaluate-commands %sh{
+        if [ $# -eq 0 ]; then cmd="${SHELL:-/bin/sh}"; else cmd="$*"; fi
+        kitty @ new-window --no-response --window-type $kak_opt_kitty_window_type --title kak_repl_window $cmd < /dev/null > /dev/null 2>&1 &
+}}
+
+define-command kitty-send-text -docstring "send the selected text to the repl window" %{
+    nop %sh{
+        kitty @ send-text -m=title:kak_repl_window "${kak_selection}"
     }
 }

From d06e8d662d55294fb9d6c3d850bbc01daf3aa215 Mon Sep 17 00:00:00 2001
From: Justin Frank <jf.laelath@gmail.com>
Date: Sun, 23 Sep 2018 21:12:07 -0700
Subject: [PATCH 2/2] Added focus-tab call to kitty-focus

---
 rc/extra/kitty.kak | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rc/extra/kitty.kak b/rc/extra/kitty.kak
index 57b630e0..3365afe2 100644
--- a/rc/extra/kitty.kak
+++ b/rc/extra/kitty.kak
@@ -35,8 +35,7 @@ If no client is passed then the current one is used} \
         if [ $# -eq 1 ]; then
             printf %s\\n "evaluate-commands -client '$1' focus"
         else
-            # need the no-response switch to get added to focus-tab first
-            # kitty @ focus-tab --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID
+            kitty @ focus-tab --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID
             kitty @ focus-window --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID
         fi
 }}