From eb708dfa0a3fc067fe5828cdfa70fdd1d953c33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Mon, 1 Apr 2024 00:05:58 +0200
Subject: [PATCH 1/4] Use waypipe by default
---
zsh/.zshrc | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index e4d0ffa..55c22e6 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -153,6 +153,10 @@ function zvm_after_init() {
bindkey -M emacs "^Y" find_local_files
bindkey -M vicmd "^Y" find_local_files
bindkey -M viins "^Y" find_local_files
+
+ if [ "$REMOTE_PATH" != "" ]; then
+ cd $REMOTE_PATH
+ fi
}
zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=* r:|=*'
@@ -221,12 +225,12 @@ function o () {
xdg-open "$1" &!
}
-function s() {
- ssh server@mallorea -t "cd \"$(pwd)\" ; zsh --login"
+function server() {
+ waypipe ssh -t mallorea env REMOTE_PATH="$(pwd)" "zsh --login"
}
function riva() {
- ssh user@riva -t "cd \"$(pwd)\" ; zsh --login"
+ waypipe ssh -t riva env REMOTE_PATH="$(pwd)" "zsh --login"
}
if [ "$SSH_CLIENT" ]
From ef7854ae3f29b09f70ffe9ae7cc6e772e6927cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Sun, 31 Mar 2024 23:35:40 +0200
Subject: [PATCH 2/4] Add support for waypipe
---
scripts/launch_alacritty.sh | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/scripts/launch_alacritty.sh b/scripts/launch_alacritty.sh
index 0708db9..4334625 100755
--- a/scripts/launch_alacritty.sh
+++ b/scripts/launch_alacritty.sh
@@ -1,21 +1,32 @@
#!/bin/bash
RUNNING_SSH=false
-CHILD_PID=$(pgrep -P $1)
+RUNNING_WAYPIPE=false
+SSH_CLIENT=""
+CHILD_PID=$(pgrep -P "$1")
-[[ $(ps -p $CHILD_PID -o comm=) == "ssh" ]] && RUNNING_SSH=true
-
-GRAND_CHILD_PID=$(pgrep -P $CHILD_PID)
-[[ $? == 0 ]] && [[ $(ps -p $GRAND_CHILD_PID -o comm=) == "ssh" ]] && RUNNING_SSH=true && CHILD_PID=$GRAND_CHILD_PID
+GRAND_CHILD_PID=$(pgrep -P "$CHILD_PID")
+if [ "$GRAND_CHILD_PID" != 0 ]; then
+ GRAND_CHILD_NAME=$(ps -p "$GRAND_CHILD_PID" -o comm=)
+ if [ "$GRAND_CHILD_NAME" == "ssh" ]; then
+ RUNNING_SSH=true
+ CHILD_PID=$GRAND_CHILD_PID
+ SSH_CLIENT=$(ps -p "$CHILD_PID" -o args --no-headers | awk '{ print $2 }')
+ fi
+ if [ "$GRAND_CHILD_NAME" == "waypipe" ]; then
+ RUNNING_WAYPIPE=true
+ CHILD_PID=$(pgrep -P "$GRAND_CHILD_PID")
+ SSH_CLIENT=$(ps -p "$GRAND_CHILD_PID" -o args --no-headers | awk '{ print $3 }')
+ fi
+fi
-if [ $RUNNING_SSH == true ]; then
- CLIENT=$(ps -p $CHILD_PID -o args --no-headers | awk '{ print $2 }')
+if [ $RUNNING_SSH == true ] || [ $RUNNING_WAYPIPE == true ]; then
PORT=$(ss -tnpa | grep ssh | grep "pid=$CHILD_PID" | awk '{ print $4 }' | grep -o '[0-9]*$')
- alacritty -e ssh $CLIENT -t "cd \"\$(readlink -e /proc/\$(cat /tmp/ssh_session_$PORT)/cwd)\"; zsh --login"
+ alacritty -e ssh "$SSH_CLIENT" -t "cd \"\$(readlink -e /proc/\$(cat /tmp/ssh_session_$PORT)/cwd)\"; zsh --login"
else
- if [ "$(ps -p $1 -o comm=)" == "alacritty" ]; then
- CWD=$(readlink -e /proc/$CHILD_PID/cwd)
+ if [ "$(ps -p "$1" -o comm=)" == "alacritty" ]; then
+ CWD=$(readlink -e /proc/"$CHILD_PID"/cwd)
if [ "$CWD" != "" ]; then
alacritty --working-directory "$CWD"
else
From 2655195f7d0edfaa1d4d6b649b73980874a7f1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Sun, 31 Mar 2024 22:29:15 +0200
Subject: [PATCH 3/4] Add firefox theme
---
firefox/theme.xpi | Bin 0 -> 1053 bytes
firefox/theme.zip | Bin 0 -> 1053 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 firefox/theme.xpi
create mode 100644 firefox/theme.zip
diff --git a/firefox/theme.xpi b/firefox/theme.xpi
new file mode 100644
index 0000000000000000000000000000000000000000..5b691824663d08e00b0c46b913628681b9627600
GIT binary patch
literal 1053
zcma)+%}#?r5XY%i4^6!3#nXn9CZqvctRFYyt(P9Xkp&jImhO;cX-o|93491+d<!4J
zhjMpYC`8&6vP+o#&CH+O8D`V|@xV~m$JhJw_r>MUXWuZ?IFq&|W;7<b7{27d-UbMn
zmBn8Xo>O4vJ#sCzuzfe3p>1j#!%HFo^9l0>dQ1zlHj6pYb`?;1(j`tvF1fc-c}Yvg
zAtPMSwl#zlxaKq^IRTIcn5z^#39eiVdA5Zd+q>3@bgT{I3-T&z(DN+hZl(qs^NnB~
zZLAnM?iz%^fgj*-k#Hzj)DCJ-B&;WA(sWsi^kYiWs8-M!yh*lW?+~oyq?GAR-l;i*
ztjMawBgaCc8w-tZ8xl2fP{N=P0$6hka46`i7SI{~ztbFKx$KohLtyHx*9W`f^O?vR
zQYyMrgF+7}0kxwCajmlofJcP;F@(id^xkTO%+E=NITlcFM0fqFBL*B%mQ)|;Hi}2L
pLMi8RP|l{kqjO_-H|sX9r>c{6Z_lPDr)s4q?+5w(l|KN(_yZi-1la%p
literal 0
HcmV?d00001
diff --git a/firefox/theme.zip b/firefox/theme.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5b691824663d08e00b0c46b913628681b9627600
GIT binary patch
literal 1053
zcma)+%}#?r5XY%i4^6!3#nXn9CZqvctRFYyt(P9Xkp&jImhO;cX-o|93491+d<!4J
zhjMpYC`8&6vP+o#&CH+O8D`V|@xV~m$JhJw_r>MUXWuZ?IFq&|W;7<b7{27d-UbMn
zmBn8Xo>O4vJ#sCzuzfe3p>1j#!%HFo^9l0>dQ1zlHj6pYb`?;1(j`tvF1fc-c}Yvg
zAtPMSwl#zlxaKq^IRTIcn5z^#39eiVdA5Zd+q>3@bgT{I3-T&z(DN+hZl(qs^NnB~
zZLAnM?iz%^fgj*-k#Hzj)DCJ-B&;WA(sWsi^kYiWs8-M!yh*lW?+~oyq?GAR-l;i*
ztjMawBgaCc8w-tZ8xl2fP{N=P0$6hka46`i7SI{~ztbFKx$KohLtyHx*9W`f^O?vR
zQYyMrgF+7}0kxwCajmlofJcP;F@(id^xkTO%+E=NITlcFM0fqFBL*B%mQ)|;Hi}2L
pLMi8RP|l{kqjO_-H|sX9r>c{6Z_lPDr)s4q?+5w(l|KN(_yZi-1la%p
literal 0
HcmV?d00001
From 977b20564befb60a1e85adb30e53a84c632897d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Mon, 1 Apr 2024 00:09:12 +0200
Subject: [PATCH 4/4] Add Kell function
---
zsh/.zshrc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 55c22e6..830ce19 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -233,6 +233,10 @@ function riva() {
waypipe ssh -t riva env REMOTE_PATH="$(pwd)" "zsh --login"
}
+function kell() {
+ waypipe ssh -t kell env REMOTE_PATH="$(pwd)" "zsh --login"
+}
+
if [ "$SSH_CLIENT" ]
then
source_port=$(echo $SSH_CLIENT | awk '{ print $2 }')