.config/zsh/.zshrc

@@ -1,5 +1,7 @@
 . ~/.config/zsh/modes.sh
 
+fpath=($HOME/.local/share/completions $fpath)
+
 # ls colors
 eval "$(dircolors -b)"
 
@@ -51,7 +53,8 @@ PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magent
 
 
 # ls aliases
-alias ls="lsd --color=auto"
+alias ls="/usr/bin/lsd --color=always --icon=always"
+alias lsd='/usr/bin/ls'
 alias l="ls -lh"
 alias la="ls -lah"
 alias ll="ls -lh"
@@ -77,25 +80,28 @@ alias ..............="cd ../../../../../../../../../../../../../"
 alias ...............="cd ../../../../../../../../../../../../../../"
 
 # aliases
-alias rz="exec zsh"
-alias venv="source src_venv"
-alias ex="source src_example"
-alias ap="source src_add_path"
-alias info="pinfo "
-alias bat="bat "
-alias img="nsxiv "
-alias xclip="xclip -selection clipboard"
-alias d="diff --color -u "
-alias rgf="rg --files | rg "
-alias 7z="7zz" # for whatever reason 7z provides 7zz binary in debian
-alias wt="watch --color -d -cn 0.1 "
-alias .e="set -a && source .env && set +a"
-alias vimu="vim -u /dev/null"
+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 info='pinfo'
+alias bat='bat '
+alias img='nsxiv'
+alias xclip='xclip -selection clipboard'
+alias xxclip='head -c-1 | xclip -selection clipboard'
+alias rgf='rg --files | rg'
+alias wt='watch --color -d -cn 0.1 '
+alias .e='set -a && source .env && set +a'
+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 neofetch="fastfetch"
-alias open="xdg-open"
+alias py='python3'
+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'
 
 # function aliases
 bl()     { brightnessctl set "$1"% > /dev/null; }
@@ -103,15 +109,17 @@ 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
 
 # compdef
 compdef -a '_git; _git-commit' gdc # todo
 compdef '_files -g "*.md"' md
+compdef _ollama ollama
 
 # 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 ${1:-$(git rev-parse --abbrev-ref HEAD)}}
+gpo() { git push --set-upstream origin "$(git rev-parse --abbrev-ref HEAD)" "$@"}
 alias ga="git add"
 alias gb="git branch"
 alias gc="git commit"
@@ -120,6 +128,8 @@ alias gck="git checkout"
 alias gcl="git clone"
 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 gcp="git cherry-pick"
 alias gd="git diff"
@@ -137,6 +147,8 @@ alias grjs="git rebase --cancel"
 alias grm="git remote"
 alias grs="git restore --staged"
 alias grt="git reset"
+alias gsm='git submodule'
+alias grc='git rm --cached'
 alias gs="git status"
 alias gsc="git switch -c"
 alias gsh="git show"
@@ -146,9 +158,18 @@ alias gt="git tag"
 alias gus="git fetch --unshallow"
 
 # docker aliases
-alias dc="docker compose"
-alias docker!="DOCKER_HOST=ssh://docker /usr/bin/docker"
-alias dc!="docker! compose"
+alias d='docker'
+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 dr='d run --rm -it'
 
 # tmux stuff
 tn() { tmux new-session -s "${1-"$(basename "$(pwd)")"}" }
@@ -158,4 +179,6 @@ alias ta="tmux a -t"
 stty -ixon
 
 # print tasks on startup
-cat ~/.taskell.md | grep -v '>.*'
+_ZSH_TODO_FILE="${HOME}/todo.md"
+[ -f "$_ZSH_TODO_FILE" ] && { bat --color=always -p "$_ZSH_TODO_FILE" | grep -v '>.*'; }
+unset _ZSH_TODO_FILE