thomasave
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: thomasave:8c1360f8eb56ff9b3c5f2bf435ddde9905c60f7f
Branches Tags
thomasave:master
thomasave:NixOS
thomasave:original
thomasave:riva
thomasave:laptop
..
compare: thomasave:bd3ca2afa52ab91c8394942f27c98f9ececad9c8
Branches Tags
thomasave:master
thomasave:NixOS
thomasave:original
thomasave:riva
thomasave:laptop

No commits in common. "8c1360f8eb56ff9b3c5f2bf435ddde9905c60f7f" and "bd3ca2afa52ab91c8394942f27c98f9ececad9c8" have entirely different histories.
8c1360f8eb ... bd3ca2afa5

2 changed files with 19 additions and 19 deletions
Show Stats Expand all files Collapse all files

7
scripts/launch_alacritty.sh
View File

@ -21,10 +21,9 @@ if [ "$GRAND_CHILD_PID" != 0 ]; then
fi fi
if [ $RUNNING_WAYPIPE == true ]; then if [ $RUNNING_SSH == true ] || [ $RUNNING_WAYPIPE == true ]; then
PREVIOUS_SESSION_ID=$(grep -z "SSH_SESSION_ID" "/proc/$CHILD_PID/environ" | xargs -0 -n 1 | grep -oP "[0-9]*") PORT=$(ss -tnpa | grep ssh | grep "pid=$CHILD_PID" | awk '{ print $4 }' | grep -o '[0-9]*$')
SSH_SESSION_ID=$RANDOM alacritty -e ssh "$SSH_CLIENT" -t "cd \"\$(readlink -e /proc/\$(cat /tmp/ssh_session_$PORT)/cwd)\"; zsh --login"
alacritty -e zsh -c "SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t \"$SSH_CLIENT\" env SSH_SESSION_ID=\"$SSH_SESSION_ID\" PREVIOUS_SESSION_ID=\"$PREVIOUS_SESSION_ID\" \"zsh --login\""
else else
if [ "$(ps -p "$1" -o comm=)" == "alacritty" ]; then if [ "$(ps -p "$1" -o comm=)" == "alacritty" ]; then
CWD=$(readlink -e /proc/"$CHILD_PID"/cwd) CWD=$(readlink -e /proc/"$CHILD_PID"/cwd)

31
zsh/.zshrc
View File

@ -154,15 +154,8 @@ function zvm_after_init() {
bindkey -M vicmd "^Y" find_local_files bindkey -M vicmd "^Y" find_local_files
bindkey -M viins "^Y" find_local_files bindkey -M viins "^Y" find_local_files
if [ "$SSH_SESSION_ID" != "" ]; then
mkdir -p /tmp/ssh_sessions
echo $$ > /tmp/ssh_sessions/"$SSH_SESSION_ID"
fi
if [ "$REMOTE_PATH" != "" ]; then if [ "$REMOTE_PATH" != "" ]; then
cd "$REMOTE_PATH" cd $REMOTE_PATH
elif [ "$PREVIOUS_SESSION_ID" != "" ]; then
cd $(readlink -e /proc/$(cat /tmp/ssh_sessions/$PREVIOUS_SESSION_ID)/cwd)
fi fi
} }
@ -232,15 +225,23 @@ function o () {
xdg-open "$1" &! xdg-open "$1" &!
} }
function run_waypipe() { function server() {
SSH_SESSION_ID=$RANDOM waypipe ssh -t mallorea env REMOTE_PATH="$(pwd)" "zsh --login"
SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t $1 env REMOTE_PATH="$(pwd)" SSH_SESSION_ID=$SSH_SESSION_ID "zsh --login"
} }
alias mallorea="run_waypipe mallorea" function riva() {
alias vault="run_waypipe vault" waypipe ssh -t riva env REMOTE_PATH="$(pwd)" "zsh --login"
alias riva="run_waypipe riva" }
alias kell="run_waypipe kell"
function kell() {
waypipe ssh -t kell env REMOTE_PATH="$(pwd)" "zsh --login"
}
if [ "$SSH_CLIENT" ]
then
source_port=$(echo $SSH_CLIENT | awk '{ print $2 }')
echo $$ > /tmp/ssh_session_$source_port
fi
if [[ "$TERM" == (Eterm*|alacritty*|aterm*|gnome*|konsole*|kterm*|putty*|rxvt*|screen*|tmux*|xterm*) ]]; then if [[ "$TERM" == (Eterm*|alacritty*|aterm*|gnome*|konsole*|kterm*|putty*|rxvt*|screen*|tmux*|xterm*) ]]; then
add-zsh-hook -Uz precmd xterm_title_precmd add-zsh-hook -Uz precmd xterm_title_precmd