From 197a1a74f468d9d69d624b19f90280a3946455e5 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 16 Apr 2024 10:04:31 +0200
Subject: update

---
 bin/extra/curszip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/extra')

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"
-- 
cgit v1.2.3


From d6fcd84e4cdd08e926bf881446a58f621f747749 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Mon, 29 Apr 2024 14:01:49 +0200
Subject: Add menu_win to keyboards

---
 bin/extra/keyboards.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/extra')

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
-- 
cgit v1.2.3


From 595d88df8cc39b304951a8e487109e336daaebdf Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Thu, 2 May 2024 22:32:19 +0200
Subject: Add more vms

---
 bin/extra/aivpn | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'bin/extra')

diff --git a/bin/extra/aivpn b/bin/extra/aivpn
index aab90a8..6fa0783 100755
--- a/bin/extra/aivpn
+++ b/bin/extra/aivpn
@@ -24,3 +24,13 @@ ssh vm "rasdial \"vpn.student.ehb.be\""
 ssh -f -N \
 	-L 2222:10.2.160.41:22 \
 	vm
+
+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
-- 
cgit v1.2.3


From 80462e764abf047544be6026c5d67c1f54599ae5 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 3 May 2024 18:22:38 +0200
Subject: Update

---
 bin/extra/aivpn                      | 18 ++++++++++--------
 config/essentials/shell/aliases.sh   |  1 +
 config/essentials/shell/functions.sh | 11 +++++++++++
 config/essentials/starship.toml      |  4 +---
 config/essentials/zsh/.zshrc         |  7 +++++++
 5 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'bin/extra')

diff --git a/bin/extra/aivpn b/bin/extra/aivpn
index 6fa0783..21436ed 100755
--- a/bin/extra/aivpn
+++ b/bin/extra/aivpn
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-logn() { printf "%s\n" "$@"; }
+err() { printf "%s\n" "$@"; }
 
 if [ "$1" = "-k" ]
 then
@@ -8,23 +8,25 @@ then
 	exit
 fi
 
-keyadd ehb/ai
+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"
 
-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"
+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
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index d5f3e7f..6305a90 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -333,3 +333,4 @@ alias update-mirrors='reflector -p https | rankmirrors -n 10 -p -w - | doas tee
 
 alias tmpd='cd $(mktemp -d)'
 alias brs='$BROWSER'
+
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index 8172c73..1fd6e92 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -332,3 +332,14 @@ serve() {
 }
 
 ssh_keyadd() { ssh-keygen -f "$HOME"/.ssh/"$1" -P "$(pass generate -f keys/"$HOST"/ssh/"$1" | tail -n 1)" -t ed25519; }
+
+
+fchange()
+{
+    [ "$1" ] || return 1
+    inotifywait -m -e create,modify,delete --format "%f" "${2:-.}"  |
+        while read -r EVENT
+        do
+            eval "$1"
+        done
+}
diff --git a/config/essentials/starship.toml b/config/essentials/starship.toml
index cd5832f..15139f5 100644
--- a/config/essentials/starship.toml
+++ b/config/essentials/starship.toml
@@ -34,8 +34,6 @@ disabled = false
 
 [custom.upds]
 command = 'cat ~/.cache/updates' # shows output of command
-# detect_files = ['foo'] # can specify filters but wildcards are not supported
-when = ''' test "$(cat ~/.cache/updates)" -gt 0'''
+when = '[ "$(cat ~/.cache/updates)" -gt 0 ]'
 symbol = '📦'
 format = '$output$symbol '
-
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index c9bf8b1..ab66fcb 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -110,6 +110,13 @@ 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"; }
-- 
cgit v1.2.3


From 98b0356d05253fdc76813256dd508761a635052e Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
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 <raymaekers.luca@gmail.com>
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 <raymaekers.luca@gmail.com>
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 <<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
-- 
cgit v1.2.3


From f6aa3ad52f6fb2cedcbf9174c1c008be563248c6 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Thu, 30 May 2024 23:00:39 +0200
Subject: trl: decide languages after

The languages I want to use vary too much so it was too cumbersome,
instead I chose the approach where I put in the word and decide the
languages after.
---
 bin/extra/trl | 101 +++++++++++++---------------------------------------------
 1 file changed, 22 insertions(+), 79 deletions(-)

(limited to 'bin/extra')

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/.*/  &/'
-- 
cgit v1.2.3


From dccc861f61115477deaec687e0eeb237576d41da Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Mon, 3 Jun 2024 16:08:07 +0200
Subject: fix: notify when ytplay

---
 bin/extra/ytplay | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'bin/extra')

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 -
-- 
cgit v1.2.3