From 4cf668d9a23e39fbc8a215cc7876f95291722366 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Thu, 2 May 2024 22:33:24 +0200
Subject: Add sshids alias and ssh_keyadd function

---
 config/essentials/shell/aliases.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config/essentials/shell/aliases.sh')

diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 68b66f2..d5f3e7f 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -3,6 +3,7 @@
 
 # The most important one
 alias vi='nvim'
+alias cd='z'
 
 # Zsh specific aliases
 if [ $SHELL = "/bin/zsh" ]
@@ -149,6 +150,7 @@ alias wd='dict'
 # ssh
 alias sha='ssh-add'
 alias sshs='eval "$(ssh-agent)" && ssh-add'
+alias sshids='ssh-add -L | xargs -I{} grep "{}" -l $(find "$HOME/.ssh" -type f -iname '\''*.pub'\'') | sed "s;$HOME/.ssh/;;;s;\.pub$;;"'
 alias whatsmyip='curl -s "ifconfig.co"'
 alias icognito='unset HISTFILE'
 alias webcam='v4l2-ctl --set-fmt-video=width=1280,height=720; mpv --demuxer-lavf-format=video4linux2 --demuxer-lavf-o-set=input_format=mjpeg av://v4l2:/dev/video0 --profile=low-latency --untimed --no-resume-playback'
-- 
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 'config/essentials/shell/aliases.sh')

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 d1fd4c1c04b9fefcdaa21d18b0262c2a700847a9 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 4 May 2024 09:17:46 +0200
Subject: add bat alias

---
 config/essentials/shell/aliases.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config/essentials/shell/aliases.sh')

diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 68b66f2..50238cc 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -331,3 +331,5 @@ alias update-mirrors='reflector -p https | rankmirrors -n 10 -p -w - | doas tee
 
 alias tmpd='cd $(mktemp -d)'
 alias brs='$BROWSER'
+which bat > /dev/null 2>&1 &&
+    alias cat="bat -p"
-- 
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 'config/essentials/shell/aliases.sh')

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 a99f0e2f80a26114eb55d165c2cad9ab660916f2 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Thu, 30 May 2024 22:50:27 +0200
Subject: feat: add more aliases

---
 config/essentials/shell/aliases.sh | 5 +++++
 config/home/.zshenv                | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'config/essentials/shell/aliases.sh')

diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index de441a5..77c7684 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -342,3 +342,8 @@ alias tmpd='cd $(mktemp -d)'
 alias brs='$BROWSER'
 which bat > /dev/null 2>&1 &&
     alias cat="bat -p"
+
+alias glf='git pull --ff'
+alias glnf='git pull --no-ff'
+alias quickvms='/media/cricket/vms/quickemu/"$(find '\''/media/cricket/vms/quickemu/'\'' -type f -iname '\''*.conf'\'' -printf '\''%f
+'\'' | sed '\''s/\.conf$//'\'' | fzf)".conf 2> /dev/null'
diff --git a/config/home/.zshenv b/config/home/.zshenv
index 1af14cf..76c6e92 100644
--- a/config/home/.zshenv
+++ b/config/home/.zshenv
@@ -2,7 +2,7 @@
 export EDITOR="nvim"
 export VISUAL="nvim"
 
-export BROWSER="surf"
+export BROWSER="osurf"
 export VIEWER="zathura"
 export PLAYER="mpv"
 
-- 
cgit v1.2.3