refactor

modules/apps.sh

@@ -6,11 +6,53 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/common.sh"
 
+ensure_homebrew_env() {
+    local brew_bin="$1"
+    if [[ ! -x "$brew_bin" ]]; then
+        return 1
+    fi
+
+    # Eval shellenv so el resto del módulo pueda usar brew sin reiniciar la shell.
+    eval "$("$brew_bin" shellenv)" || return 1
+
+    local shell_snippet='eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"'
+    local -a appended=()
+    local -a rc_targets=("${HOME}/.profile")
+
+    if [[ -n "${SHELL:-}" && "$(basename "${SHELL}")" == "zsh" ]]; then
+        rc_targets+=("${HOME}/.zprofile")
+    fi
+
+    for rc_file in "${rc_targets[@]}"; do
+        if [[ -f "$rc_file" ]] && grep -Fq "$shell_snippet" "$rc_file"; then
+            continue
+        fi
+        {
+            echo ""
+            echo "# Configuración añadida por Omarchy Setup para inicializar Homebrew"
+            echo "$shell_snippet"
+        } >> "$rc_file"
+        appended+=("$rc_file")
+    done
+
+    if [[ ${#appended[@]} -gt 0 ]]; then
+        log_info "Se añadió la inicialización de Homebrew a: ${appended[*]}."
+    fi
+
+    return 0
+}
+
 install_homebrew() {
     log_step "Instalación de Homebrew (Linuxbrew)"
     
+    local brew_path="/home/linuxbrew/.linuxbrew/bin/brew"
     if command_exists brew; then
+        brew_path="$(command -v brew)"
+    fi
+
+    if command_exists brew || [[ -x "$brew_path" ]]; then
         log_success "Homebrew ya está instalado."
+        ensure_homebrew_env "${brew_path}" || true
         return 0
     fi
     
@@ -18,6 +60,7 @@ install_homebrew() {
     # Instalar de forma no interactiva
     if NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"; then
         log_success "Homebrew instalado correctamente."
+        ensure_homebrew_env "${brew_path}" || log_warning "Homebrew se instaló pero no se pudo configurar la shell automáticamente."
     else
         log_error "Falló la instalación de Homebrew."
         return 1

modules/common.sh

@@ -125,16 +125,26 @@ aur_install_packages() {
         return 1
     fi
 
-    local -a base_flags=(--noconfirm --needed --noeditmenu --nodiffmenu --nocleanmenu)
+    local -a base_flags=(--noconfirm --needed)
     AUR_HELPER_CMD="$helper"
     local status=0
     case "$helper" in
         yay)
-            "$helper" -S "${base_flags[@]}" --answerdiff None --answerclean All --answeredit None --mflags "--noconfirm" --cleanafter "${packages[@]}"
+            "$helper" -S "${base_flags[@]}" \
+                --answerdiff None \
+                --answerclean All \
+                --answeredit None \
+                --mflags "--noconfirm" \
+                --cleanafter \
+                "${packages[@]}"
             status=$?
             ;;
         paru)
-            "$helper" -S "${base_flags[@]}" --skipreview --cleanafter --mflags "--noconfirm" "${packages[@]}"
+            "$helper" -S "${base_flags[@]}" \
+                --skipreview \
+                --cleanafter \
+                --mflags "--noconfirm" \
+                "${packages[@]}"
             status=$?
             ;;
         *)

modules/zsh-config.sh

@@ -13,6 +13,18 @@ else
     exit 1
 fi
 
+# Opciones comunes para curl con timeout moderado y reintentos breves.
+ZSH_CURL_TIMEOUT_OPTS=(--fail --location --silent --show-error --connect-timeout 10 --max-time 60 --retry 2 --retry-delay 2)
+
+zsh_download_with_timeout() {
+    local url="$1"
+    local dest="$2"
+    if curl "${ZSH_CURL_TIMEOUT_OPTS[@]}" -o "$dest" "$url"; then
+        return 0
+    fi
+    return 1
+}
+
 install_zsh() {
     log_step "Configuración Completa de Zsh"
 
@@ -55,10 +67,20 @@ install_zsh() {
             else
                 log_warning "No se pudo instalar Oh My Posh mediante pacman ni AUR."
                 log_info "Descargando instalador oficial de Oh My Posh..."
-                if curl -fsSL https://ohmyposh.dev/install.sh | sudo bash -s -- -d /usr/local/bin; then
+                local omp_installer
-                    log_success "Oh My Posh instalado usando el script oficial."
+                omp_installer="$(mktemp)"
+                if [[ -n "$omp_installer" ]] && zsh_download_with_timeout "https://ohmyposh.dev/install.sh" "$omp_installer"; then
+                    if sudo bash "$omp_installer" -d /usr/local/bin; then
+                        log_success "Oh My Posh instalado usando el script oficial."
+                    else
+                        log_error "Falló la instalación de Oh My Posh usando el script oficial."
+                        rm -f "$omp_installer"
+                        return 1
+                    fi
+                    rm -f "$omp_installer"
                 else
-                    log_error "Fallo la instalación de Oh My Posh usando el script oficial."
+                    rm -f "${omp_installer:-}"
+                    log_error "No se pudo descargar el instalador oficial de Oh My Posh."
                     return 1
                 fi
             fi
@@ -71,12 +93,25 @@ install_zsh() {
     local target_ohmyzsh_dir="${target_home}/.oh-my-zsh"
     if [[ ! -d "$target_ohmyzsh_dir" ]]; then
         log_info "Instalando Oh My Zsh..."
-        # Usar RUNZSH=no para evitar que inicie un nuevo shell y CHSH=no para no cambiar el shell aún
+        local omz_installer
-        if ! env HOME="$target_home" RUNZSH=no CHSH=no \
+        omz_installer="$(mktemp)"
-            sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended --keep-zshrc; then
+        if [[ -z "$omz_installer" ]]; then
-            log_error "Falló la instalación de Oh My Zsh."
+            log_error "No se pudo crear un archivo temporal para el instalador de Oh My Zsh."
             return 1
         fi
+        if zsh_download_with_timeout "https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh" "$omz_installer"; then
+            # Usar RUNZSH=no para evitar que inicie un nuevo shell y CHSH=no para no cambiar el shell aún
+            if ! env HOME="$target_home" RUNZSH=no CHSH=no sh "$omz_installer" --unattended --keep-zshrc; then
+                rm -f "$omz_installer"
+                log_error "Falló la instalación de Oh My Zsh."
+                return 1
+            fi
+        else
+            rm -f "$omz_installer"
+            log_error "No se pudo descargar el instalador de Oh My Zsh."
+            return 1
+        fi
+        rm -f "$omz_installer"
     else
         log_info "Oh My Zsh ya está instalado."
     fi
@@ -115,7 +150,7 @@ install_zsh() {
     local tmp_download="${target_home}/.zshrc.omarchy-tmp"
     local source_file=""
 
-    if curl -fsSL "${REPO_BASE}/.zshrc" -o "$tmp_download" && [[ -s "$tmp_download" ]]; then
+    if zsh_download_with_timeout "${REPO_BASE}/.zshrc" "$tmp_download" && [[ -s "$tmp_download" ]]; then
         source_file="$tmp_download"
         log_success "Configuración .zshrc descargada desde el repositorio remoto."
     else
@@ -156,7 +191,7 @@ install_zsh() {
     local posh_theme_local="${SCRIPT_DIR_ROOT}/themes/catppuccin_frappe.omp.json"
     mkdir -p "$posh_themes_dir"
     
-    if curl -fsSL "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/catppuccin_frappe.omp.json" -o "$theme_file"; then
+    if zsh_download_with_timeout "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/catppuccin_frappe.omp.json" "$theme_file"; then
         chmod 644 "$theme_file" 2>/dev/null || true
         log_success "Tema Catppuccin Frappe descargado en $theme_file"
     else