Overhaul

8 files changed, 36 insertions, 38 deletions

diff --git a/rc/modules/broot.kak b/rc/modules/broot.kak
index a9a47e6..76f00b4 100644
--- a/rc/modules/broot.kak
+++ b/rc/modules/broot.kak
@@ -3,7 +3,8 @@
 
 provide-module connect-broot %{
   require-module connect
+
   define-command broot -params .. -file-completion -docstring 'Open files with Broot' %{
-    connect-terminal broot %arg{@}
+    > broot %arg{@}
   }
 }
diff --git a/rc/modules/dmenu.kak b/rc/modules/dmenu.kak
index c34c270..6be98bb 100644
--- a/rc/modules/dmenu.kak
+++ b/rc/modules/dmenu.kak
@@ -6,15 +6,14 @@
 
 provide-module connect-dmenu %{
   require-module connect
-  define-command dmenu-files -params .. -file-completion -docstring 'Open selected files with Rofi' %{
-    connect-shell %{
-      edit $(fd --type file . "$@" | dmenu -l 20 -i -p 'Open selected files')
-    } -- %arg{@}
+
+  define-command dmenu-files -params .. -file-completion -docstring 'Open files with dmenu' %{
+    $ %(:edit $(fd --type file . "$@" | dmenu -l 20 -i -p 'Open files')) -- %arg{@}
   }
-  define-command dmenu-buffers -params ..1 -buffer-completion -docstring 'Open selected buffers with Rofi' %{
-    connect-shell %{
-      buffer $(buffer | grep -F "$1" | dmenu -l 20 -i -p 'Open selected buffers')
-    } -- %arg{@}
+
+  define-command dmenu-buffers -params ..1 -buffer-completion -docstring 'Open buffers with dmenu' %{
+    $ %(:buffer $(:ls | grep -F "$1" | dmenu -l 20 -i -p 'Open buffers')) -- %arg{@}
   }
+
   alias global dmenu dmenu-files
 }
diff --git a/rc/modules/dolphin.kak b/rc/modules/dolphin.kak
index d68e934..6917bc1 100644
--- a/rc/modules/dolphin.kak
+++ b/rc/modules/dolphin.kak
@@ -3,9 +3,8 @@
 
 provide-module connect-dolphin %{
   require-module connect
+
   define-command dolphin -params .. -file-completion -docstring 'Open files with Dolphin' %{
-    connect-shell %{
-      dolphin "${@:-.}"
-    } -- %arg{@}
+    $ %(dolphin "${@:-.}") -- %arg{@}
   }
 }
diff --git a/rc/modules/fzf.kak b/rc/modules/fzf.kak
index f03fa6f..e6e120d 100644
--- a/rc/modules/fzf.kak
+++ b/rc/modules/fzf.kak
@@ -6,15 +6,14 @@
 
 provide-module connect-fzf %{
   require-module connect
-  define-command fzf-files -params .. -file-completion -docstring 'Open selected files with fzf' %{
-    connect-terminal sh -c %{
-      edit $(fd --type file . "$@" | fzf)
-    } -- %arg{@}
+
+  define-command fzf-files -params .. -file-completion -docstring 'Open files with fzf' %{
+    > sh -c %(:edit $(fd --type file . "$@" | fzf --prompt='(f)>')) -- %arg{@}
   }
-  define-command fzf-buffers -params ..1 -buffer-completion -docstring 'Open selected buffers with fzf' %{
-    connect-terminal sh -c %{
-      buffer $(buffer | grep -F "$1" | fzf)
-    } -- %arg{@}
+
+  define-command fzf-buffers -params ..1 -buffer-completion -docstring 'Open buffers with fzf' %{
+    > sh -c %(:buffer $(:ls | grep -F "$1" | fzf --prompt='(b)>')) -- %arg{@}
   }
+
   alias global fzf fzf-files
 }
diff --git a/rc/modules/lf.kak b/rc/modules/lf.kak
index 9fc500f..7a8c319 100644
--- a/rc/modules/lf.kak
+++ b/rc/modules/lf.kak
@@ -3,7 +3,8 @@
 
 provide-module connect-lf %{
   require-module connect
+
   define-command lf -params .. -file-completion -docstring 'Open files with lf' %{
-    connect-terminal lf %arg{@}
+    > lf %arg{@}
   }
 }
diff --git a/rc/modules/nnn.kak b/rc/modules/nnn.kak
index 8305949..e78b6e9 100644
--- a/rc/modules/nnn.kak
+++ b/rc/modules/nnn.kak
@@ -3,7 +3,8 @@
 
 provide-module connect-nnn %{
   require-module connect
+
   define-command nnn -params .. -file-completion -docstring 'Open files with nnn' %{
-    connect-terminal nnn %arg{@}
+    > nnn %arg{@}
   }
 }
diff --git a/rc/modules/rofi.kak b/rc/modules/rofi.kak
index f6befbd..6359f75 100644
--- a/rc/modules/rofi.kak
+++ b/rc/modules/rofi.kak
@@ -6,15 +6,14 @@
 
 provide-module connect-rofi %{
   require-module connect
-  define-command rofi-files -params .. -file-completion -docstring 'Open selected files with Rofi' %{
-    connect-shell %{
-      edit $(fd --type file . "$@" | rofi -dmenu -i -p 'Open selected files')
-    } -- %arg{@}
+
+  define-command rofi-files -params .. -file-completion -docstring 'Open files with Rofi' %{
+    $ %(:edit $(fd --type file . "$@" | rofi -dmenu -i -p 'Open files')) -- %arg{@}
   }
-  define-command rofi-buffers -params ..1 -buffer-completion -docstring 'Open selected buffers with Rofi' %{
-    connect-shell %{
-      buffer $(buffer | grep -F "$1" | rofi -dmenu -i -p 'Open selected buffers')
-    } -- %arg{@}
+
+  define-command rofi-buffers -params ..1 -buffer-completion -docstring 'Open buffers with Rofi' %{
+    $ %(:buffer $(:ls | grep -F "$1" | rofi -dmenu -i -p 'Open buffers')) -- %arg{@}
   }
+
   alias global rofi rofi-files
 }
diff --git a/rc/modules/wofi.kak b/rc/modules/wofi.kak
index 527306f..f567adc 100644
--- a/rc/modules/wofi.kak
+++ b/rc/modules/wofi.kak
@@ -6,15 +6,14 @@
 
 provide-module connect-wofi %{
   require-module connect
-  define-command wofi-files -params .. -file-completion -docstring 'Open selected files with Wofi' %{
-    connect-shell %{
-      edit $(fd --type file . "$@" | wofi --show dmenu --prompt 'Open selected files')
-    } -- %arg{@}
+
+  define-command wofi-files -params .. -file-completion -docstring 'Open files with Wofi' %{
+    $ %(:edit $(fd --type file . "$@" | wofi --dmenu --prompt 'Open files')) -- %arg{@}
   }
-  define-command wofi-buffers -params ..1 -buffer-completion -docstring 'Open selected buffers with Wofi' %{
-    connect-shell %{
-      buffer $(buffer | grep -F "$1" | wofi --show dmenu --prompt 'Open selected buffers')
-    } -- %arg{@}
+
+  define-command wofi-buffers -params ..1 -buffer-completion -docstring 'Open buffers with Wofi' %{
+    $ %(:buffer $(:ls | grep -F "$1" | wofi --dmenu --prompt 'Open buffers')) -- %arg{@}
   }
+
   alias global wofi wofi-files
 }