From 2b3599857f549019ce24b40a1644a690b084af49 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 4 Aug 2023 19:38:36 +0200 Subject: use $HOME and added waybar edit aliases --- config/essentials/zsh/aliases.sh | 64 +++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 31 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 7926c17..5b1ae3f 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -172,9 +172,9 @@ alias kll='killall' alias pi='ping archlinux.org -c4' alias sba='source env/bin/activate || source bin/activate' alias smc='systemctl' -alias ssc='doas systemctl' +alias dsmc='doas systemctl' alias smcu='smc --user' -alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash' +alias zsr='source ${ZDOTDIR:-~}/.zshrc && rehash' alias rh='rehash' alias wf='doas wipefs -a' alias dmci="doas make clean install" @@ -189,7 +189,7 @@ alias vblsr='vbm list runningvms' alias vb='vbm startvm' # quick config -alias ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc' +alias ez='$EDITOR ${ZDOTDIR:-~}/.zshrc' alias eza='$EDITOR ${ZDOTDIR}/aliases.sh' alias ezf='$EDITOR ${ZDOTDIR}/functions.zsh' alias eto='$EDITOR ~/sync/TODO' @@ -201,34 +201,36 @@ alias est='$EDITOR ~/proj/suckless/st/config.def.h' alias esl='$EDITOR ~/proj/suckless/slock/config.def.h' alias esls='$EDITOR ~/proj/suckless/slstatus/config.def.h' alias ehy='$EDITOR ~/.config/hypr/hyprland.conf' +alias ewbj='$EDITOR ~/src/dotfiles/config/hyprland/waybar/config.jsonc' +alias ewbs='$EDITOR ~/src/dotfiles/config/hyprland/waybar/style.css' alias cfd='$EDITOR config.def.h' # /# quick cd jV}k:!sort -t "'" -k 2 -alias cdl='cd $HOME/dl' -alias cdoc='cd $HOME/docs' -alias cda='cd $HOME/docs/android/projects' -alias cdm='cd $HOME/music' -alias cdp='cd $HOME/pics' -alias cdpa='cd $HOME/pics/ai-outputs/' -alias cdpp='cd $HOME/proj/personal/' -alias chom='cd $HOME/proj/personal/homepage' -alias lov='cd $HOME/proj/personal/lola' -alias cdsw='cd $HOME/proj/personal/WheelAdvisor' -alias cddm='cd $HOME/proj/suckless/dmenu' -alias cdw='cd $HOME/proj/suckless/dwm' -alias cdslo='cd $HOME/proj/suckless/slock' -alias cdsl='cd $HOME/proj/suckless/slstatus' -alias cdst='cd $HOME/proj/suckless/st' -alias cdsta='cd $HOME/proj/suckless/stable-diffusion-webui' -alias cdsu='cd $HOME/proj/suckless/surf' -alias cds='cd $HOME/src/' -alias cdsb='cd $HOME/src/build' -alias cdsc='cd $HOME/src/comfyui/' -alias cdo='cd $HOME/src/dotfiles' -alias cdi='cd $HOME/src/installdrier' -alias cdia='cd $HOME/src/installdrier/arch' -alias cdib='cd $HOME/src/installdrier/deb' -alias czo='cd $HOME/zot/' -alias cdpw='cd ${PASSWORD_STORE_DIR:-$HOME/.password-store}' +alias cdl='cd ~/dl' +alias cdoc='cd ~/docs' +alias cda='cd ~/docs/android/projects' +alias cdm='cd ~/music' +alias cdp='cd ~/pics' +alias cdpa='cd ~/pics/ai-outputs/' +alias cdpp='cd ~/proj/personal/' +alias chom='cd ~/proj/personal/homepage' +alias lov='cd ~/proj/personal/lola' +alias cdsw='cd ~/proj/personal/WheelAdvisor' +alias cddm='cd ~/proj/suckless/dmenu' +alias cdw='cd ~/proj/suckless/dwm' +alias cdslo='cd ~/proj/suckless/slock' +alias cdsl='cd ~/proj/suckless/slstatus' +alias cdst='cd ~/proj/suckless/st' +alias cdsta='cd ~/proj/suckless/stable-diffusion-webui' +alias cdsu='cd ~/proj/suckless/surf' +alias cds='cd ~/src/' +alias cdsb='cd ~/src/build' +alias cdsc='cd ~/src/comfyui/' +alias cdo='cd ~/src/dotfiles' +alias cdi='cd ~/src/installdrier' +alias cdia='cd ~/src/installdrier/arch' +alias cdib='cd ~/src/installdrier/deb' +alias czo='cd ~/zot/' +alias cdpw='cd ${PASSWORD_STORE_DIR:-~/.password-store}' alias cdng='cd /etc/nginx' alias cdrs='cd /srv/' @@ -237,7 +239,7 @@ alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' | alias asf='alias | fzf' alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp" alias ffwin='hyprctl clients -j | jq '\''.[].pid'\'' | fzf --preview "hyprctl clients -j | jq '\''.[] | select(.pid == {}) | {class, title, workspace, xwayland}'\''"' -alias pff='find ${PASSWORD_STORE_DIR:=$HOME/src/password-store/} -name "*.gpg" | sed -e "s@$PASSWORD_STORE_DIR/@@" -e '\''s/\.gpg$//'\'' | fzf | xargs pass show -c' +alias pff='find ${PASSWORD_STORE_DIR:=~/src/password-store/} -name "*.gpg" | sed -e "s@$PASSWORD_STORE_DIR/@@" -e '\''s/\.gpg$//'\'' | fzf | xargs pass show -c' alias fzps='fzf --print0 | xargs -0I{}' alias dcb='docker build' @@ -253,7 +255,7 @@ alias dbinf='ssh db dlinfo' alias sshdb='ssh -t db tmux a' alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music' -alias cfg='git --git-dir=$HOME/src/dotfiles/.git --work-tree=$HOME/src/dotfiles' +alias cfg='git --git-dir=~/src/dotfiles/.git --work-tree=~/src/dotfiles' # oh-my-zsh git aliases alias g='git' alias ga='git add' -- cgit v1.2.3 From 49bbf6906089b5d957e2a781002d32b811ae630d Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 4 Aug 2023 22:45:28 +0200 Subject: [aliases] added ufwd --- config/essentials/zsh/aliases.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 07a17e2..cf2a397 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -40,6 +40,7 @@ fi if grep -qi "debian\|ubuntu" /etc/os-release 2> /dev/null then alias aptup='apt update && apt upgrade -y' + alias ufwd='echo y | ufw delete "$(ufw status numbered | tail -n +5 | fzf | cut -f2 -d'\''['\'' | cut -f1 -d'\'']'\'')"' fi # Programs -- cgit v1.2.3 From cb110575144beb4125fd1d8204c8204e6bca280f Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 7 Aug 2023 18:59:08 +0200 Subject: [goo] added option to give search query as second paramater I noticed by mistake sometimes I would type the query already. --- bin/common/goo | 9 +++++++-- config/essentials/zsh/functions.zsh | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'config/essentials/zsh') diff --git a/bin/common/goo b/bin/common/goo index cfd03ec..2a5faad 100755 --- a/bin/common/goo +++ b/bin/common/goo @@ -15,9 +15,14 @@ VisualParadigm intellij arduino15" +if [ -n "$2" ] +then + [ -d "$2" ] && dest="$2" || opt="-q $2" +fi + for dir in $exclude; do dirs="$dirs -name \"$dir\" -o " done -cmd="find ${2:-$HOME} \(${dirs} -false \) -prune -o -type ${1:-f} -mindepth 1 -print" +cmd="find ${dest:-$HOME} \(${dirs} -false \) -prune -o -type ${1:-f} -mindepth 1 -print" -eval "$cmd" 2>/dev/null +eval "$cmd" 2>/dev/null | fzf $opt diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 671e6fb..053ce8e 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -39,9 +39,9 @@ nnn() { test -z "$NNNLVL" && /usr/bin/nnn "$@" || exit } ranger() { test -z "$RANGER_LEVEL" && /usr/bin/ranger "$@" || exit } # googoo aliases -ff () { goo f "$1" | fzf } -fd () { goo d "$1" | fzf } -fdf () { goo f "$1" | fzf | xargs -I {} dirname "{}" } +ff () { goo f "$1" } +fd () { goo d "$1" } +fdf () { goo f "$1" | xargs -I {} dirname "{}" } o () { f="$(ff $1)" -- cgit v1.2.3 From 557b4e5d5bb85919c6dc0f87d27d7df07616f7fd Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 7 Aug 2023 19:00:29 +0200 Subject: [aliases] updated the gdate alias --- config/essentials/zsh/aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 3df6234..b1d4a50 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -181,7 +181,7 @@ alias wf='doas wipefs -a' alias dmci="doas make clean install" alias rmd='rm -f *.{orig,rej}' alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite' -alias gdate="date +%y%m%d_%H%M%S" +alias gdate='date +%y_%m_%d-%T' alias tpid='tail -f /dev/null --pid' alias vbm='vboxmanage' -- cgit v1.2.3 From b3f42fec8739d1d23ec6d64ff35c9db022c5adca Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 13 Aug 2023 20:15:52 +0200 Subject: [googoo] removed functions and updated behaviour removed functions that where unneed as they were only called once, changed behaviour to not implement fzf in goo but in the functions itself, this makes goo easier to implement in other commands. Also ported over the funcitonality of setting the query with the first argument --- bin/common/goo | 7 +------ config/essentials/zsh/functions.zsh | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'config/essentials/zsh') diff --git a/bin/common/goo b/bin/common/goo index 2a5faad..a56cbaf 100755 --- a/bin/common/goo +++ b/bin/common/goo @@ -15,14 +15,9 @@ VisualParadigm intellij arduino15" -if [ -n "$2" ] -then - [ -d "$2" ] && dest="$2" || opt="-q $2" -fi - for dir in $exclude; do dirs="$dirs -name \"$dir\" -o " done cmd="find ${dest:-$HOME} \(${dirs} -false \) -prune -o -type ${1:-f} -mindepth 1 -print" -eval "$cmd" 2>/dev/null | fzf $opt +eval "$cmd" 2>/dev/null diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 053ce8e..c4999db 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -39,23 +39,30 @@ nnn() { test -z "$NNNLVL" && /usr/bin/nnn "$@" || exit } ranger() { test -z "$RANGER_LEVEL" && /usr/bin/ranger "$@" || exit } # googoo aliases -ff () { goo f "$1" } -fd () { goo d "$1" } -fdf () { goo f "$1" | xargs -I {} dirname "{}" } +_googoo_fzf_opt () +{ + if [ "$1" ] + then + [ -d "$1" ] && dest="$1" || opt="-q $1" + fi +} o () { - f="$(ff $1)" + _googoo_fzf_opt "$1" + f="$(goo f "dest" | fzf $opt)" test "$1" && shift - test -n "$f" && $EDITOR $@ "$f" + test -f "$f" && $EDITOR $@ "$f" } go () { - d="$(fd $1)" + _googoo_fzf_opt "$1" + d="$(goo d "$dest" | fzf $opt)" test -d "$d" && cd "$d" } ogo () { - d="$(fdf $1)" + _googoo_fzf_opt "$1" + d="$(dirname "$(goo f "$dest")" | fzf $opt)" test -d "$d" && cd "$d" } -- cgit v1.2.3 From 93d3613febfb869d5f30d74c25b2fbc0b20170ca Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 13 Aug 2023 20:17:48 +0200 Subject: [aliases] added diff alias --- config/essentials/zsh/aliases.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index b1d4a50..9849b93 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -128,6 +128,7 @@ alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HD alias d='du -d 0 -h' alias dud='du .* * -d 0 -h 2>/dev/null | sort -h' alias df='df -h' +alias diff='diff -u --color' alias shred='shred -uz' alias lsblk='lsblk -o name,type,fsused,fsavail,size,fstype,label,mountpoint' alias floc='doas find / -type "f" 2> /dev/null | grep' -- cgit v1.2.3 From 02a5c5ddf55986666335e2d5a16c4635f0b6ca80 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 13 Aug 2023 20:17:59 +0200 Subject: [functions] use grouping in calc, added psgrep --- config/essentials/zsh/functions.zsh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index c4999db..3c5f11f 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -76,7 +76,13 @@ ipc () fi } -calc () { echo "$@" | bc -l } +calc () { echo "$@" | bc -l | numfmt --grouping; } + +psgrep () +{ + [ $# -eq 0 ] && return 1 + pgrep "$@" | xargs ps +} unique () { local f -- cgit v1.2.3 From 949d2f7025cbfe4db316a3fc13199ac5c82d4b5b Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 13 Aug 2023 20:18:46 +0200 Subject: [zshrc] use exec and keychain identity Add keychain identity on startup, this is more useful because with suspend I will only type the password once per day. Also it makes adding with keyadd faster. Also use exec to have less processes, don't know if it works though... --- bin/guiscripts/startw | 1 + config/essentials/zsh/.zshrc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'config/essentials/zsh') diff --git a/bin/guiscripts/startw b/bin/guiscripts/startw index 768f401..9b35556 100755 --- a/bin/guiscripts/startw +++ b/bin/guiscripts/startw @@ -1,5 +1,6 @@ #!/bin/sh eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)" +eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)" Hyprland diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index d8675d4..0665533 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -5,9 +5,9 @@ then clear if [ "/dev/tty1" = "$TTY" ] then - startw > /dev/null 2>&1 + exec startw > /dev/null 2>&1 else - startx > /dev/null 2>&1 + exec startx > /dev/null 2>&1 fi exit fi -- cgit v1.2.3 From 4fbb921cd8a9da0135e0ddf54da898e080cc8c7e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 14 Aug 2023 11:50:34 +0200 Subject: [aliases] added ufwd --- config/essentials/zsh/aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 3df6234..3884582 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -40,7 +40,7 @@ fi if grep -qi "debian\|ubuntu" /etc/os-release 2> /dev/null then alias aptup='apt update && apt upgrade -y' - alias ufwd='echo y | ufw delete "$(ufw status numbered | tail -n +5 | fzf | cut -f2 -d'\''['\'' | cut -f1 -d'\'']'\'')"' + alias ufwd='echo y | ufw delete "$(ufw status numbered | tail -n +5 | fzf | cut -f2 -d'\''['\'' | cut -f1 -d'\'']'\'')" > /dev/null 2>&1 && >&2 echo "deleted."' fi # Programs -- cgit v1.2.3 From e1893b1b31503adaa2c2484b57a5d7a4a5d0516c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Mon, 14 Aug 2023 21:37:08 +0200 Subject: [googoo] fixed destination argument not working --- bin/common/goo | 2 +- config/essentials/zsh/functions.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config/essentials/zsh') diff --git a/bin/common/goo b/bin/common/goo index a56cbaf..cfd03ec 100755 --- a/bin/common/goo +++ b/bin/common/goo @@ -18,6 +18,6 @@ arduino15" for dir in $exclude; do dirs="$dirs -name \"$dir\" -o " done -cmd="find ${dest:-$HOME} \(${dirs} -false \) -prune -o -type ${1:-f} -mindepth 1 -print" +cmd="find ${2:-$HOME} \(${dirs} -false \) -prune -o -type ${1:-f} -mindepth 1 -print" eval "$cmd" 2>/dev/null diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 3c5f11f..e0eeb45 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -49,7 +49,7 @@ _googoo_fzf_opt () o () { _googoo_fzf_opt "$1" - f="$(goo f "dest" | fzf $opt)" + f="$(goo f "$dest" | fzf $opt)" test "$1" && shift test -f "$f" && $EDITOR $@ "$f" } -- cgit v1.2.3 From edf8bc8432bb17854b5ef5667864ed58550956d1 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:06:44 +0200 Subject: [functions.zsh] changed function name format --- config/essentials/zsh/functions.zsh | 60 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 31 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index e0eeb45..dee883f 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -1,6 +1,6 @@ #!/bin/zsh -die () +die() { echo "$@" >&2 } @@ -39,34 +39,34 @@ nnn() { test -z "$NNNLVL" && /usr/bin/nnn "$@" || exit } ranger() { test -z "$RANGER_LEVEL" && /usr/bin/ranger "$@" || exit } # googoo aliases -_googoo_fzf_opt () +_googoo_fzf_opt() { if [ "$1" ] then [ -d "$1" ] && dest="$1" || opt="-q $1" fi } -o () +o() { _googoo_fzf_opt "$1" f="$(goo f "$dest" | fzf $opt)" test "$1" && shift test -f "$f" && $EDITOR $@ "$f" } -go () +go() { _googoo_fzf_opt "$1" d="$(goo d "$dest" | fzf $opt)" test -d "$d" && cd "$d" } -ogo () +ogo() { _googoo_fzf_opt "$1" d="$(dirname "$(goo f "$dest")" | fzf $opt)" test -d "$d" && cd "$d" } -ipc () +ipc() { if [[ "$(ip link show eno1 | awk -F, 'NR=1 {print $3}')" == "UP" ]] then @@ -76,22 +76,20 @@ ipc () fi } -calc () { echo "$@" | bc -l | numfmt --grouping; } - -psgrep () +psgrep() { [ $# -eq 0 ] && return 1 pgrep "$@" | xargs ps } -unique () { +unique() { local f f="$(mktemp)" awk '!x[$0]++' "$1" > "$f" mv "$f" "$1" } -clip () { +clip() { if [ "$WAYLAND_DISPLAY" ] then echo -n "$@" | wl-copy @@ -100,7 +98,7 @@ clip () { fi } -unzipp () { +unzipp() { file=$1 shift unzip $file $@ || exit 1 @@ -108,18 +106,18 @@ unzipp () { } # fix long waiting time -__git_files () { +__git_files() { _wanted files expl 'local files' _files } -esc () { +esc() { $EDITOR "$(which $1)" } -delfile () { +delfile() { curl "${2:-https://upfast.cronyakatsuki.xyz/delete/$1}" } -upfile () { +upfile() { curl -F "file=@\"$1\"" ${2:-https://upfast.cronyakatsuki.xyz} } @@ -177,7 +175,7 @@ function git_develop_branch() { } # gpg backup -gpg_backup () +gpg_backup() { gpg --export-secret-keys --armor > private.asc gpg --export --armor > public.asc @@ -186,7 +184,7 @@ gpg_backup () shred -uz {public,private,trust}.asc } -gpg_import () +gpg_import() { tar xf $1 shred -uz $1 @@ -196,29 +194,29 @@ gpg_import () shred -uz {public,private,trust}.asc } -ngenable () +ngenable() { ln -sf /etc/nginx/sites-available/$1 /etc/nginx/sites-enabled/ } -vbsr () +vbsr() { vboxmanage snapshot "$1" restore "$2" && vboxmanage startvm "$1" || vboxmanage controlvm "$1" poweroff } -vbsrr () +vbsrr() { vbsr "$1" "$2" sleep 3 vbsr "$1" "$2" } -vbst () +vbst() { vboxmanage snapshot "$1" take "$2" } -pacsize () +pacsize() { if test -n "$1"; then packages="$@" @@ -232,7 +230,7 @@ pacsize () expac '%m %n' - | numfmt --to=iec-i --suffix=B --format="%.2f" } -pkbs () +pkbs() { pkgfile -b "$1" | tee /dev/stderr | doas pacman -S - } @@ -247,7 +245,7 @@ mime-default () die "Done." } -addedkeys () { +addedkeys() { find ~/.ssh -iname "*.pub" | while read key do local fingerprint="$(ssh-keygen -lf "$key" 2>/dev/null)" @@ -258,7 +256,7 @@ addedkeys () { done | sed "s,$HOME/.ssh/,," } -fpass () { +fpass() { find $HOME/.password-store -type f -not -path ".git" | grep "\.gpg$" | sed "s,$HOME/.password-store/,,;s,\.gpg$,," | @@ -266,22 +264,22 @@ fpass () { xargs pass show -c } -oclip () +oclip() { printf "\033]52;c;$(echo -n "$@" | base64)\a" } -sms () +sms() { ssh phone sendmsg "$1" "'$2'" } -trcp () +trcp() { scp "$1" db:/media/basilisk/downloads/transmission/torrents/ } -muttmail () +muttmail() { die -n "email set: " ls $HOME/.config/mutt/configs | @@ -292,7 +290,7 @@ muttmail () read && mutt } -resize () +resize() { test $# -lt 2 && printf "usage: %s [out]\n" "$0" >&2 && -- cgit v1.2.3 From dd75534e1878d7934d0a402a70e20d24226fcd8e Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:07:02 +0200 Subject: [functions.zsh] renamed die to log --- config/essentials/zsh/functions.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index dee883f..0d4b8a5 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -1,9 +1,7 @@ #!/bin/zsh -die() -{ - echo "$@" >&2 -} +log() { >&2 printf '%s' "$@"; } +logn() { >&2 printf '%s\n' "$@"; } awnk() { awk "{print \$$1}" -- cgit v1.2.3 From 2321b913f89f2bc678c8931db05e0eb5898d7191 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 12:09:07 +0200 Subject: [functions.zsh] added ginit function to init a dir on db remote --- config/essentials/zsh/functions.zsh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 0d4b8a5..6c2437f 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -138,16 +138,24 @@ sgd () { unset d } -# Git functions +ginit() +{ + [ "$1" ] || return 1 + ssh db /var/git/initdir.sh "$1" + git remote add origin git@db:"$1.git" + git push --set-upstream origin $(git_current_branch) +} + # Returns current branch -function git_current_branch() +git_current_branch() { command git rev-parse --git-dir &>/dev/null || return git branch --show-current } # Check if main exists and use instead of master -function git_main_branch() { +git_main_branch() +{ command git rev-parse --git-dir &>/dev/null || return local ref for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default}; do -- cgit v1.2.3 From 15d604ed1c9e0b74663ab4271a9ce17ded2889e2 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:07:48 +0200 Subject: [aliases.zsh] added calc alias --- config/essentials/zsh/aliases.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 9849b93..4185999 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -15,6 +15,8 @@ then alias ogo/='ogo /' alias ogo/s='ogo /srv' + alias calc='bc <<<' + if [ "$WAYLAND_DISPLAY" ] then alias -g clipp='wl-copy -n' @@ -145,7 +147,6 @@ alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb' # ssh alias sha='ssh-add' alias sshs='eval "$(ssh-agent)" && ssh-add' - alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i' alias whatsmyip='curl -s "ifconfig.co"' alias icognito='unset HISTFILE' -- cgit v1.2.3 From 0ea5e7a97b7ccba919d5c495e3e328b30cec9e03 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:08:46 +0200 Subject: [functions.zsh] removed unecessary tests --- config/essentials/zsh/functions.zsh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 6c2437f..eb776f0 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -54,14 +54,20 @@ o() go() { _googoo_fzf_opt "$1" - d="$(goo d "$dest" | fzf $opt)" - test -d "$d" && cd "$d" + cd "$(goo d "$dest" | fzf $opt)" } ogo() { _googoo_fzf_opt "$1" - d="$(dirname "$(goo f "$dest")" | fzf $opt)" - test -d "$d" && cd "$d" + cd "$(dirname "$(goo f "$dest")" | fzf $opt)" +} +dgo() +{ + cd "$(goo d | fzf --filter "$@" | head -n 1)" +} +open() +{ + $EDITOR "$(goo f | fzf --filter "$@" | head -n 1)" } ipc() -- cgit v1.2.3 From 63c16da0da3e9b0cdc3fb6f9cd3031dc2297a09c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 15 Aug 2023 15:26:23 +0200 Subject: [.zshrc] refactored git_parse_remote use cut instead of sed to get the state of the remote, now you could use this command: git branch -v 2> /dev/null | sed '/^*/!d;s/^[^[]*\[\([^ ]*\).*$/\1/' but at this point, it feels more like intellectual masturbation. --- config/essentials/zsh/.zshrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 0665533..769c805 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -121,13 +121,13 @@ RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(par setopt prompt_subst parse_git_remote() { - b="$(git branch -v 2> /dev/null | grep "^*" | sed 's/.\+\[\([^ ]\+\).*$/\1/')" + b="$(git branch -v 2>/dev/null | grep "^*" | cut -f2 -d'[' | cut -f1 -d' ')" if [ "$b" = "behind" ] then - echo -n "↓ " + printf "↓ " elif [ "$b" = "ahead" ] then - echo -n "↑ " + printf "↑ " fi } parse_git_branch() { -- cgit v1.2.3 From 9172676556847ff625cbf4b4eff19f441e0b9386 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Tue, 22 Aug 2023 22:33:19 +0200 Subject: [aliases] edited aliases removed aliases that have been replaced such as floc and dloc, and added more aliases --- config/essentials/zsh/aliases.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh index 4185999..a1bbf50 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/zsh/aliases.sh @@ -5,9 +5,6 @@ if [ $SHELL = "/bin/zsh" ] then # googoo aliases - alias o.='o .' - alias go.='go .' - alias ogo.='ogo .' alias o/='o /' alias o/s='o /srv' alias go/='go /' @@ -133,10 +130,6 @@ alias df='df -h' alias diff='diff -u --color' alias shred='shred -uz' alias lsblk='lsblk -o name,type,fsused,fsavail,size,fstype,label,mountpoint' -alias floc='doas find / -type "f" 2> /dev/null | grep' -alias dloc='doas find / -type "d" 2> /dev/null | grep' -alias fif='find . -type "f" | grep' -alias fid='find . -type "d" | grep' alias sxt='sxiv -t' alias wgsh='wget --quiet --show-progress' alias wgc='wgsh "$(clipo)"' @@ -185,6 +178,7 @@ alias rmd='rm -f *.{orig,rej}' alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite' alias gdate='date +%y_%m_%d-%T' alias tpid='tail -f /dev/null --pid' +alias pwdcp='pwd | clipp' alias vbm='vboxmanage' alias vbls='vbm list vms' @@ -217,6 +211,7 @@ alias cdpa='cd ~/pics/ai-outputs/' alias cdpp='cd ~/proj/personal/' alias chom='cd ~/proj/personal/homepage' alias lov='cd ~/proj/personal/lola' +alias cdsh='~/proj/personal/scheduler' alias cdsw='cd ~/proj/personal/WheelAdvisor' alias cddm='cd ~/proj/suckless/dmenu' alias cdw='cd ~/proj/suckless/dwm' @@ -238,6 +233,8 @@ alias cdng='cd /etc/nginx' alias cdrs='cd /srv/' # fzf aliases +alias ppj='cd ~/proj/personal/"$(find ~/proj/personal -mindepth 1 -maxdepth 1 -type d -printf "%f\n"| fzf)"' +alias cfg='find -L ~/src/dotfiles -type f | fzf | xargs -r $EDITOR' alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' | clipp' alias asf='alias | fzf' alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp" @@ -258,7 +255,6 @@ alias dbinf='ssh db dlinfo' alias sshdb='ssh -t db tmux a' alias dbsmu='rsync -aPz db:/media/basilisk/music/ /media/kilimanjaro/music' -alias cfg='git --git-dir=~/src/dotfiles/.git --work-tree=~/src/dotfiles' # oh-my-zsh git aliases alias g='git' alias ga='git add' -- cgit v1.2.3 From 2e9c5c77562d5aabc1b1f89641fc9eb75b3c9292 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 25 Aug 2023 00:31:24 +0200 Subject: [zshrc] fixed highlight bug --- config/essentials/zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 769c805..eeb4439 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -89,7 +89,7 @@ rehash_precmd() { # window title hooks add-zsh-hook -Uz precmd rehash_precmd set_wt_action () { - print -Pn '\e]0;$1\a' + print -Pn "\e]0;$1\a\033[0m" } add-zsh-hook -Uz preexec set_wt_action set_wt () { -- cgit v1.2.3 From c9dec781ad79c0345c7d2d98ab59de5d4f858ba7 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 25 Aug 2023 00:32:08 +0200 Subject: [functions.zsh] use log(n) --- config/essentials/zsh/functions.zsh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index eb776f0..1682315 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -20,7 +20,7 @@ nvf() { local match="$(grep -m1 "$1$" "$cache" 2> /dev/null)" if test ! -f "$match" then - die "resetting cache..." + logn "resetting cache..." match="$(goo | tee "$cache" | grep -m 1 "$1$" 2> /dev/null)" # # Alternative: # match="$(goo | grep -m 1 "$1" 2> /dev/null | tee -a | "$cache")" @@ -29,7 +29,7 @@ nvf() { then $EDITOR "$match" && return else - die "no match." && return 1 + logn "no match." && return 1 fi } @@ -249,12 +249,12 @@ pkbs() mime-default () { - die "Setting '$1' as default for its mimetypes" + logn "Setting '$1' as default for its mimetypes" grep "MimeType=" /usr/share/applications/"$1" | cut -d '=' -f 2- | tr ';' '\n' | xargs -I {} xdg-mime default "$1" "{}" - die "Done." + logn "Done." } addedkeys() { @@ -293,12 +293,12 @@ trcp() muttmail() { - die -n "email set: " + log "email set: " ls $HOME/.config/mutt/configs | fzf | tee /dev/stderr | xargs -I {} ln -sf "$HOME/.config/mutt/configs/{}" $HOME/.config/mutt/muttrc - die -n 'Press [Enter to login]' + log 'Press [Enter to login]' read && mutt } @@ -309,3 +309,5 @@ resize() return 1 convert -resize $1^ -gravity center -crop $1+0+0 -- "$2" "${3:-$1}" } + +rln() { ln -s "$(readlink -f "$1")" "$2"; } -- cgit v1.2.3 From 0b5f4fbc66bc3ba5a1717f70a9b4ae5fb542742c Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Fri, 25 Aug 2023 00:32:46 +0200 Subject: [functions.zsh] fixed typo in ogo --- config/essentials/zsh/functions.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 1682315..7a94207 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -59,7 +59,7 @@ go() ogo() { _googoo_fzf_opt "$1" - cd "$(dirname "$(goo f "$dest")" | fzf $opt)" + cd "$(dirname "$(goo f "$dest" | fzf $opt)")" } dgo() { -- cgit v1.2.3 From 333aaf38c66a1e4ba41d3acea38b21613c0075b2 Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sun, 27 Aug 2023 12:53:48 +0200 Subject: [functions] grouped oneliners together --- config/essentials/zsh/functions.zsh | 50 ++++++++++--------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) (limited to 'config/essentials/zsh') diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh index 7a94207..22a8fbe 100644 --- a/config/essentials/zsh/functions.zsh +++ b/config/essentials/zsh/functions.zsh @@ -3,18 +3,11 @@ log() { >&2 printf '%s' "$@"; } logn() { >&2 printf '%s\n' "$@"; } -awnk() { - awk "{print \$$1}" -} - vmp() { col -b | \ vim -MR \ -c 'set ft=man nolist nonu nornu' } -vimh() { - vim -c "help $1" -c 'call feedkeys("\o")' -} nvf() { local cache="$HOME/.cache/nvf" local match="$(grep -m1 "$1$" "$cache" 2> /dev/null)" @@ -61,14 +54,17 @@ ogo() _googoo_fzf_opt "$1" cd "$(dirname "$(goo f "$dest" | fzf $opt)")" } -dgo() -{ - cd "$(goo d | fzf --filter "$@" | head -n 1)" -} -open() -{ - $EDITOR "$(goo f | fzf --filter "$@" | head -n 1)" -} + +# Onelineres +awnk() { awk "{print \$$1}"; } +vimh() { vi -c "help $1" -c 'call feedkeys("\o")'; } +dgo() { cd "$(goo d ~ | fzf --filter "$@" | head -n 1)"; } +open() { $EDITOR "$(goo f ~ | fzf --filter "$@" | head -n 1)"; } +pkbs() { pkgfile -b "$1" | tee /dev/stderr | doas pacman -S -; } +oclip() { printf "\033]52;c;$(echo -n "$@" | base64)\a"; } +sms() { ssh phone sendmsg "$1" "'$2'"; } +trcp() { scp "$1" db:/media/basilisk/downloads/transmission/torrents/; } +rln() { ln -s "$(readlink -f "$1")" "$2"; } ipc() { @@ -125,7 +121,8 @@ upfile() { curl -F "file=@\"$1\"" ${2:-https://upfast.cronyakatsuki.xyz} } -sgd () { +# git +sgd() { d="$PWD" find $HOME/src -maxdepth 1 -mindepth 1 -type d | while read -r dir @@ -242,10 +239,6 @@ pacsize() expac '%m %n' - | numfmt --to=iec-i --suffix=B --format="%.2f" } -pkbs() -{ - pkgfile -b "$1" | tee /dev/stderr | doas pacman -S - -} mime-default () { @@ -276,21 +269,6 @@ fpass() { xargs pass show -c } -oclip() -{ - printf "\033]52;c;$(echo -n "$@" | base64)\a" -} - -sms() -{ - ssh phone sendmsg "$1" "'$2'" -} - -trcp() -{ - scp "$1" db:/media/basilisk/downloads/transmission/torrents/ -} - muttmail() { log "email set: " @@ -309,5 +287,3 @@ resize() return 1 convert -resize $1^ -gravity center -crop $1+0+0 -- "$2" "${3:-$1}" } - -rln() { ln -s "$(readlink -f "$1")" "$2"; } -- cgit v1.2.3