fix: resolve conflicts between modules and improve reliability

- Remove duplicate SSH_AUTH_SOCK configuration in apps.sh (now handled by gcr-ssh-agent)
- Remove duplicate system update in apps.sh (now only in install_all)
- Remove duplicate packages from zsh-config (git, zoxide, fastfetch, yt-dlp)
- Add mg_dotfiles verification warning for Zsh/Hyprland modules
- Make .zshrc backup non-critical to avoid interruption
- Improve service verification with status checks before enabling
- Add clarifying comments about cursor configuration layers
This commit is contained in:
Marco Gallegos
2026-01-11 11:49:57 -06:00
parent a2694c7ba6
commit bc44a0bed6
4 changed files with 58 additions and 49 deletions

View File

@@ -25,6 +25,14 @@ if [[ ! -d "${MODULES_DIR}" ]] || [[ ! -f "${MODULES_DIR}/common.sh" ]]; then
exit 1
fi
# Verificar mg_dotfiles si se va a usar Zsh o Hyprland
if [[ ! -d "${DOTFILES_DIR:-}" ]]; then
echo -e "\033[0;33m⚠ Advertencia: mg_dotfiles no encontrado en ${DOTFILES_DIR}\033[0m"
echo "Opciones 2 (Zsh) y H (Hyprland) requieren mg_dotfiles."
echo "Ejecuta: git clone https://github.com/marcogll/mg_dotfiles.git ${DOTFILES_DIR}"
echo ""
fi
# Cargar funciones comunes
source "${MODULES_DIR}/common.sh"
@@ -281,9 +289,15 @@ run_module_with_retry() {
# Función para instalar todo
install_all() {
log_step "Instalación Completa de Omarchy"
local failed=()
# Actualizar el sistema antes de instalar todo
log_info "Actualizando el sistema antes de la instalación..."
if ! update_system; then
log_warning "La actualización del sistema falló. Continuando con la instalación..."
fi
for choice in "${INSTALL_ALL_CHOICES[@]}"; do
IFS=';' read -r module_file _ description type <<< "${MODULES[$choice]}"