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 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 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 60daaef86429ca867e230fc01fbd758cdef72602 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 11 May 2024 14:41:01 +0200 Subject: feat: add new env variables for xdg --- config/home/.zshenv | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/config/home/.zshenv b/config/home/.zshenv index 65fe153..f480c51 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -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 -- 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 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 From f073720476b2bc19346049e4f2c774469289410f Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 26 May 2024 13:05:53 +0200 Subject: update cycle keyboard in fillpass to qwerty because of ydotool disable fast-forward in git config add alias to git config for changing email add unhappy.exe shell function add ssh_port shell function disable upds in prompt remove options from LESS variable add entry to zsh gitignore --- bin/guiscripts/fillpass | 8 ++++++++ config/essentials/git/config | 4 ++++ config/essentials/shell/functions.sh | 21 +++++++++++++++++++++ config/essentials/starship.toml | 12 ++++++------ config/essentials/zsh/.gitignore | 3 ++- config/home/.zshenv | 4 ++-- 6 files changed, 43 insertions(+), 9 deletions(-) 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/functions.sh b/config/essentials/shell/functions.sh index 1fd6e92..1eca57c 100644 --- a/config/essentials/shell/functions.sh +++ b/config/essentials/shell/functions.sh @@ -343,3 +343,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/home/.zshenv b/config/home/.zshenv index f480c51..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" @@ -78,7 +78,7 @@ export FZF_DEFAULT_OPTS=$FZF_DEFAULT_OPTS' --color=info:#b48ead,prompt:#bf6069,pointer:#b48dac --color=marker:#a3be8b,spinner:#ebcb8b,header:#a3be8b' -export LESS="-j 4 -i -r" +export LESS="-i -r" # Colored manpages export MANPAGER="less -R --use-color -Dd+r -Du+b" -- cgit v1.2.3