diff options
| -rw-r--r-- | .tmux.conf | 3 | ||||
| -rwxr-xr-x | bin/debian-ftp-master | 6 | ||||
| -rwxr-xr-x | bin/ssh-and-tmux-term | 3 | ||||
| -rwxr-xr-x | scripts/desktop/dmenu_ssh | 2 | ||||
| -rwxr-xr-x | scripts/desktop/wofi_ssh | 2 | ||||
| -rwxr-xr-x | scripts/desktop/wofi_ssh_lxc | 2 |
6 files changed, 8 insertions, 10 deletions
@@ -32,8 +32,7 @@ bind "C-\\" last-window # detach all other clients: useful when other clients on other machines are # making Irssi too small; can easily reconnect from those machines when wanted -# thanks to my ssh-and-tmux-term script or just by hitting i3 shortcut to -# relaunch +# thanks to my ssh-and-tmux script or just by hitting i3 shortcut to relaunch bind "K" detach-client -a # # splitting should maintain current working directory diff --git a/bin/debian-ftp-master b/bin/debian-ftp-master index 10117716..e410c021 100755 --- a/bin/debian-ftp-master +++ b/bin/debian-ftp-master @@ -56,7 +56,8 @@ monitors="$(xrandr -q | grep ' connected' | wc -l)" if ! wmctrl -l | grep -q "ftp-master dak command session"; then first="$(i3-fresh-workspace)" - ssh-and-tmux-term ftp-master.debian.org dak "ftp-master dak command session" + xfce4-terminal -x ssh-and-tmux \ + ftp-master.debian.org dak "ftp-master dak command session" until wmctrl -l | grep -q "ftp-master dak command session"; do sleep 0.3 done @@ -67,7 +68,8 @@ if ! wmctrl -l | grep -q "ftp-master dak command session"; then # container on buster's i3 (but not stretch's) i3-msg layout tabbed - ssh-and-tmux-term ftp-master.debian.org mc "ftp-master GNU mc session" + xfce4-terminal -x ssh-and-tmux \ + ftp-master.debian.org mc "ftp-master GNU mc session" until wmctrl -l | grep -q "ftp-master GNU mc session"; do sleep 0.3 done diff --git a/bin/ssh-and-tmux-term b/bin/ssh-and-tmux-term deleted file mode 100755 index 5fa911c8..00000000 --- a/bin/ssh-and-tmux-term +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -foot ssh-and-tmux "$@" "$host" "$session" diff --git a/scripts/desktop/dmenu_ssh b/scripts/desktop/dmenu_ssh index c833166b..76d9aa72 100755 --- a/scripts/desktop/dmenu_ssh +++ b/scripts/desktop/dmenu_ssh @@ -3,5 +3,5 @@ host=$(perl -wlne'/^Host\s+(\S+)/ and !/\*/ and print $1' $HOME/.ssh/config \ | dmenu -p "ssh to tmux on host" "$@") if [ -n "$host" ]; then - ssh-and-tmux-term "$host" + xfce4-terminal -x ssh-and-tmux "$host" fi diff --git a/scripts/desktop/wofi_ssh b/scripts/desktop/wofi_ssh index 525cf94b..6d1f0f86 100755 --- a/scripts/desktop/wofi_ssh +++ b/scripts/desktop/wofi_ssh @@ -3,5 +3,5 @@ host=$(perl -wlne'/^Host\s+(\S+)/ and !/\*/ and print $1' $HOME/.ssh/config \ | wofi --dmenu -p "ssh to tmux on host" "$@") if [ -n "$host" ]; then - ssh-and-tmux-term "$host" + foot ssh-and-tmux "$host" fi diff --git a/scripts/desktop/wofi_ssh_lxc b/scripts/desktop/wofi_ssh_lxc index 08898d7e..41a296a8 100755 --- a/scripts/desktop/wofi_ssh_lxc +++ b/scripts/desktop/wofi_ssh_lxc @@ -12,6 +12,6 @@ host=$(perl -wlne'/^Host\s+(\S+)/ and !/\*/ and print $1' $HOME/.ssh/config \ | wofi --dmenu -p "container's host" "$@") if [ -n "$host" -a -n "$container" ]; then - ssh-and-tmux-term "$host" --container-name="${container}" \ + foot ssh-and-tmux "$host" --container-name="${container}" \ --container-cmd="lxc-unpriv-attach -n %s --keep-var TERM --clear-env -vHOME=/root" fi |