6 files changed, 80 insertions, 108 deletions
diff --git a/bin/extra/aivpn b/bin/extra/aivpn
deleted file mode 100755
index aab90a8..0000000
--- a/bin/extra/aivpn
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-logn() { printf "%s\n" "$@"; }
-
-if [ "$1" = "-k" ]
-then
-	pgrep -f -- "ssh.*-L.*vm" | xargs kill
-	exit
-fi
-
-keyadd ehb/ai
-
-export SSH_ASKPASS="sshpass"
-export SSH_ASKPASS_REQUIRE="prefer"
-export PASSWORD="zot/qemu"
-
-logn "I: Waiting for connectivity..."
-while ! ssh -o ConnectTimeout=1 -o BatchMode=yes vm 2>&1 | grep "Permission denied" > /dev/null
-do sleep 1
-done
-
-logn "I: Activating vpn"
-ssh vm "rasdial \"vpn.student.ehb.be\""
-ssh -f -N \
-	-L 2222:10.2.160.41:22 \
-	vm
diff --git a/bin/extra/curszip b/bin/extra/curszip
index 22453ae..64abdb6 100755
--- a/bin/extra/curszip
+++ b/bin/extra/curszip
@@ -2,7 +2,7 @@
 
 list1() { find "$1" -mindepth 1 -maxdepth 1 -type "${2:-d}" -printf '%f\n'; }
 
-curs="$(list1 ~/docs/school/Vakken | fzf)"
+curs="$(list1 ~/docs/school/Vakken | commander -c)"
 [ "$curs" ] || exit 1
 zip="$(list1 ~/dl f | fzf -f "$curs" | grep '\.zip$')"
 >&2 printf "curs: %s\n" "$curs"
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 <<EOF
+-k kill ssh
+-v vpn
+-s ssh bindings
+-h help
+EOF
+    exit 1
+fi
+
+if [ "$1" = "-k" ]
+then
+    shift
+	pgrep -f -- "ssh.*-L.*vm" | xargs kill
+fi
+
+export SSH_ASKPASS="sshpass"
+export SSH_ASKPASS_REQUIRE="prefer"
+export PASSWORD="zot/qemu"
+
+if [ "$1" = "-v" ]
+then
+    shift
+    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
+
+    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
diff --git a/bin/extra/keyboards.txt b/bin/extra/keyboards.txt
index 62e77de..db004ce 100644
--- a/bin/extra/keyboards.txt
+++ b/bin/extra/keyboards.txt
@@ -1,2 +1,2 @@
 us
-us -option ctrl:swapcaps -variant colemak
+us -option ctrl:swapcaps,altwin:menu_win -variant colemak
diff --git a/bin/extra/trl b/bin/extra/trl
index ee42040..bd4c2c5 100755
--- a/bin/extra/trl
+++ b/bin/extra/trl
@@ -1,20 +1,8 @@
 #!/bin/sh
 
-# prints on stderr
-log () { >&2 echo "$@"; }
+# Translate words using http://context.reverso.net and scraping the answers
+# with 'pup' and 'curl'.
 
-help () 
-{
-	 >&2 cat <<-EOF
-	  h         help
-	  l         clear output
-	  q         quit
-
-	  i         invert languages
-	  p         select primary
-	  s         select secondary
-	EOF
-}
 # returns available languages
 languages () {
 	cat <<-EOF
@@ -46,70 +34,25 @@ languages () {
 	EOF
 }
 
-# translates a word
-# $1: primary language
-# $2: secondary language
-# $3: word to translate
-translate ()
-{
-	curl -s "https://context.reverso.net/translation/$1-$2/$3" \
-	--compressed \
-	-H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/116.0' \
-	-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8' \
-	-H 'Accept-Language: en-US,en;q=0.5' \
-	-H 'Accept-Encoding: gzip, deflate, br' |
-	pup 'a.link_highlighted em text{}' |
-	sed 's/.*/\L&/' |
-	sort | uniq | sed 's/.*/  &/'
-}
-
-# prints the current language
-current_language ()
-{
-	log "  current: $primary-$secondary"
-}
-
-select_language ()
-{
-	tmp="$(languages | fzf)"
-	[ "$tmp" ] && [ "$tmp" != "$primary" ] && [ "$tmp" != "$secondary" ] &&
-		eval "$1=\"$tmp\""
-	current_language
-}
-
-# set default languages
-primary=french
-secondary=dutch
-
-
-main ()
-{
-	current_language
-	while true
-	do
-		log -n '>'
-		read -r prompt 
-		test $? -eq 1 && exit 0 # quit on ctrl-d
-		case "$prompt" in
-			q) break ;;
-			l) clear ;;
-			i) tmp="$secondary"; secondary="$primary"; primary="$tmp"
-				current_language ;;
-			h) help ;; # TODO
-			p) select_language primary ;;
-			s) select_language secondary ;;
-			'') ;;
-			*) translate "$primary" "$secondary" "$prompt" ;;
-		esac
-	done
-}
-
-
-if  [ "$1" = "--help"  ] || [ "$1" = "-h" ]
+if [ -z "${word:=$1}" ]
 then
-	log "usage: trl"
-	help
-	exit
+    >&2 printf '>'
+    word="$(head -n1)"
 fi
-
-main
+[ "$word" ] || exit 1
+
+primary="$(languages | fzf)"
+[ "$primary" ] || exit 1
+
+secondary="$(languages | fzf)"
+[ "$secondary" ] || exit 1
+
+curl -s "https://context.reverso.net/translation/$primary-$secondary/$word" \
+    --compressed \
+    -H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/116.0' \
+    -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8' \
+    -H 'Accept-Language: en-US,en;q=0.5' \
+    -H 'Accept-Encoding: gzip, deflate, br' |
+    pup 'a.link_highlighted em text{}' |
+    sed 's/.*/\L&/' |
+    sort | uniq | sed 's/.*/  &/'
diff --git a/bin/extra/ytplay b/bin/extra/ytplay
index b5c1a8c..66204c4 100755
--- a/bin/extra/ytplay
+++ b/bin/extra/ytplay
@@ -1,2 +1,4 @@
 #!/bin/sh
-yt-dlp -o - "$(ytlink)" | mpv -
+url="$(ytlink)"
+notify-send "playing: $url" &
+yt-dlp -o - "$url" | mpv -