From 98b0356d05253fdc76813256dd508761a635052e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 7 May 2024 03:16:04 +0200 Subject: add new ehb vm scripts --- bin/extra/ehb_vmssh | 21 +++++++++++++++++++++ bin/extra/ehb_vmvpn | 22 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100755 bin/extra/ehb_vmssh create mode 100755 bin/extra/ehb_vmvpn (limited to 'bin/extra') diff --git a/bin/extra/ehb_vmssh b/bin/extra/ehb_vmssh new file mode 100755 index 0000000..498a9cf --- /dev/null +++ b/bin/extra/ehb_vmssh @@ -0,0 +1,21 @@ +#!/bin/sh + +export SSH_ASKPASS="sshpass" +export SSH_ASKPASS_REQUIRE="prefer" +export PASSWORD="zot/qemu" + +keyadd ehb/ai +ssh -f -N \ + -L 2222:10.2.160.41:22 \ + vm + +keyadd ehb/vm_int +ssh -f -N \ + -L 2223:10.2.160.9:22 \ + vm +ssh -f -N \ + -L 2224:10.2.160.10:22 \ + vm +ssh -f -N \ + -L 2225:10.2.160.11:22 \ + vm diff --git a/bin/extra/ehb_vmvpn b/bin/extra/ehb_vmvpn new file mode 100755 index 0000000..4a51bfc --- /dev/null +++ b/bin/extra/ehb_vmvpn @@ -0,0 +1,22 @@ +#!/bin/sh + +err() { printf "%s\n" "$@"; } + +if [ "$1" = "-k" ] +then + pgrep -f -- "ssh.*-L.*vm" | xargs kill + exit +fi + +err "I: Waiting for connectivity..." +while ! ssh -o ConnectTimeout=1 -o BatchMode=yes vm 2>&1 | grep "Permission denied" > /dev/null +do sleep 1 +done + + +export SSH_ASKPASS="sshpass" +export SSH_ASKPASS_REQUIRE="prefer" +export PASSWORD="zot/qemu" + +err "I: Activating vpn" +ssh vm "rasdial \"vpn.student.ehb.be\"" -- cgit v1.2.3 From c4d529e5f67c4766ab5dad9f68aacaa1ccbc6382 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 7 May 2024 03:16:34 +0200 Subject: reorganized. --- bin/extra/aivpn | 38 -------------------------------------- config/essentials/shell/aliases.sh | 9 ++++++++- config/essentials/zsh/.zshrc | 9 +-------- 3 files changed, 9 insertions(+), 47 deletions(-) delete mode 100755 bin/extra/aivpn (limited to 'bin/extra') diff --git a/bin/extra/aivpn b/bin/extra/aivpn deleted file mode 100755 index 21436ed..0000000 --- a/bin/extra/aivpn +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -err() { printf "%s\n" "$@"; } - -if [ "$1" = "-k" ] -then - pgrep -f -- "ssh.*-L.*vm" | xargs kill - exit -fi - -err "I: Waiting for connectivity..." -while ! ssh -o ConnectTimeout=1 -o BatchMode=yes vm 2>&1 | grep "Permission denied" > /dev/null -do sleep 1 -done - - -export SSH_ASKPASS="sshpass" -export SSH_ASKPASS_REQUIRE="prefer" -export PASSWORD="zot/qemu" - -err "I: Activating vpn" -ssh vm "rasdial \"vpn.student.ehb.be\"" - -keyadd ehb/ai -ssh -f -N \ - -L 2222:10.2.160.41:22 \ - vm - -keyadd ehb/vm_int -ssh -f -N \ - -L 2223:10.2.160.9:22 \ - vm -ssh -f -N \ - -L 2224:10.2.160.10:22 \ - vm -ssh -f -N \ - -L 2225:10.2.160.11:22 \ - vm diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh index eb48416..de441a5 100644 --- a/config/essentials/shell/aliases.sh +++ b/config/essentials/shell/aliases.sh @@ -169,7 +169,14 @@ alias wgdown='doas wg-quick down wg0' alias npi="npm init --yes" # Python -alias penv='python3 -m venv env' + +if which uv > /dev/null 2>&1 +then + alias penv='uv venv env' + alias pip='uv pip' +else + alias penv='python3 -m venv env' +fi alias phttp='python3 -m http.server' alias pipreq='pip install -r requirements.txt' diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index ab66fcb..91a1618 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -110,19 +110,12 @@ bindkey -M menuselect '^xh' accept-and-hold # Hold bindkey -M menuselect '^xn' accept-and-infer-next-history # Next bindkey -M menuselect '^xu' undo # Undo -space-expand-alias() { - zle _expand_alias - zle self-insert -} -zle -N space-expand-alias -bindkey -M main ' ' space-expand-alias - ## window title hooks add-zsh-hook -Uz preexec () { print -n "\e]0;$1\a\033[0m"; } add-zsh-hook -Uz precmd set_wt (){ print -Pn "\e]0;%n@%m on %~\a"; } ## automatic ls after cd -add-zsh-hook -Uz chpwd (){ [ "$PWD" = "$HOME" ] || ls -a; } +add-zsh-hook -Uz chpwd (){ [ "$PWD" = "$HOME" ] || ls -A; } ### Variables ## Run menuscripts with fzf -- cgit v1.2.3 From b73f0c173702001c089f6db91a582765db80861e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 26 May 2024 13:04:22 +0200 Subject: Merge ehb scripts in one --- bin/extra/ehb_vmssh | 21 --------------------- bin/extra/ehb_vmvpn | 22 ---------------------- bin/extra/ehbvmvpn | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 43 deletions(-) delete mode 100755 bin/extra/ehb_vmssh delete mode 100755 bin/extra/ehb_vmvpn create mode 100755 bin/extra/ehbvmvpn (limited to 'bin/extra') diff --git a/bin/extra/ehb_vmssh b/bin/extra/ehb_vmssh deleted file mode 100755 index 498a9cf..0000000 --- a/bin/extra/ehb_vmssh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -export SSH_ASKPASS="sshpass" -export SSH_ASKPASS_REQUIRE="prefer" -export PASSWORD="zot/qemu" - -keyadd ehb/ai -ssh -f -N \ - -L 2222:10.2.160.41:22 \ - vm - -keyadd ehb/vm_int -ssh -f -N \ - -L 2223:10.2.160.9:22 \ - vm -ssh -f -N \ - -L 2224:10.2.160.10:22 \ - vm -ssh -f -N \ - -L 2225:10.2.160.11:22 \ - vm diff --git a/bin/extra/ehb_vmvpn b/bin/extra/ehb_vmvpn deleted file mode 100755 index 4a51bfc..0000000 --- a/bin/extra/ehb_vmvpn +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -err() { printf "%s\n" "$@"; } - -if [ "$1" = "-k" ] -then - pgrep -f -- "ssh.*-L.*vm" | xargs kill - exit -fi - -err "I: Waiting for connectivity..." -while ! ssh -o ConnectTimeout=1 -o BatchMode=yes vm 2>&1 | grep "Permission denied" > /dev/null -do sleep 1 -done - - -export SSH_ASKPASS="sshpass" -export SSH_ASKPASS_REQUIRE="prefer" -export PASSWORD="zot/qemu" - -err "I: Activating vpn" -ssh vm "rasdial \"vpn.student.ehb.be\"" diff --git a/bin/extra/ehbvmvpn b/bin/extra/ehbvmvpn new file mode 100755 index 0000000..0d85b57 --- /dev/null +++ b/bin/extra/ehbvmvpn @@ -0,0 +1,53 @@ +#!/bin/sh + +err() { printf "%s\n" "$@"; } + +if [ -z "$1" ] || [ "$1" = "-h" ] +then + >&2 cat <&1 | grep "Permission denied" > /dev/null + do sleep 1 + done + + err "I: Activating vpn" + ssh vm "rasdial \"vpn.student.ehb.be\"" +fi + + +if [ "$1" = "-s" ] +then + shift + keyadd ehb/ai + ssh -f -N \ + -L 2222:10.2.160.41:22 \ + vm + + keyadd ehb/vm_int + >&2 printf 'ssh forwardings for vms\n' + ssh -f -N -L 2223:10.2.160.9:22 vm + ssh -f -N -L 2224:10.2.160.10:22 vm + ssh -f -N -L 2225:10.2.160.11:22 vm + ssh -f -N -L 2226:10.2.160.51:22 vm +fi -- cgit v1.2.3