Refactor alias management and improve bootstrap process for Zsh

dotfiles/.zshrc

@@ -76,8 +76,15 @@ eval "$(zoxide init zsh)"
 # For a full list of active aliases, run `alias`.
 
 # Load custom aliases
+# Define ZSH_CUSTOM if not already defined
+if [ -z "$ZSH_CUSTOM" ]; then
+    ZSH_CUSTOM="$HOME/.oh-my-zsh/custom"
+fi
+
 if [ -f "$ZSH_CUSTOM/aliases.zsh" ]; then
     source "$ZSH_CUSTOM/aliases.zsh"
+elif [ -f "$HOME/.oh-my-zsh/custom/aliases.zsh" ]; then
+    source "$HOME/.oh-my-zsh/custom/aliases.zsh"
 fi
 
 # set directory to home

dotfiles/my-aliases.zsh

@@ -11,6 +11,6 @@ alias update="/home/acedanger/shell/update.sh"
 alias dcdn="docker compose down"
 alias dcupd="docker compose up -d"
 alias lzd="lazydocker"
-alias cat="batcat"
-alias fd="fdfind"
-alias fzf="fzf --preview='batcat {}'"
+alias cat="bat"
+alias fd="fd"
+alias fzf="fzf --preview='bat {}'"

dotfiles/my-aliases.zsh.original

@@ -0,0 +1,16 @@
+alias py=python3
+alias gpull="git pull"
+alias gpush="git push"
+alias gc="git commit"
+alias gcm="git commit -m"
+
+alias ll="ls -laFh --group-directories-first --color=auto"
+alias findzombie="ps -A -ostat,pid,ppid | grep -e '[zZ]'"
+alias plex="/home/acedanger/shell/plex.sh"
+alias update="/home/acedanger/shell/update.sh"
+alias dcdn="docker compose down"
+alias dcupd="docker compose up -d"
+alias lzd="lazydocker"
+alias cat="batcat"
+alias fd="fdfind"
+alias fzf="fzf --preview='batcat {}'"