Commit local changes before merging with remote

dotfiles/.zshrc

@@ -117,4 +117,13 @@ load-nvmrc() {
 add-zsh-hook chpwd load-nvmrc
 load-nvmrc
 
-[[ -s /home/acedanger/.autojump/etc/profile.d/autojump.sh ]] && source /home/acedanger/.autojump/etc/profile.d/autojump.sh autoload -U compinit && compinit -u
+[[ -s /home/acedanger/.autojump/etc/profile.d/autojump.sh ]] && source /home/acedanger/.autojump/etc/profile.d/autojump.sh 
+
+# Enable bash completion compatibility in zsh
+autoload -U +X bashcompinit && bashcompinit
+autoload -U compinit && compinit -u
+
+# Load custom backup scripts completion
+if [ -f "$HOME/shell/completions/backup-scripts-completion.bash" ]; then
+    source "$HOME/shell/completions/backup-scripts-completion.bash"
+fi

dotfiles/README.md

@@ -127,7 +127,7 @@ The tests validate:
 ./run-docker-tests.sh full-ubuntu
 ```
 
-For more details on testing, see [Testing Documentation](../docs/testing.md).
+For more details on testing, see [Docker Bootstrap Testing Framework](../docs/docker-bootstrap-testing-framework.md).
 
 ## Manual Steps
 

dotfiles/my-aliases.zsh

@@ -1,17 +0,0 @@
-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 dcpull="docker compose pull"
-alias lzd="lazydocker"
-alias cat="batcat"
-alias fd="fdfind"
-alias fzf="fzf --preview='batcat {}'"

dotfiles/my-aliases.zsh.original

@@ -4,14 +4,55 @@ 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"
+
+# 🌟 Eza aliases - Modern replacement for ls (conditionally enabled by setup.sh)
+# These provide enhanced directory listing with icons, git status, and tree views
+# The setup script will enable these dynamically if eza is available, otherwise traditional ls aliases are used
+alias la-eza="eza -la --color=auto --group-directories-first"
+alias ll-eza="eza -laFh --color=auto --group-directories-first"
+alias l-eza="eza -1 --color=auto --group-directories-first"
+
+# 🎬 Plex Media Server Management - Sexy Edition
+alias plex="/home/acedanger/shell/plex/plex.sh"
+alias px="/home/acedanger/shell/plex/plex.sh"                    # Quick shortcut
+alias plex-start="/home/acedanger/shell/plex/plex.sh start"      # Start Plex
+alias plex-stop="/home/acedanger/shell/plex/plex.sh stop"        # Stop Plex
+alias plex-restart="/home/acedanger/shell/plex/plex.sh restart"  # Restart Plex
+alias plex-status="/home/acedanger/shell/plex/plex.sh status"    # Status check
+alias plex-web="xdg-open http://localhost:32400/web"        # Open web UI in browser
 alias update="/home/acedanger/shell/update.sh"
 alias dcdn="docker compose down"
 alias dcupd="docker compose up -d"
 alias dcpull="docker compose pull"
 alias lzd="lazydocker"
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
 alias cat="batcat"
 alias fd="fdfind"
 alias fzf="fzf --preview='batcat {}'"
+
+# 🌟 Eza aliases - Modern replacement for ls
+alias ls="eza --icons=always -a --color=auto --group-directories-first"
+alias la="eza --icons=always -la --color=auto --group-directories-first"
+alias ll="eza --icons=always -la --classify=always -h --color=auto --group-directories-first"
+alias l="eza --icons=always -1 -a --color=auto --group-directories-first"
+alias lt="eza --icons=always -a --tree --level=2 --color=auto --group-directories-first"
+alias llt="eza --icons=always -la --tree --level=2 --color=auto --group-directories-first"
+alias lg="eza --icons=always -la --git --color=auto --group-directories-first"
+alias lh="eza --icons=always -la --color=auto --group-directories-first --sort=size"
+alias lr="eza --icons=always -la --color=auto --group-directories-first --sort=modified"
+alias lx="eza --icons=always -la --color=auto --group-directories-first --sort=extension"
+alias tree="eza --icons=always -a --tree --color=auto --group-directories-first"

dotfiles/my-aliases.zsh.template

@@ -0,0 +1,60 @@
+alias py=python3
+alias gpull="git pull"
+alias gpush="git push"
+alias gc="git commit"
+alias gcm="git commit -m"
+
+alias findzombie="ps -A -ostat,pid,ppid | grep -e '[zZ]'"
+
+# 🌟 Eza aliases - Modern replacement for ls (conditionally enabled by setup.sh)
+# These provide enhanced directory listing with icons, git status, and tree views
+# The setup script will enable these dynamically if eza is available, otherwise traditional ls aliases are used
+alias la-eza="eza -la --color=auto --group-directories-first"
+alias ll-eza="eza -laFh --color=auto --group-directories-first"
+alias l-eza="eza -1 --color=auto --group-directories-first"
+alias lt="eza --tree --level=2 --color=auto --group-directories-first"        # Tree view (2 levels)
+alias llt="eza -la --tree --level=2 --color=auto --group-directories-first"   # Long tree view
+alias lg="eza -la --git --color=auto --group-directories-first"               # Show git status
+alias lh="eza -la --color=auto --group-directories-first --sort=size"         # Sort by size
+alias lr="eza -la --color=auto --group-directories-first --sort=modified"     # Sort by modified
+alias lx="eza -la --color=auto --group-directories-first --sort=extension"    # Sort by extension
+alias tree="eza --tree --color=auto --group-directories-first"                # Tree alias
+
+# 🎬 Plex Media Server Management - Sexy Edition
+alias plex="/home/acedanger/shell/plex/plex.sh"
+alias px="/home/acedanger/shell/plex/plex.sh"                    # Quick shortcut
+alias plex-start="/home/acedanger/shell/plex/plex.sh start"      # Start Plex
+alias plex-stop="/home/acedanger/shell/plex/plex.sh stop"        # Stop Plex
+alias plex-restart="/home/acedanger/shell/plex/plex.sh restart"  # Restart Plex
+alias plex-status="/home/acedanger/shell/plex/plex.sh status"    # Status check
+alias plex-web="xdg-open http://localhost:32400/web"        # Open web UI in browser
+alias update="/home/acedanger/shell/update.sh"
+alias dcdn="docker compose down"
+alias dcupd="docker compose up -d"
+alias dcpull="docker compose pull"
+alias lzd="lazydocker"
+
+# 🌟 Eza aliases - Modern replacement for ls
+alias lt="eza --tree --level=2 --color=auto --group-directories-first"
+alias llt="eza -la --tree --level=2 --color=auto --group-directories-first"
+alias lg="eza -la --git --color=auto --group-directories-first"
+alias lh="eza -la --color=auto --group-directories-first --sort=size"
+alias lr="eza -la --color=auto --group-directories-first --sort=modified"
+alias lx="eza -la --color=auto --group-directories-first --sort=extension"
+alias tree="eza --tree --color=auto --group-directories-first"
+alias cat="{{BAT_COMMAND}}"
+alias fd="{{FD_COMMAND}}"
+alias fzf="fzf --preview='{{BAT_COMMAND}} {}'"
+
+# 🌟 Eza aliases - Modern replacement for ls
+alias ls="eza --color=auto --group-directories-first"
+alias la="eza -la --color=auto --group-directories-first"
+alias ll="eza -laFh --color=auto --group-directories-first"
+alias l="eza -1 --color=auto --group-directories-first"
+alias lt="eza --tree --level=2 --color=auto --group-directories-first"
+alias llt="eza -la --tree --level=2 --color=auto --group-directories-first"
+alias lg="eza -la --git --color=auto --group-directories-first"
+alias lh="eza -la --color=auto --group-directories-first --sort=size"
+alias lr="eza -la --color=auto --group-directories-first --sort=modified"
+alias lx="eza -la --color=auto --group-directories-first --sort=extension"
+alias tree="eza --tree --color=auto --group-directories-first"