From cb955e6fc78f855cb230af4bb6bb8cbc0718509e Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 15 Jul 2023 23:17:52 +0200
Subject: added more aliases

---
 config/essentials/zsh/aliases.zsh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index 84373a2..99372d6 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -72,6 +72,8 @@ alias dopacs='dopac -S'
 alias dopacc='dopac -Sc'
 alias doprm='dopac -Rns'
 
+alias mpkg='makepkg -si'
+
 which pikaur > /dev/null 2>&1 &&
 	alias yay='pikaur'
 alias yup='yay -Syu'
@@ -84,6 +86,11 @@ alias yrm='yay -Rns'
 
 alias pkb='pkgfile -b'
 
+# transmission
+alias tr='transmission-remote debuc.com'
+alias trls='transmission-remote debuc.com -t all -l'
+alias tradd='transmission-remote debuc.com -a'
+
 alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg'
 
 # vim
@@ -153,7 +160,7 @@ alias kll='killall'
 alias pi='ping archlinux.org -c4'
 alias sba='source env/bin/activate || source bin/activate'
 alias smc='systemctl'
-alias ssc='doas smc'
+alias ssc='doas systemctl'
 alias smcu='smc --user'
 alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
 alias rh='rehash'
@@ -162,6 +169,7 @@ 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 tpid='tail -f /dev/null --pid'
 
 alias vbm='vboxmanage'
 alias vbls='vbm list vms'
@@ -216,10 +224,13 @@ alias go/s='go /srv'
 alias ogo/='ogo /'
 alias ogo/s='ogo /srv'
 
+# fzf aliases
 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"
+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 fzps='fzf --print0 | xargs -0I{}'
 
 alias -s zip='unzip -l'
 alias -s tar='tar tf'
-- 
cgit v1.2.3


From cf28db3c5d23eccf7fc4b5d05d10ece19be819a3 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 15 Jul 2023 23:18:01 +0200
Subject: added trcp function

---
 config/essentials/zsh/functions.zsh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index 5c4d609..188b405 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -260,3 +260,8 @@ sms ()
 {
 	ssh phone sendmsg "$1" "'$2'"
 }
+
+trcp ()
+{
+	scp "$1" db:/media/basilisk/downloads/transmission/torrents/
+}
-- 
cgit v1.2.3


From 8bc5185b5601ab11c714dc725a1328f8ccdd3948 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 18 Jul 2023 17:55:32 +0200
Subject: added transmission aliases

---
 config/essentials/zsh/aliases.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index 99372d6..94d27e7 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -87,9 +87,10 @@ alias yrm='yay -Rns'
 alias pkb='pkgfile -b'
 
 # transmission
-alias tr='transmission-remote debuc.com'
+alias trr='transmission-remote debuc.com'
 alias trls='transmission-remote debuc.com -t all -l'
 alias tradd='transmission-remote debuc.com -a'
+alias trclipo='transmission-remote debuc.com -a "$(clipo)"'
 
 alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg'
 
-- 
cgit v1.2.3


From ac818112951a7554150a09cb988c81b89c9e7494 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Tue, 18 Jul 2023 17:56:14 +0200
Subject: use mktemp for unique

---
 config/essentials/zsh/functions.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index 5c4d609..2f86b5d 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -72,7 +72,8 @@ ipc ()
 calc () { echo "$@" | bc -l }
 
 unique () {
-	f="/tmp/$(uuidgen)"
+	local f
+	f="$(mktemp)"
 	awk '!x[$0]++' "$1" > "$f"
 	mv "$f" "$1"
 }
-- 
cgit v1.2.3


From 4f2846ea552c8c71c8ebbc4394f625499e823122 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Thu, 20 Jul 2023 13:20:12 +0200
Subject: made aliases.zsh more shell gnostic

---
 config/essentials/zsh/.zshrc      |   2 +-
 config/essentials/zsh/aliases.sh  | 434 +++++++++++++++++++++++++++++++++++++
 config/essentials/zsh/aliases.zsh | 435 --------------------------------------
 3 files changed, 435 insertions(+), 436 deletions(-)
 create mode 100644 config/essentials/zsh/aliases.sh
 delete mode 100644 config/essentials/zsh/aliases.zsh

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 83da0f6..2619fed 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -41,7 +41,7 @@ else
 fi
 sfiles+=(
 		~/.config/zsh/functions.zsh
-		~/.config/zsh/aliases.zsh
+		~/.config/zsh/aliases.sh
 )
 for f in "${sfiles[@]}"; do
     test -f "$f" && source "$f"
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
new file mode 100644
index 0000000..3bfd298
--- /dev/null
+++ b/config/essentials/zsh/aliases.sh
@@ -0,0 +1,434 @@
+#!/bin/zsh
+# s/alias \([^-]\)/alias -g \1
+
+# Zsh specific aliases
+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 /'
+	alias go/s='go /srv'
+	alias ogo/='ogo /'
+	alias ogo/s='ogo /srv'
+
+	if [ "$WAYLAND_DISPLAY" ]
+	then
+		alias -g clipp='wl-copy -n'
+		alias -g clipo='wl-paste -n'
+	else
+		if which devour > /dev/null 2>&1  
+		then
+			alias mpv='devour mpv'
+			alias zathura='devour zathura'
+		fi
+		alias -g clipp='xclip -selection clipboard -r'
+		alias -g clipo='xclip -o -selection clipboard -r'
+	fi
+	alias clipic='clipo > /tmp/pic.png'
+
+	alias -g '...'='../..'
+	alias -g '....'='../../..'
+	alias -g bg='&; disown'
+	alias -g hl='--help |& less -r'
+fi
+
+
+if grep -qi "debian\|ubuntu" /etc/os-release 2> /dev/null
+then
+	alias aptup='apt update && apt upgrade -y'
+fi
+
+# Programs
+alias vi='nvim'
+alias nb='newsboat'
+alias sr='surfraw'
+alias ccu='calcurse'
+alias pf='profanity'
+
+alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml'
+
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    # alias ls='ls -h --color --group-directories-first'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+    alias ip='ip -color=auto'
+    alias ipa='ip -br a'
+fi
+
+alias l='ls -l'
+alias l1='ls -1'
+alias ll='ls -la'
+alias la='ls -aF'
+alias lst='ls --tree'
+alias lst1='ls --tree -L1'
+alias lst2='ls --tree -L2'
+alias lst3='ls --tree -L3'
+alias ls.='ls -dl .*'
+which exa >/dev/null 2>&1 &&
+	alias ls='exa --sort extension --group-directories-first' ||
+	alias ls='ls --color --group-directories-first --sort=extension'
+
+# pacman aliases
+alias pac='pacman'
+alias pacsi='pac -Si'
+alias pacs='pac -Ss'
+alias pacq='pac -Q'
+alias pacql='pac -Ql'
+alias pacqs='pac -Qs'
+alias paci='pac -Qi'
+
+alias pacup='dopac -Syu'
+alias dopac='doas pacman'
+alias orpac='pacman -Qtdq | dopac -Rns - 2> /dev/null || echo "No orphans."'
+alias dopacs='dopac -S'
+alias dopacc='dopac -Sc'
+alias doprm='dopac -Rns'
+
+alias mpkg='makepkg -si'
+
+which pikaur > /dev/null 2>&1 &&
+	alias yay='pikaur'
+alias yup='yay -Syu'
+alias ysi='yay -Si'
+alias yss='yay -Ss'
+alias yqs='yay -Qs'
+alias yql='yay -Ql'
+alias yays='yay -S'
+alias yrm='yay -Rns'
+
+alias pkb='pkgfile -b'
+
+# transmission
+alias trr='transmission-remote debuc.com'
+alias trls='transmission-remote debuc.com -t all -l'
+alias tradd='transmission-remote debuc.com -a'
+alias trclipo='transmission-remote debuc.com -a "$(clipo)"'
+
+alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg'
+
+# vim
+alias scr='nvim +"setlocal buftype=nofile bufhidden=hide noswapfile filetype=txt" scratch'
+alias vimp="vim '+PlugInstall'"
+alias nvimp="nvim '+PackerSync'"
+alias nvg='git status > /dev/null 2>&1 && nvim "+Git"'
+alias nvn='nvim "+Telekasten panel"'
+ 
+alias xrandr-rpgmaker='xrandr --auto --output VGA-1 --mode 1024x768 --left-of HDMI-1 && ~/.fehbg'
+alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HDMI-1 --output HDMI-1 --mode 1920x1080 && ~/.fehbg'
+ 
+alias d='du -d 0 -h'
+alias dud='du .* * -d 0 -h 2>/dev/null | sort -h'
+alias df='df -h'
+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 ss4='ss -tln4p | cut -f1 -d,'
+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 vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i'
+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'
+alias capture='echo "Y" | wf-recorder -o "$(hyprctl -j monitors | jq -r '\''.[].name'\'' | fzf)" --codec=vp8_vaapi --device=/dev/dri/renderD128 -f output.webm -D'
+alias qrclipo='qrencode -s 16 "$(clipo)" -o - | imv -w "imv - $(clipo)" -'
+alias airpods='bluetoothctl connect 60:93:16:24:00:10'
+alias hotpsot='nmcli dev wifi hotspot ifname wlan0 ssid wiefie password "peepeepoopoo"'
+alias wtip='wt ip -c -brief addr'
+alias fusephone='sshfs myphone: /media/phone'
+alias ttyper='ttyper -l english1000 -w 100'
+
+alias wgup='doas wg-quick up wg0'
+alias wgdown='doas wg-quick down wg0'
+
+# NPM
+alias npi="npm init --yes"
+
+# Python
+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 smcu='smc --user'
+alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
+alias rh='rehash'
+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 tpid='tail -f /dev/null --pid'
+
+alias vbm='vboxmanage'
+alias vbls='vbm list vms'
+alias vblsr='vbm list runningvms'
+alias vb='vbm startvm'
+
+# quick config
+alias ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc'
+alias eza='$EDITOR ${ZDOTDIR}/aliases.zsh'
+alias ezf='$EDITOR ${ZDOTDIR}/functions.zsh'
+alias eto='$EDITOR ~/sync/TODO'
+alias edw='$EDITOR ~/src/dwm/config.def.h'
+alias edm='$EDITOR ~/src/dmenu/config.def.h'
+alias ehst='$EDITOR $ZDOTDIR/histfile'
+alias ezh=' $EDITOR $HISTFILE'
+alias est='$EDITOR ~/src/st/config.def.h'
+alias esl='$EDITOR ~/src/slock/config.def.h'
+alias esls='$EDITOR ~/src/slstatus/config.def.h'
+alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
+alias cfd='$EDITOR config.def.h'
+# quick cd
+alias cda='cd $HOME/docs/android/projects'
+alias cds='cd $HOME/src/'
+alias cdpw='cd ${PASSWORD_STORE_DIR:-$HOME/.password-store}'
+alias cdsw='cd $HOME/src/WheelAdvisor'
+alias cdw='cd $HOME/src/dwm'
+alias cddm='cd $HOME/src/dmenu'
+alias cdslo='cd $HOME/src/slock'
+alias cdsl='cd $HOME/src/slstatus'
+alias cdst='cd $HOME/src/st'
+alias cdsta='cd $HOME/src/stable-diffusion-webui'
+alias cdl='cd $HOME/dl'
+alias cdo='cd $HOME/src/dotfiles'
+alias cdoc='cd $HOME/docs'
+alias cdi='cd $HOME/src/installdrier'
+alias cdia='cd $HOME/src/installdrier/arch'
+alias cdib='cd $HOME/src/installdrier/deb'
+alias cdm='cd $HOME/music'
+alias cdd='cd $HOME/dl'
+alias cdp='cd $HOME/pics'
+alias cdrs='cd /srv/'
+alias cdng='cd /etc/nginx'
+alias czo='cd $HOME/zot/'
+
+# fzf aliases
+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"
+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 fzps='fzf --print0 | xargs -0I{}'
+
+alias dcb='docker build'
+alias dcbt='docker build -t'
+alias dce='docker exec'
+alias dcet='docker exec -it'
+alias dcmp='docker compose up -d'
+
+# debuc aliases
+alias dbadd='ssh db dladd "'\''$(clipo)'\''"'
+alias dbcons='ssh -t db dlcons'
+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'
+# oh-my-zsh git aliases
+alias g='git'
+alias ga='git add'
+alias gaa='git add --all'
+alias gapa='git add --patch'
+alias gau='git add --update'
+alias gav='git add --verbose'
+alias gap='git apply'
+alias gapt='git apply --3way'
+alias gb='git branch'
+alias gba='git branch --all'
+alias gbd='git branch --delete'
+alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null'
+alias gbD='git branch --delete --force'
+alias gbg='git branch -vv | grep ": gone\]"'
+alias gbgd='local res=$(gbg | awk '"'"'{print $1}'"'"') && [[ $res ]] && echo $res | xargs git branch -d'
+alias gbgD='local res=$(gbg | awk '"'"'{print $1}'"'"') && [[ $res ]] && echo $res | xargs git branch -D'
+alias gbl='git blame -b -w'
+alias gbnm='git branch --no-merged'
+alias gbr='git branch --remote'
+alias gbs='git bisect'
+alias gbsb='git bisect bad'
+alias gbsg='git bisect good'
+alias gbsr='git bisect reset'
+alias gbss='git bisect start'
+alias gc='git commit --verbose'
+alias gc!='git commit --verbose --amend'
+alias gcn!='git commit --verbose --no-edit --amend'
+alias gca='git commit --verbose --all'
+alias gca!='git commit --verbose --all --amend'
+alias gcan!='git commit --verbose --all --no-edit --amend'
+alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
+alias gcam='git commit --all --message'
+alias gcsm='git commit --signoff --message'
+alias gcas='git commit --all --signoff'
+alias gcasm='git commit --all --signoff --message'
+alias gcb='git checkout -b'
+alias gcf='git config --list'
+alias gcl='git clone'
+alias gclr='git clone --recurse-submodules'
+alias gc1='git clone --depth 1'
+alias gclean='git clean --interactive -d'
+alias gpristine='git reset --hard && git clean --force -dfx'
+alias grsf='git reset --soft HEAD~'
+alias gcm='git checkout $(git_main_branch)'
+alias gcd='git checkout $(git_develop_branch)'
+alias gcmsg='git commit --message'
+alias gco='git checkout'
+alias gcor='git checkout --recurse-submodules'
+alias gcount='git shortlog --summary --numbered'
+alias gcp='git cherry-pick'
+alias gcpa='git cherry-pick --abort'
+alias gcpc='git cherry-pick --continue'
+alias gcs='git commit --gpg-sign'
+alias gcss='git commit --gpg-sign --signoff'
+alias gcssm='git commit --gpg-sign --signoff --message'
+alias gd='git diff'
+alias gdca='git diff --cached'
+alias gdcw='git diff --cached --word-diff'
+alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
+alias gds='git diff --staged'
+alias gdt='git diff-tree --no-commit-id --name-only -r'
+alias gdup='git diff @{upstream}'
+alias gdw='git diff --word-diff'
+alias gdl='git diff HEAD^ HEAD'
+alias gf='git fetch'
+alias gfo='git fetch origin'
+alias gfg='git ls-files | grep'
+alias gg='git gui citool'
+alias gga='git gui citool --amend'
+alias ggpur='ggu'
+alias ggpull='git pull origin "$(git_current_branch)"'
+alias ggpush='git push origin "$(git_current_branch)"'
+alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
+alias gpsup='git push --set-upstream origin $(git_current_branch)'
+alias ghh='git help'
+alias gignore='git update-index --assume-unchanged'
+alias gignored='git ls-files -v | grep "^[[:lower:]]"'
+alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
+alias gk='\gitk --all --branches &!'
+alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
+alias gl='git pull'
+alias glg='git log --stat'
+alias glgp='git log --stat --patch'
+alias glgg='git log --graph'
+alias glgga='git log --graph --decorate --all'
+alias glgm='git log --graph --max-count=10'
+alias glo='git log --oneline --decorate'
+alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'"
+alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat"
+alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
+alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
+alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all"
+alias glog='git log --oneline --decorate --graph'
+alias gloga='git log --oneline --decorate --graph --all'
+alias glp="_git_log_prettily"
+alias gm='git merge'
+alias gmom='git merge origin/$(git_main_branch)'
+alias gmtl='git mergetool --no-prompt'
+alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
+alias gmum='git merge upstream/$(git_main_branch)'
+alias gma='git merge --abort'
+alias gp='git push'
+alias gpd='git push --dry-run'
+alias gpf!='git push --force'
+alias gpoat='git push origin --all && git push origin --tags'
+alias gpod='git push origin --delete'
+alias gpr='git pull --rebase'
+alias gpu='git push upstream'
+alias gpv='git push --verbose'
+alias gr='git remote'
+alias gra='git remote add'
+alias grb='git rebase'
+alias grba='git rebase --abort'
+alias grbc='git rebase --continue'
+alias grbd='git rebase $(git_develop_branch)'
+alias grbi='git rebase --interactive'
+alias grbm='git rebase $(git_main_branch)'
+alias grbom='git rebase origin/$(git_main_branch)'
+alias grbo='git rebase --onto'
+alias grbs='git rebase --skip'
+alias grev='git revert'
+alias grh='git reset'
+alias grhh='git reset --hard'
+alias groh='git reset origin/$(git_current_branch) --hard'
+alias grm='git rm'
+alias grmc='git rm --cached'
+alias grmv='git remote rename'
+alias grrm='git remote remove'
+alias grs='git restore'
+alias grset='git remote set-url'
+alias grss='git restore --source'
+alias grst='git restore --staged'
+alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
+alias gru='git reset --'
+alias grup='git remote update'
+alias grv='git remote --verbose'
+alias gsb='git status --short --branch'
+alias gsd='git svn dcommit'
+alias gsh='git show'
+alias gsi='git submodule init'
+alias gsps='git show --pretty=short --show-signature'
+alias gsr='git svn rebase'
+alias gss='git status --short'
+alias gst='git status'
+alias gstaa='git stash apply'
+alias gstc='git stash clear'
+alias gstd='git stash drop'
+alias gstl='git stash list'
+alias gstp='git stash pop'
+alias gsts='git stash show --text'
+alias gstu='gsta --include-untracked'
+alias gstall='git stash --all'
+alias gsu='git submodule update'
+alias gsw='git switch'
+alias gswc='git switch --create'
+alias gswm='git switch $(git_main_branch)'
+alias gswd='git switch $(git_develop_branch)'
+alias gts='git tag --sign'
+alias gtv='git tag | sort -V'
+alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
+alias gunignore='git update-index --no-assume-unchanged'
+alias gunwip='git log --max-count=1 | grep -q -c "\--wip--" && git reset HEAD~1'
+alias gup='git pull --rebase'
+alias gupv='git pull --rebase --verbose'
+alias gupa='git pull --rebase --autostash'
+alias gupav='git pull --rebase --autostash --verbose'
+alias gupom='git pull --rebase origin $(git_main_branch)'
+alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
+alias glum='git pull upstream $(git_main_branch)'
+alias gluc='git pull upstream $(git_current_branch)'
+alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
+alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
+alias gwt='git worktree'
+alias gwta='git worktree add'
+alias gwtls='git worktree list'
+alias gwtmv='git worktree move'
+alias gwtrm='git worktree remove'
+alias gam='git am'
+alias gamc='git am --continue'
+alias gams='git am --skip'
+alias gama='git am --abort'
+alias gamscp='git am --show-current-patch'
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
deleted file mode 100644
index 94d27e7..0000000
--- a/config/essentials/zsh/aliases.zsh
+++ /dev/null
@@ -1,435 +0,0 @@
-#!/bin/zsh
-# s/alias \([^-]\)/alias -g \1
-
-if grep -qi "debian\|ubuntu" /etc/os-release 2> /dev/null
-then
-	alias aptup='apt update && apt upgrade -y'
-fi
-
-if [ "$WAYLAND_DISPLAY" ]
-then
-	alias -g clipp='wl-copy -n'
-	alias -g clipo='wl-paste -n'
-else
-	if which devour > /dev/null 2>&1  
-	then
-		alias mpv='devour mpv'
-		alias zathura='devour zathura'
-	fi
-	alias -g clipp='xclip -selection clipboard -r'
-	alias -g clipo='xclip -o -selection clipboard -r'
-fi
-alias clipic='clipo > /tmp/pic.png'
-
-# Programs
-alias vi='nvim'
-alias nb='newsboat'
-alias sr='surfraw'
-alias ccu='calcurse'
-alias pf='profanity'
-
-alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml'
-
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    # alias ls='ls -h --color --group-directories-first'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-    alias ip='ip -color=auto'
-    alias ipa='ip -br a'
-fi
-
-alias l='ls -l'
-alias l1='ls -1'
-alias ll='ls -la'
-alias la='ls -aF'
-alias lst='ls --tree'
-alias lst1='ls --tree -L1'
-alias lst2='ls --tree -L2'
-alias lst3='ls --tree -L3'
-alias ls.='ls -dl .*'
-which exa >/dev/null 2>&1 &&
-	alias ls='exa --sort extension --group-directories-first' ||
-	alias ls='ls --color --group-directories-first --sort=extension'
-
-# pacman aliases
-alias pac='pacman'
-alias pacsi='pac -Si'
-alias pacs='pac -Ss'
-alias pacq='pac -Q'
-alias pacql='pac -Ql'
-alias pacqs='pac -Qs'
-alias paci='pac -Qi'
-
-alias pacup='dopac -Syu'
-alias dopac='doas pacman'
-alias orpac='pacman -Qtdq | dopac -Rns - 2> /dev/null || echo "No orphans."'
-alias dopacs='dopac -S'
-alias dopacc='dopac -Sc'
-alias doprm='dopac -Rns'
-
-alias mpkg='makepkg -si'
-
-which pikaur > /dev/null 2>&1 &&
-	alias yay='pikaur'
-alias yup='yay -Syu'
-alias ysi='yay -Si'
-alias yss='yay -Ss'
-alias yqs='yay -Qs'
-alias yql='yay -Ql'
-alias yays='yay -S'
-alias yrm='yay -Rns'
-
-alias pkb='pkgfile -b'
-
-# transmission
-alias trr='transmission-remote debuc.com'
-alias trls='transmission-remote debuc.com -t all -l'
-alias tradd='transmission-remote debuc.com -a'
-alias trclipo='transmission-remote debuc.com -a "$(clipo)"'
-
-alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg'
-
-# vim
-alias scr='nvim +"setlocal buftype=nofile bufhidden=hide noswapfile filetype=txt" scratch'
-alias vimp="vim '+PlugInstall'"
-alias nvimp="nvim '+PackerSync'"
-alias nvg='git status > /dev/null 2>&1 && nvim "+Git"'
-alias nvn='nvim "+Telekasten panel"'
- 
-alias xrandr-rpgmaker='xrandr --auto --output VGA-1 --mode 1024x768 --left-of HDMI-1 && ~/.fehbg'
-alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HDMI-1 --output HDMI-1 --mode 1920x1080 && ~/.fehbg'
- 
-alias d='du -d 0 -h'
-alias dud='du .* * -d 0 -h 2>/dev/null | sort -h'
-alias df='df -h'
-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 ss4='ss -tln4p | cut -f1 -d,'
-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 vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i'
-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'
-alias capture='echo "Y" | wf-recorder -o "$(hyprctl -j monitors | jq -r '\''.[].name'\'' | fzf)" --codec=vp8_vaapi --device=/dev/dri/renderD128 -f output.webm -D'
-alias qrclipo='qrencode -s 16 "$(clipo)" -o - | imv -w "imv - $(clipo)" -'
-alias airpods='bluetoothctl connect 60:93:16:24:00:10'
-alias hotpsot='nmcli dev wifi hotspot ifname wlan0 ssid wiefie password "peepeepoopoo"'
-alias wtip='wt ip -c -brief addr'
-alias muttmail='echo -n "email set: " >&2
-ls $HOME/.config/mutt/configs |
-fzf |
-tee /dev/stderr |
-xargs -I {} ln -sf "$HOME/.config/mutt/configs/{}" $HOME/.config/mutt/muttrc'
-alias fusephone='sshfs myphone: /media/phone'
-alias ttyper='ttyper -l english1000 -w 100'
-
-alias wgup='doas wg-quick up wg0'
-alias wgdown='doas wg-quick down wg0'
-
-# NPM
-alias npi="npm init --yes"
-
-# Python
-alias penv='python3 -m venv env'
-alias phttp='python3 -m http.server'
-alias pipreq='pip install -r requirements.txt'
-
-alias -g '...'='../..'
-alias -g '....'='../../..'
-alias -g bg='&; disown'
-alias cx='chmod +x'
-alias ch='chown ${USER}:${USER} -R'
-alias -g hl='--help |& less -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 smcu='smc --user'
-alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
-alias rh='rehash'
-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 tpid='tail -f /dev/null --pid'
-
-alias vbm='vboxmanage'
-alias vbls='vbm list vms'
-alias vblsr='vbm list runningvms'
-alias vb='vbm startvm'
-
-# quick config
-alias ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc'
-alias eza='$EDITOR ${ZDOTDIR}/aliases.zsh'
-alias ezf='$EDITOR ${ZDOTDIR}/functions.zsh'
-alias eto='$EDITOR ~/sync/TODO'
-alias edw='$EDITOR ~/src/dwm/config.def.h'
-alias edm='$EDITOR ~/src/dmenu/config.def.h'
-alias ehst='$EDITOR $ZDOTDIR/histfile'
-alias ezh=' $EDITOR $HISTFILE'
-alias est='$EDITOR ~/src/st/config.def.h'
-alias esl='$EDITOR ~/src/slock/config.def.h'
-alias esls='$EDITOR ~/src/slstatus/config.def.h'
-alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
-alias cfd='$EDITOR config.def.h'
-# quick cd
-alias cda='cd $HOME/docs/android/projects'
-alias cds='cd $HOME/src/'
-alias cdsw='cd $HOME/src/WheelAdvisor'
-alias cdw='cd $HOME/src/dwm'
-alias cddm='cd $HOME/src/dmenu'
-alias cdslo='cd $HOME/src/slock'
-alias cdsl='cd $HOME/src/slstatus'
-alias cdst='cd $HOME/src/st'
-alias cdsta='cd $HOME/src/stable-diffusion-webui'
-alias cdl='cd $HOME/dl'
-alias cdo='cd $HOME/src/dotfiles'
-alias cdoc='cd $HOME/docs'
-alias cdi='cd $HOME/src/installdrier'
-alias cdia='cd $HOME/src/installdrier/arch'
-alias cdib='cd $HOME/src/installdrier/deb'
-alias cdm='cd $HOME/music'
-alias cdd='cd $HOME/dl'
-alias cdp='cd $HOME/pics'
-alias cdrs='cd /srv/'
-alias cdng='cd /etc/nginx'
-alias czo='cd $HOME/zot/'
-
-# googoo aliases
-alias o.='o .'
-alias go.='go .'
-alias ogo.='ogo .'
-alias o/='o /'
-alias o/s='o /srv'
-alias go/='go /'
-alias go/s='go /srv'
-alias ogo/='ogo /'
-alias ogo/s='ogo /srv'
-
-# fzf aliases
-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"
-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 fzps='fzf --print0 | xargs -0I{}'
-
-alias -s zip='unzip -l'
-alias -s tar='tar tf'
-
-alias dcb='docker build'
-alias dcbt='docker build -t'
-alias dce='docker exec'
-alias dcet='docker exec -it'
-alias dcmp='docker compose up -d'
-
-# debuc aliases
-alias dbadd='ssh db dladd "'\''$(clipo)'\''"'
-alias dbcons='ssh -t db dlcons'
-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'
-# oh-my-zsh git aliases
-alias g='git'
-alias ga='git add'
-alias gaa='git add --all'
-alias gapa='git add --patch'
-alias gau='git add --update'
-alias gav='git add --verbose'
-alias gap='git apply'
-alias gapt='git apply --3way'
-alias gb='git branch'
-alias gba='git branch --all'
-alias gbd='git branch --delete'
-alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null'
-alias gbD='git branch --delete --force'
-alias gbg='git branch -vv | grep ": gone\]"'
-alias gbgd='local res=$(gbg | awk '"'"'{print $1}'"'"') && [[ $res ]] && echo $res | xargs git branch -d'
-alias gbgD='local res=$(gbg | awk '"'"'{print $1}'"'"') && [[ $res ]] && echo $res | xargs git branch -D'
-alias gbl='git blame -b -w'
-alias gbnm='git branch --no-merged'
-alias gbr='git branch --remote'
-alias gbs='git bisect'
-alias gbsb='git bisect bad'
-alias gbsg='git bisect good'
-alias gbsr='git bisect reset'
-alias gbss='git bisect start'
-alias gc='git commit --verbose'
-alias gc!='git commit --verbose --amend'
-alias gcn!='git commit --verbose --no-edit --amend'
-alias gca='git commit --verbose --all'
-alias gca!='git commit --verbose --all --amend'
-alias gcan!='git commit --verbose --all --no-edit --amend'
-alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
-alias gcam='git commit --all --message'
-alias gcsm='git commit --signoff --message'
-alias gcas='git commit --all --signoff'
-alias gcasm='git commit --all --signoff --message'
-alias gcb='git checkout -b'
-alias gcf='git config --list'
-alias gcl='git clone'
-alias gclr='git clone --recurse-submodules'
-alias gc1='git clone --depth 1'
-alias gclean='git clean --interactive -d'
-alias gpristine='git reset --hard && git clean --force -dfx'
-alias grsf='git reset --soft HEAD~'
-alias gcm='git checkout $(git_main_branch)'
-alias gcd='git checkout $(git_develop_branch)'
-alias gcmsg='git commit --message'
-alias gco='git checkout'
-alias gcor='git checkout --recurse-submodules'
-alias gcount='git shortlog --summary --numbered'
-alias gcp='git cherry-pick'
-alias gcpa='git cherry-pick --abort'
-alias gcpc='git cherry-pick --continue'
-alias gcs='git commit --gpg-sign'
-alias gcss='git commit --gpg-sign --signoff'
-alias gcssm='git commit --gpg-sign --signoff --message'
-alias gd='git diff'
-alias gdca='git diff --cached'
-alias gdcw='git diff --cached --word-diff'
-alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
-alias gds='git diff --staged'
-alias gdt='git diff-tree --no-commit-id --name-only -r'
-alias gdup='git diff @{upstream}'
-alias gdw='git diff --word-diff'
-alias gdl='git diff HEAD^ HEAD'
-alias gf='git fetch'
-alias gfo='git fetch origin'
-alias gfg='git ls-files | grep'
-alias gg='git gui citool'
-alias gga='git gui citool --amend'
-alias ggpur='ggu'
-alias ggpull='git pull origin "$(git_current_branch)"'
-alias ggpush='git push origin "$(git_current_branch)"'
-alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
-alias gpsup='git push --set-upstream origin $(git_current_branch)'
-alias ghh='git help'
-alias gignore='git update-index --assume-unchanged'
-alias gignored='git ls-files -v | grep "^[[:lower:]]"'
-alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
-alias gk='\gitk --all --branches &!'
-alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
-alias gl='git pull'
-alias glg='git log --stat'
-alias glgp='git log --stat --patch'
-alias glgg='git log --graph'
-alias glgga='git log --graph --decorate --all'
-alias glgm='git log --graph --max-count=10'
-alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'"
-alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat"
-alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
-alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all"
-alias glog='git log --oneline --decorate --graph'
-alias gloga='git log --oneline --decorate --graph --all'
-alias glp="_git_log_prettily"
-alias gm='git merge'
-alias gmom='git merge origin/$(git_main_branch)'
-alias gmtl='git mergetool --no-prompt'
-alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
-alias gmum='git merge upstream/$(git_main_branch)'
-alias gma='git merge --abort'
-alias gp='git push'
-alias gpd='git push --dry-run'
-alias gpf!='git push --force'
-alias gpoat='git push origin --all && git push origin --tags'
-alias gpod='git push origin --delete'
-alias gpr='git pull --rebase'
-alias gpu='git push upstream'
-alias gpv='git push --verbose'
-alias gr='git remote'
-alias gra='git remote add'
-alias grb='git rebase'
-alias grba='git rebase --abort'
-alias grbc='git rebase --continue'
-alias grbd='git rebase $(git_develop_branch)'
-alias grbi='git rebase --interactive'
-alias grbm='git rebase $(git_main_branch)'
-alias grbom='git rebase origin/$(git_main_branch)'
-alias grbo='git rebase --onto'
-alias grbs='git rebase --skip'
-alias grev='git revert'
-alias grh='git reset'
-alias grhh='git reset --hard'
-alias groh='git reset origin/$(git_current_branch) --hard'
-alias grm='git rm'
-alias grmc='git rm --cached'
-alias grmv='git remote rename'
-alias grrm='git remote remove'
-alias grs='git restore'
-alias grset='git remote set-url'
-alias grss='git restore --source'
-alias grst='git restore --staged'
-alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
-alias gru='git reset --'
-alias grup='git remote update'
-alias grv='git remote --verbose'
-alias gsb='git status --short --branch'
-alias gsd='git svn dcommit'
-alias gsh='git show'
-alias gsi='git submodule init'
-alias gsps='git show --pretty=short --show-signature'
-alias gsr='git svn rebase'
-alias gss='git status --short'
-alias gst='git status'
-alias gstaa='git stash apply'
-alias gstc='git stash clear'
-alias gstd='git stash drop'
-alias gstl='git stash list'
-alias gstp='git stash pop'
-alias gsts='git stash show --text'
-alias gstu='gsta --include-untracked'
-alias gstall='git stash --all'
-alias gsu='git submodule update'
-alias gsw='git switch'
-alias gswc='git switch --create'
-alias gswm='git switch $(git_main_branch)'
-alias gswd='git switch $(git_develop_branch)'
-alias gts='git tag --sign'
-alias gtv='git tag | sort -V'
-alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
-alias gunignore='git update-index --no-assume-unchanged'
-alias gunwip='git log --max-count=1 | grep -q -c "\--wip--" && git reset HEAD~1'
-alias gup='git pull --rebase'
-alias gupv='git pull --rebase --verbose'
-alias gupa='git pull --rebase --autostash'
-alias gupav='git pull --rebase --autostash --verbose'
-alias gupom='git pull --rebase origin $(git_main_branch)'
-alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
-alias glum='git pull upstream $(git_main_branch)'
-alias gluc='git pull upstream $(git_current_branch)'
-alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
-alias gwt='git worktree'
-alias gwta='git worktree add'
-alias gwtls='git worktree list'
-alias gwtmv='git worktree move'
-alias gwtrm='git worktree remove'
-alias gam='git am'
-alias gamc='git am --continue'
-alias gams='git am --skip'
-alias gama='git am --abort'
-alias gamscp='git am --show-current-patch'
-- 
cgit v1.2.3


From 9049a073ee9a9644e27f4dbb52a4f591794258d7 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 21 Jul 2023 12:46:40 +0200
Subject: updated aliases

---
 config/essentials/zsh/aliases.sh    | 31 ++++++++++++++++---------------
 config/essentials/zsh/functions.zsh | 13 ++++++++++++-
 2 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index 3bfd298..a71ece1 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -43,7 +43,6 @@ then
 fi
 
 # Programs
-alias vi='nvim'
 alias nb='newsboat'
 alias sr='surfraw'
 alias ccu='calcurse'
@@ -191,7 +190,7 @@ alias vb='vbm startvm'
 
 # quick config
 alias ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc'
-alias eza='$EDITOR ${ZDOTDIR}/aliases.zsh'
+alias eza='$EDITOR ${ZDOTDIR}/aliases.sh'
 alias ezf='$EDITOR ${ZDOTDIR}/functions.zsh'
 alias eto='$EDITOR ~/sync/TODO'
 alias edw='$EDITOR ~/src/dwm/config.def.h'
@@ -205,26 +204,28 @@ alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
 alias cfd='$EDITOR config.def.h'
 # quick cd
 alias cda='cd $HOME/docs/android/projects'
-alias cds='cd $HOME/src/'
-alias cdpw='cd ${PASSWORD_STORE_DIR:-$HOME/.password-store}'
-alias cdsw='cd $HOME/src/WheelAdvisor'
-alias cdw='cd $HOME/src/dwm'
+alias cdd='cd $HOME/dl'
 alias cddm='cd $HOME/src/dmenu'
-alias cdslo='cd $HOME/src/slock'
-alias cdsl='cd $HOME/src/slstatus'
-alias cdst='cd $HOME/src/st'
-alias cdsta='cd $HOME/src/stable-diffusion-webui'
-alias cdl='cd $HOME/dl'
-alias cdo='cd $HOME/src/dotfiles'
-alias cdoc='cd $HOME/docs'
 alias cdi='cd $HOME/src/installdrier'
 alias cdia='cd $HOME/src/installdrier/arch'
 alias cdib='cd $HOME/src/installdrier/deb'
+alias cdl='cd $HOME/dl'
 alias cdm='cd $HOME/music'
-alias cdd='cd $HOME/dl'
+alias cdng='cd /etc/nginx'
+alias cdo='cd $HOME/src/dotfiles'
+alias cdoc='cd $HOME/docs'
 alias cdp='cd $HOME/pics'
+alias cdpa='cd $HOME/pics/ai-outputs/'
+alias cdpw='cd ${PASSWORD_STORE_DIR:-$HOME/.password-store}'
 alias cdrs='cd /srv/'
-alias cdng='cd /etc/nginx'
+alias cds='cd $HOME/src/'
+alias cdsc='cd $HOME/src/comfyui/'
+alias cdsl='cd $HOME/src/slstatus'
+alias cdslo='cd $HOME/src/slock'
+alias cdst='cd $HOME/src/st'
+alias cdsta='cd $HOME/src/stable-diffusion-webui'
+alias cdsw='cd $HOME/src/WheelAdvisor'
+alias cdw='cd $HOME/src/dwm'
 alias czo='cd $HOME/zot/'
 
 # fzf aliases
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index bfaea9d..ada523d 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -2,7 +2,7 @@
 
 die ()
 {
-	echo "$1" >&2
+	echo "$@" >&2
 }
 
 awnk() {
@@ -267,3 +267,14 @@ trcp ()
 {
 	scp "$1" db:/media/basilisk/downloads/transmission/torrents/
 }
+
+muttmail ()
+{
+	die -n "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]'
+	read && mutt
+}
-- 
cgit v1.2.3


From fd7e4846d8233aaa992bfab90b7a45b67df59831 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 26 Jul 2023 22:50:43 +0200
Subject: edited 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 a71ece1..a81f3b1 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -135,7 +135,7 @@ alias fif='find . -type "f" | grep'
 alias fid='find . -type "d" | grep'
 alias sxt='sxiv -t'
 alias wgsh='wget --quiet --show-progress'
-alias ss4='ss -tln4p | cut -f1 -d,'
+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'
 
-- 
cgit v1.2.3


From daffc673ca054abd9f2f927c651d782499cf185e Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 26 Jul 2023 22:52:22 +0200
Subject: use startw script for hyprland

---
 bin/guiscripts/startw        | 5 +++++
 config/essentials/zsh/.zshrc | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100755 bin/guiscripts/startw

(limited to 'config/essentials/zsh')

diff --git a/bin/guiscripts/startw b/bin/guiscripts/startw
new file mode 100755
index 0000000..768f401
--- /dev/null
+++ b/bin/guiscripts/startw
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)"
+
+Hyprland
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 2619fed..195b64c 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -2,13 +2,10 @@
 
 if [[ "/dev/tty1" = "$TTY" || "/dev/tty2" = "$TTY" ]] && [[ "$(id -u)" -ne 0 ]]
 then
-	clear
-	eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)"
-	eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --noask --eval --quiet --agents ssh 2> /dev/null)"
 	clear
 	if [ "/dev/tty1" = "$TTY" ]
 	then
-		Hyprland > /dev/null 2>&1
+		startw > /dev/null 2>&1
 	else
 		startx > /dev/null 2>&1
 	fi
-- 
cgit v1.2.3


From d92788670e49842e322518930ddb60794b01ec60 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Fri, 28 Jul 2023 14:39:04 +0200
Subject: sorted cd aliases

---
 config/essentials/zsh/aliases.sh | 48 ++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index a81f3b1..07a17e2 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -193,40 +193,44 @@ alias ez='$EDITOR ${ZDOTDIR:-$HOME}/.zshrc'
 alias eza='$EDITOR ${ZDOTDIR}/aliases.sh'
 alias ezf='$EDITOR ${ZDOTDIR}/functions.zsh'
 alias eto='$EDITOR ~/sync/TODO'
-alias edw='$EDITOR ~/src/dwm/config.def.h'
-alias edm='$EDITOR ~/src/dmenu/config.def.h'
+alias edw='$EDITOR ~/proj/suckless/dwm/config.def.h'
+alias edm='$EDITOR ~/proj/suckless/dmenu/config.def.h'
 alias ehst='$EDITOR $ZDOTDIR/histfile'
 alias ezh=' $EDITOR $HISTFILE'
-alias est='$EDITOR ~/src/st/config.def.h'
-alias esl='$EDITOR ~/src/slock/config.def.h'
-alias esls='$EDITOR ~/src/slstatus/config.def.h'
+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 cfd='$EDITOR config.def.h'
 # quick cd
-alias cda='cd $HOME/docs/android/projects'
-alias cdd='cd $HOME/dl'
-alias cddm='cd $HOME/src/dmenu'
-alias cdi='cd $HOME/src/installdrier'
-alias cdia='cd $HOME/src/installdrier/arch'
-alias cdib='cd $HOME/src/installdrier/deb'
+# !sort -t "'" -k 2
 alias cdl='cd $HOME/dl'
-alias cdm='cd $HOME/music'
-alias cdng='cd /etc/nginx'
-alias cdo='cd $HOME/src/dotfiles'
 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 cdpw='cd ${PASSWORD_STORE_DIR:-$HOME/.password-store}'
-alias cdrs='cd /srv/'
+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 cdsl='cd $HOME/src/slstatus'
-alias cdslo='cd $HOME/src/slock'
-alias cdst='cd $HOME/src/st'
-alias cdsta='cd $HOME/src/stable-diffusion-webui'
-alias cdsw='cd $HOME/src/WheelAdvisor'
-alias cdw='cd $HOME/src/dwm'
+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 cdng='cd /etc/nginx'
+alias cdrs='cd /srv/'
 
 # fzf aliases
 alias fzps='ps aux | tail +2 | fzf | tee /dev/stderr | awk '\''{print $2}'\'' | clipp'
-- 
cgit v1.2.3


From 6a0f7b5bca424d0c3a93239e2aacb130ddad27fc Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 29 Jul 2023 01:30:05 +0200
Subject: cleaned up is a file command

---
 config/essentials/zsh/.zshrc | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 195b64c..58974ba 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -64,17 +64,14 @@ bindkey "^['" quote-line
 
 isTextFile()
 {
-	if [ ! -f "$1" ]
-	then
+	[ -f "$1" ] &&
+		# will execute the file, I'd rather not have an error message
+		[ ${1::2} != "./" ] &&
+		[ ${1::1} != "/" ] &&
+		! type "$1" > /dev/null &&
+		# is text file?
+		file -b --mime-type "$1" | grep -q "^text/" ||
 		return 1
-	fi
-
-	file_type=$(file -b --mime-type "$1")
-	if [[ "$file_type" == text/* ]]
-	then
-		return
-	fi
-	return 1
 }
 
 # rehash hook
@@ -110,17 +107,13 @@ function osc7 {
 }
 add-zsh-hook -Uz chpwd osc7
 command_not_found_handler () {
-	isTextFile "$1" || 
-		echo "zsh: command not found: $1" >&2
-}
-# open file with file name
-open_file() {
-	if [ ${1:0:2} != "./" ] && isTextFile "$1"
+	if [[ -o interactive ]] && isTextFile "$1"
 	then
 		"$EDITOR" "$1"
+	else
+		echo "zsh: command not found: $1" >&2
 	fi
 }
-add-zsh-hook -Uz preexec open_file
 
 # prompt
 PS1=' %B%(#.%F{1}.%F{13})[%n%b%f@%B%F{6}%m]%b%f %3~ '
-- 
cgit v1.2.3


From ff7417c9ce835265b889319a8e75ee2ae38eab1d Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 29 Jul 2023 11:46:03 +0200
Subject: added 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 07a17e2..1d742a9 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -135,6 +135,7 @@ 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'
-- 
cgit v1.2.3


From 1460eae0d754818dffdaadb744571cbfce1a8378 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 29 Jul 2023 11:46:22 +0200
Subject: use script instead of alias

---
 bin/common/cx                    | 2 ++
 config/essentials/zsh/aliases.sh | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100755 bin/common/cx

(limited to 'config/essentials/zsh')

diff --git a/bin/common/cx b/bin/common/cx
new file mode 100755
index 0000000..88fb817
--- /dev/null
+++ b/bin/common/cx
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -x "$1" ] && chmod -x "$1" || chmod +x "$1"
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index 1d742a9..53c8da0 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -167,7 +167,6 @@ 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'
-- 
cgit v1.2.3


From bc78ab4052dea77dba0884ec3ed52b35e7046b66 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 29 Jul 2023 11:49:30 +0200
Subject: added alias and changed sort macro

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

(limited to 'config/essentials/zsh')

diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index 53c8da0..7926c17 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -202,8 +202,7 @@ 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 cfd='$EDITOR config.def.h'
-# quick cd
-# !sort -t "'" -k 2
+# /# 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'
@@ -212,6 +211,7 @@ 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'
-- 
cgit v1.2.3


From f5b7a1a7cd4052b37dfd576d5ca5864a2b969e09 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 29 Jul 2023 11:51:18 +0200
Subject: added /usr/lib/os-release

---
 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 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
-- 
cgit v1.2.3


From e7cc98818fd10d4acb230df7a9f7a0c6afb74247 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Wed, 2 Aug 2023 10:44:32 +0200
Subject: added resize function

---
 config/essentials/zsh/functions.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config/essentials/zsh')

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}"
+}
-- 
cgit v1.2.3