1 files changed, 4 insertions, 15 deletions
diff --git a/autoload/window.kak b/autoload/window.kak
index ba5f676..e637d60 100644
--- a/autoload/window.kak
+++ b/autoload/window.kak
@@ -24,21 +24,10 @@ def toolsclient %{
 }
 
 def terminal-singleton -params 2.. -docstring 'terminal-singleton <name> <command> [args...]' %{
-  eval %sh{
+  nop %sh{
     name="$1"; shift 1;
-
-    open-term-win() {
-      printf "tmux-repl-impl new-window -n '$name' env"
-      printf " 'KAKOUNE_SESSION=$kak_session' 'KAKOUNE_CLIENT=$kak_client'"
-      for arg in "$@"; do
-        printf ' "%s"' "$(sed 's|["]|\\"|g' <<< "$arg")"
-      done
-    }
-
-    focus-term-win() {
-      tmux select-window -t "$name" >/dev/null 2>&1
-    }
-
-    focus-term-win || open-term-win "$@"
+    export KAKOUNE_SESSION="$kak_session"
+    export KAKOUNE_CLIENT="$kak_client"
+    "$kak_config/scripts/term.clj" singleton "$name" "$@"
   }
 }