mirror of
https://github.com/marcogll/omarchy_setup.git
synced 2026-01-13 21:35:16 +00:00
* feat: add dev tools, AI aliases, and improve zshrc documentation
This commit introduces several new features and improvements:
- **Adds Development Tools to `apps.sh`:** The `apps.sh` module now installs essential development tools, including `python`, `pip`, `nodejs`, `npm`, `uv`, and `nvm`.
- **Implements `.zshrc.local` for Private Variables:**
- A `.zshrc.local.example` file has been added to serve as a template for users to securely store their private environment variables, such as API keys.
- The main `.zshrc` file now sources `.zshrc.local` if it exists.
- **Adds AI Aliases to `.zshrc`:** A new section has been added to `.zshrc` with example aliases for interacting with command-line AI tools.
- **Improves `.zshrc` Documentation:** The `.zshrc` file has been thoroughly documented with comments in Spanish, explaining the purpose of each section. The title has also been updated and professionalized.
- **Fixes a Regression:** This commit restores the `ytm`, `ytv`, `ytls`, and SSH agent functions in `.zshrc` that were accidentally removed in a previous step.
* feat: improve keyring UX and icon manager flow
This commit introduces two main improvements to the user experience:
1. **Refactors the Icon Manager for Non-Interactive Installation:**
- The `icon_manager.sh` module can now be run in a non-interactive mode.
- The "Install All" process has been updated to use this non-interactive mode, which installs the default icon theme without pausing the script or requiring user input.
2. **Improves the GNOME Keyring Workflow:**
- The script no longer errors out if the GNOME Keyring agent is not immediately available after installation.
- Instead, a clear summary message is now displayed at the end of the "Install All" process, instructing the user to log out and back in, and then run the SSH key synchronization module separately. This provides a much smoother and more intuitive user experience.
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Marco Gallegos <marco.gallegos@outlook.com>
173 lines
4.8 KiB
Bash
Executable File
173 lines
4.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# ===============================================================
|
|
# common.sh - Funciones comunes para los módulos
|
|
# ===============================================================
|
|
|
|
# Colores para output
|
|
RED='\033[0;31m'
|
|
GREEN='\033[0;32m'
|
|
YELLOW='\033[1;33m'
|
|
BLUE='\033[0;34m'
|
|
MAGENTA='\033[0;35m'
|
|
CYAN='\033[0;36m'
|
|
NC='\033[0m' # No Color
|
|
BOLD='\033[1m'
|
|
|
|
# Funciones de logging
|
|
_maybe_clear_spinner() {
|
|
if declare -F spinner_clear_line >/dev/null; then
|
|
spinner_clear_line
|
|
fi
|
|
}
|
|
|
|
log_info() {
|
|
_maybe_clear_spinner
|
|
echo -e "${BLUE}▶${NC} ${BOLD}$1${NC}"
|
|
}
|
|
|
|
log_success() {
|
|
_maybe_clear_spinner
|
|
echo -e "${GREEN}✓${NC} ${GREEN}$1${NC}"
|
|
}
|
|
|
|
log_warning() {
|
|
_maybe_clear_spinner
|
|
echo -e "${YELLOW}⚠${NC} ${YELLOW}$1${NC}"
|
|
}
|
|
|
|
log_error() {
|
|
_maybe_clear_spinner
|
|
echo -e "${RED}✗${NC} ${RED}$1${NC}"
|
|
}
|
|
|
|
log_step() {
|
|
echo -e "\n${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
|
|
echo -e "${CYAN}${BOLD} $1${NC}"
|
|
echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}\n"
|
|
}
|
|
|
|
# Función para crear una copia de seguridad de un archivo o directorio
|
|
# Uso: backup_file "/ruta/al/archivo"
|
|
backup_file() {
|
|
local path_to_backup="$1"
|
|
if [[ -e "$path_to_backup" ]]; then
|
|
local backup_path="${path_to_backup}.bak_$(date +%F_%T)"
|
|
log_warning "Se encontró un archivo existente en '${path_to_backup}'."
|
|
log_info "Creando copia de seguridad en: ${backup_path}"
|
|
if mv "$path_to_backup" "$backup_path"; then
|
|
log_success "Copia de seguridad creada."
|
|
else
|
|
log_error "No se pudo crear la copia de seguridad. Abortando para evitar pérdida de datos."
|
|
return 1
|
|
fi
|
|
fi
|
|
return 0
|
|
}
|
|
|
|
# Función para verificar si un comando existe
|
|
command_exists() {
|
|
command -v "$1" >/dev/null 2>&1
|
|
}
|
|
|
|
# Función para verificar e instalar un paquete con pacman
|
|
# Uso: check_and_install_pkg "nombre-del-paquete"
|
|
check_and_install_pkg() {
|
|
local pkg_name="$1"
|
|
# pacman -T es una forma de verificar sin instalar, pero no funciona bien con grupos.
|
|
# pacman -Q es más fiable para paquetes individuales.
|
|
if ! pacman -Q "$pkg_name" &>/dev/null; then
|
|
log_info "Instalando ${pkg_name}..."
|
|
if sudo pacman -S --noconfirm --needed "$pkg_name"; then
|
|
return 0
|
|
else
|
|
log_warning "No se pudo instalar ${pkg_name}."
|
|
return 1
|
|
fi
|
|
else
|
|
log_info "${pkg_name} ya está instalado."
|
|
fi
|
|
return 0
|
|
}
|
|
|
|
|
|
# Función para instalar helper AUR si no existe
|
|
ensure_aur_helper() {
|
|
if command_exists yay; then
|
|
echo "yay"
|
|
return 0
|
|
elif command_exists paru; then
|
|
echo "paru"
|
|
return 0
|
|
else
|
|
log_warning "No se detectó yay ni paru. Instalando yay..."
|
|
cd /tmp
|
|
git clone https://aur.archlinux.org/yay-bin.git
|
|
cd yay-bin
|
|
makepkg -si --noconfirm
|
|
echo "yay"
|
|
return 0
|
|
fi
|
|
}
|
|
|
|
aur_install_packages() {
|
|
local packages=("$@")
|
|
if [[ ${#packages[@]} -eq 0 ]]; then
|
|
return 0
|
|
fi
|
|
|
|
local helper="${AUR_HELPER_CMD:-}"
|
|
if [[ -z "$helper" ]]; then
|
|
helper="$(ensure_aur_helper)" || helper=""
|
|
fi
|
|
|
|
if [[ -z "$helper" ]]; then
|
|
log_error "No se pudo determinar un helper de AUR disponible."
|
|
return 1
|
|
fi
|
|
|
|
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[@]}"
|
|
status=$?
|
|
;;
|
|
paru)
|
|
"$helper" -S "${base_flags[@]}" \
|
|
--skipreview \
|
|
--cleanafter \
|
|
--mflags "--noconfirm" \
|
|
"${packages[@]}"
|
|
status=$?
|
|
;;
|
|
*)
|
|
log_error "Helper AUR desconocido: ${helper}"
|
|
return 1
|
|
;;
|
|
esac
|
|
return $status
|
|
}
|
|
|
|
# Función para actualizar sistema
|
|
update_system() {
|
|
log_step "Actualizando sistema"
|
|
log_info "Sincronizando repositorios y actualizando paquetes..."
|
|
sudo pacman -Syu --noconfirm
|
|
log_success "Sistema actualizado"
|
|
}
|
|
|
|
# Función para limpiar paquetes huérfanos
|
|
cleanup_orphans() {
|
|
log_step "Limpieza de paquetes huérfanos"
|
|
log_info "Buscando paquetes huérfanos..."
|
|
sudo pacman -Rns $(pacman -Qtdq) --noconfirm 2>/dev/null || true
|
|
log_success "Limpieza completada"
|
|
}
|