.config/zsh/.zshrc

@@ -23,7 +23,6 @@ autoload -U select-word-style
 select-word-style b
 
 # options
-setopt extendedglob
 setopt auto_pushd
 
 # keybinds
@@ -58,7 +57,10 @@ alias lsd='/usr/bin/ls'
 alias l="ls -lh"
 alias la="ls -lah"
 alias ll="ls -lh"
+alias ltr='ls -lt'
 alias lt="ls -ltr"
+alias lss='ls -lS'
+alias lsr='ls -lSr'
 
 # set bat as help pager
 alias -g -- --help='--help 2>&1 | bat --language=help --style=plain --theme Monokai\ Extended'
@@ -84,12 +86,12 @@ alias sudo='sudo ' # allow aliases with sudo
 alias rz='exec zsh'
 alias venv='source src_venv'
 alias ex='source src_example'
-alias ap='source src_add_path'
+alias pa='source src_add_path'
 alias info='pinfo'
 alias bat='bat '
 alias img='nsxiv'
 alias xclip='xclip -selection clipboard'
-alias xxclip='head -c-1 | xclip -selection clipboard'
+alias xcp='perl -pe "chomp if eof" | xclip -selection clipboard'
 alias rgf='rg --files | rg'
 alias wt='watch --color -d -cn 0.1 '
 alias .e='set -a && source .env && set +a'
@@ -97,30 +99,37 @@ alias vimu='vim -u /dev/null'
 alias reswap="sudo bash -c 'echo Working...; swapoff /swapfile && sudo swapon /swapfile'"
 alias make="make -j$(nproc)"
 alias py='python3'
+alias q='qalc'
 alias neofetch='fastfetch'
 alias open='xdg-open'
 alias m.='if mount | grep -q "$(pwd)"; then umount -l .; cd .; else mount .; cd .; fi'
 alias rs='stow -R .'
 alias sst='ssh -t'
+alias rdj='rmdir ./*'
+alias qr='qrencode -t ansiutf8'
 
 # function aliases
 bl()     { brightnessctl set "$1"% > /dev/null; }
 nosw()   { alacritty --class 'noswallow' -e "$@"; }; compdef _command nosw
-t()      { taskell "${1:-${HOME}/.taskell.md}"; }
 vims()   { filepath="$(type "$1" | rev | cut -d ' ' -f 1 | rev)"; [ $? -eq 0 ] && vim "${filepath}"; }; compdef _command vims
 tl()     { tree -C "$@" | bat }; compdef _tree tl
-diff()   { /usr/bin/diff --color -u "$@" | delta; }; compdef _files di
+diff()   { /usr/bin/diff --color -u "$@" | delta; }; compdef _files di;
 
 # compdef
 compdef -a '_git; _git-commit' gdc # todo
 compdef '_files -g "*.md"' md
-compdef _ollama ollama
+
+# ansible
+alias ap='ansible-playbook'
+alias ag='ansible-galaxy'
 
 # git aliases
 gl() { git log --decorate "$@" | bat }; compdef '_git; _git-log' gl
-gus() { git branch --set-upstream-to="${1:?}/${2:?}" "${2:?}"}; compdef '_git; _git-push' gus
-gpo() { git push --set-upstream origin "$(git rev-parse --abbrev-ref HEAD)" "$@"}
+gus() { git branch --set-upstream-to="${1:?}/${2:?}" "${2:?}" }; compdef '_git; _git-push' gus
+gpo() { git push --set-upstream origin "$(git rev-parse --abbrev-ref HEAD)" "$@" }
+gru() { git remote get-url "${1-origin}" }; compdef '_gor' gru
 alias ga="git add"
+alias ga.="git add ." # always fatfinger this
 alias gb="git branch"
 alias gc="git commit"
 alias gca="git commit --allow-empty-message --amend --no-edit"
@@ -131,7 +140,8 @@ alias gcls="git clone --depth=1"
 alias gcm="git commit --allow-empty-message -m ''"
 alias gcd='git commit --no-gpg-sign'
 alias gcmd="git commit --allow-empty-message -m '' --no-gpg-sign"
-alias gcn="git clean"
+alias gcn="git clean -nfd"
+alias gcn!="git clean -fd"
 alias gcp="git cherry-pick"
 alias gd="git diff"
 alias gds="gd --staged"
@@ -148,10 +158,12 @@ alias grjs="git rebase --cancel"
 alias grm="git remote"
 alias grs="git restore --staged"
 alias grt="git reset"
+alias grt!="git reset --hard"
 alias gsm='git submodule'
 alias grc='git rm --cached'
 alias gs="git status"
-alias gsc="git switch -c"
+alias gs.='git status .'
+alias gsc="git switch -C"
 alias gsh="git show"
 alias gsj="git stash"
 alias gsp="git stash pop"
@@ -159,6 +171,10 @@ alias gt="git tag"
 alias gus="git fetch --unshallow"
 alias gdj='DELTA_FEATURES="+side-by-side" gd'
 alias gdsj='DELTA_FEATURES="+side-by-side" gds'
+alias gshj='DELTA_FEATURES="+side-by-side" gsh'
+alias gcln='git clean -nxfd'
+alias gcln!='git clean -xfd'
+alias gct="gc -am 'Add files via upload :trollface:'"
 
 # docker aliases
 alias d='docker'
@@ -166,17 +182,22 @@ alias dc='docker compose'
 alias d!='/usr/bin/docker'
 alias dc!='d! compose'
 
-alias dj='dc up -d --force-recreate'
-alias djl='dc up -d --force-recreate && dl'
-alias dl='dc logs -f'
-alias dk='dc down'
-alias dv='d volume'
 alias di='d image'
+alias dj='dc up -d --force-recreate'
+alias djb='dj --build'
+alias djbl='djb && dl'
+alias djl='dj && dl'
+alias dk='dc down'
+alias dl='dc logs -f'
 alias dr='d run --rm -it'
+alias drs='dc restart'
+alias drsl='dc restart && dl'
+alias dv='d volume'
 
 # tmux stuff
 tn() { tmux new-session -s "${1-"$(basename "$(pwd)")"}" }
-alias ta="tmux a -t"
+alias ta='tmux a -t'
+# ta() { tmux a -t "$1" }; compdef '_tmux; _tmux-attach-session' ta
 
 # disable xon control chars
 stty -ixon