Merge remote-tracking branch 'origin/main'

9 files changed, 128 insertions, 20 deletions

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/guiscripts/fillpass b/bin/guiscripts/fillpass
index 358afd1..ea2246a 100755
--- a/bin/guiscripts/fillpass
+++ b/bin/guiscripts/fillpass
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+if [ "colemak" = "$(setxkbmap -query | awk '/^variant:/ {print $2}')" ]
+then
+    cycleKB
+    cycle=1
+fi
+# assume we are using colemak
 pass="$(
 	find "${PASSWORD_STORE_DIR:=~/src/password-store/}" -name "*.gpg" |
 	sed -e "s@$PASSWORD_STORE_DIR/@@" -e 's/\.gpg$//' |
@@ -13,3 +19,5 @@ if [ "$login" ]
 then printf '%s\t%s\n' "$login" "$password" | ydotool type -f -
 else printf '%s\n' "$password" | ydotool type -f -
 fi
+
+[ "$cycle" ] && cycleKB
diff --git a/config/essentials/git/config b/config/essentials/git/config
index fcf80db..cb16983 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -10,3 +10,7 @@
 	rebase = false
 [commit]
 	gpgsign = true
+[merge]
+	ff = false
+[alias]
+	change-commits = "!f() { VAR1=$1; VAR='$'$1; OLD=$2; NEW=$3; echo \"Are you sure for replace $VAR  $OLD => $NEW ?(Y/N)\";read OK;if [ \"$OK\" = 'Y' ] ; then shift 3; git filter-branch  --env-filter \"if [ \\\"${VAR}\\\" = '$OLD' ]; then export $VAR1='$NEW';echo 'to $NEW'; fi\" $@; fi;};  f "
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index ab17645..44aa7bc 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -170,7 +170,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/shell/functions.sh b/config/essentials/shell/functions.sh
index e0b148c..3676f26 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -336,3 +336,24 @@ fchange()
             eval "$1"
         done
 }
+
+unhappy.exe() {
+    [ "$1" ] &&
+        smiles=("[: " ".-." " :]" "._.") ||
+        smiles=("]: " ".-." " :[" "._.")
+
+	while true
+	do
+		for s in $smiles
+		do
+			printf '\r%s' "$s"
+			sleep 1
+		done
+	done
+}
+
+ssh_port()
+{
+    ssh -f -N -L 0.0.0.0:"$3":localhost:"$1" "$2"
+    >&2 printf "Forwarded port '%s' on '%s' to '%s'.\n" "$1" "$2" "$3"
+}
diff --git a/config/essentials/starship.toml b/config/essentials/starship.toml
index 15139f5..efcaf48 100644
--- a/config/essentials/starship.toml
+++ b/config/essentials/starship.toml
@@ -3,7 +3,7 @@
 # Inserts a blank line between shell prompts
 add_newline = false
 # format = ' ${custom.upds}'
-format = ' [\[$username@$hostname\]](bg:#000000) ${custom.upds}$all'
+format = ' [\[$username@$hostname\]](bg:#000000) $all'
 right_format = """$status"""
 
 [character]
@@ -32,8 +32,8 @@ min_time = 500
 format = '($status)'
 disabled = false
 
-[custom.upds]
-command = 'cat ~/.cache/updates' # shows output of command
-when = '[ "$(cat ~/.cache/updates)" -gt 0 ]'
-symbol = '📦'
-format = '$output$symbol '
+# [custom.upds]
+# command = 'cat ~/.cache/updates' # shows output of command
+# when = '[ "$(cat ~/.cache/updates)" -gt 0 ]'
+# symbol = '📦'
+# format = '$output$symbol '
diff --git a/config/essentials/zsh/.gitignore b/config/essentials/zsh/.gitignore
index b717a37..a13c79f 100644
--- a/config/essentials/zsh/.gitignore
+++ b/config/essentials/zsh/.gitignore
@@ -1,2 +1,3 @@
 histfile
-zcompcache
\ No newline at end of file
+zcompcache
+.zcompdump
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index e2704e9..6e28602 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -115,7 +115,7 @@ 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
diff --git a/config/home/.zshenv b/config/home/.zshenv
index c4b1e9d..1af14cf 100644
--- a/config/home/.zshenv
+++ b/config/home/.zshenv
@@ -2,7 +2,7 @@
 export EDITOR="nvim"
 export VISUAL="nvim"
 
-export BROWSER="librewolf"
+export BROWSER="surf"
 export VIEWER="zathura"
 export PLAYER="mpv"
 
@@ -11,23 +11,37 @@ export XDG_CACHE_HOME="$HOME"/.cache
 export XDG_DATA_HOME="$HOME"/.local/share
 export XDG_STATE_HOME="$HOME"/.local/state
 
+export ANDROID_USER_HOME="$XDG_DATA_HOME"/android
+export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
+export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle
+export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
 export CARGO_HOME="$XDG_CONFIG_HOME"/cargo
-export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
+export DOTNET_CLI_HOME="$XDG_DATA_HOME"/dotnet
 export GNUPGHOME="$XDG_CONFIG_HOME"/gnupg
+export GOMODCACHE="$XDG_CACHE_HOME"/go/mod
+export GOPATH="$XDG_DATA_HOME"/go
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc-2.0
+export MYSQL_HISTFILE="$XDG_DATA_HOME"/mysql_history
+export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
-export NVM_DIR="$XDG_DATA_HOME"/nvm
-export W3M_DIR="$XDG_STATE_HOME"/w3m
-export GOPATH="$XDG_DATA_HOME"/go
-export GOMODCACHE="$XDG_CACHE_HOME"/go/mod
-export TNS_ADMIN=/opt/oracle/instantclient_21_9/network/admin
-export WGETRC="$XDG_CONFIG_HOME"/wgetrc
 export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
+export NVM_DIR="$XDG_DATA_HOME"/nvm
+export OMNISHARPHOME="$XDG_CONFIG_HOME"/omnisharp
 export PARALLEL_HOME="$XDG_CONFIG_HOME"/parallel
-export MYSQL_HISTFILE="$XDG_DATA_HOME"/mysql_history
 export RANDFILE="$XDG_CACHE_HOME"/rnd
-export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
-export PARALLEL_HOME="$XDG_CACHE_HOME"/parallel
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+export TERMINFO="$XDG_DATA_HOME"/terminfo
+export TERMINFO_DIRS="$XDG_DATA_HOME"/terminfo:/usr/share/terminfo
+export TNS_ADMIN=/opt/oracle/instantclient_21_9/network/admin
+export W3M_DIR="$XDG_STATE_HOME"/w3m
+export WGETRC="$XDG_CONFIG_HOME"/wgetrc
+export WINEPREFIX="$XDG_DATA_HOME"/wine
+export XCURSOR_PATH=/usr/share/icons:"$XDG_DATA_HOME"/icons
+alias adb='HOME="$XDG_DATA_HOME"/android adb'
+alias irssi='irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HOME"/irssi'
+alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc'
 
 export XINITRC="$XDG_CONFIG_HOME"/x11/xinitrc
 export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority