Merge branch 'main' of /var/git/dotfiles

3 files changed, 45 insertions, 35 deletions

diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 58974ba..d8675d4 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -25,7 +25,7 @@ zle -N add-surround surround
 zle -N change-surround surround
 compinit
 
-if grep -qi "debian\|ubuntu" /etc/os-release 2>/dev/null
+if grep -qi "debian\|ubuntu" /usr/lib/os-release /etc/os-release 2>/dev/null
 then
     sfiles=(
         /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index cf2a397..3df6234 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -136,13 +136,14 @@ 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)"'
 alias ss4='ss -tln4p'
 alias mdbw='mariadb -h 0.0.0.0 -u padmin -pbulbizarre padmindb'
 alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb'
 
 # ssh
 alias sha='ssh-add'
-alias ssh-start='eval "$(ssh-agent)" && 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"'
@@ -167,15 +168,14 @@ alias penv='python3 -m venv env'
 alias phttp='python3 -m http.server'
 alias pipreq='pip install -r requirements.txt'
 
-alias cx='chmod +x'
 alias ch='chown ${USER}:${USER} -R'
 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"
@@ -190,7 +190,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'
@@ -202,34 +202,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
-# !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 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}'
+# /# quick cd
jV}k:!sort -t "'" -k 2

+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/'
 
@@ -238,7 +240,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'
@@ -254,7 +256,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'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index ada523d..671e6fb 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -278,3 +278,11 @@ muttmail ()
 	die -n 'Press [Enter to login]'
 	read && mutt
 }
+
+resize ()
+{
+	test $# -lt 2 &&
+		printf "usage: %s <format> <file> [out]\n" "$0" >&2 &&
+		return 1
+	convert -resize $1^ -gravity center -crop $1+0+0 -- "$2" "${3:-$1}"
+}