mirror of
https://github.com/marcogll/omarchy_setup.git
synced 2026-01-13 13:25:16 +00:00
Feat: Improve Keyring UX and Icon Manager Flow (#7)
* 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>
This commit is contained in:
google-labs-jules[bot]
committed by
GitHub
GitHub
parent
e33719682e
commit
ae8e3c3c40
114
modules/apps.sh
114
modules/apps.sh
@@ -19,19 +19,36 @@
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "${SCRIPT_DIR}/common.sh"
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# ensure_homebrew_env()
|
||||
# ---------------------------------------------------------------
|
||||
# Asegura que el entorno de Homebrew esté configurado correctamente.
|
||||
#
|
||||
# Esta función realiza dos tareas principales:
|
||||
# 1. Carga Homebrew en la sesión de shell actual para que el comando `brew`
|
||||
# esté disponible inmediatamente después de la instalación.
|
||||
# 2. Añade la línea de inicialización de Homebrew a los ficheros de
|
||||
# perfil del usuario (`.profile` y `.zprofile`) para que `brew`
|
||||
# esté disponible en futuras sesiones de terminal.
|
||||
#
|
||||
# Parámetros:
|
||||
# $1 - Ruta al ejecutable de brew.
|
||||
# ---------------------------------------------------------------
|
||||
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úa `shellenv` para que el resto del módulo pueda usar `brew`
|
||||
# sin necesidad de 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")
|
||||
|
||||
# Si el usuario utiliza Zsh, añade también la configuración a .zprofile.
|
||||
if [[ -n "${SHELL:-}" && "$(basename "${SHELL}")" == "zsh" ]]; then
|
||||
rc_targets+=("${HOME}/.zprofile")
|
||||
fi
|
||||
@@ -55,6 +72,16 @@ ensure_homebrew_env() {
|
||||
return 0
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# install_homebrew()
|
||||
# ---------------------------------------------------------------
|
||||
# Instala Homebrew (conocido como Linuxbrew en Linux).
|
||||
#
|
||||
# Comprueba si Homebrew ya está instalado. Si no lo está, descarga y
|
||||
# ejecuta el script de instalación oficial de forma no interactiva.
|
||||
# Después de la instalación, llama a `ensure_homebrew_env` para
|
||||
# configurar el entorno de shell.
|
||||
# ---------------------------------------------------------------
|
||||
install_homebrew() {
|
||||
log_step "Instalación de Homebrew (Linuxbrew)"
|
||||
|
||||
@@ -80,6 +107,31 @@ install_homebrew() {
|
||||
fi
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# install_nvm()
|
||||
# ---------------------------------------------------------------
|
||||
# Instala NVM (Node Version Manager).
|
||||
#
|
||||
# Descarga y ejecuta el script de instalación oficial de NVM.
|
||||
# ---------------------------------------------------------------
|
||||
install_nvm() {
|
||||
log_step "Instalación de NVM (Node Version Manager)"
|
||||
|
||||
if [[ -d "${HOME}/.nvm" ]]; then
|
||||
log_success "NVM ya está instalado."
|
||||
return 0
|
||||
fi
|
||||
|
||||
log_info "Instalando NVM..."
|
||||
if curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash; then
|
||||
log_success "NVM instalado correctamente."
|
||||
log_info "Para usar NVM, reinicia tu terminal o ejecuta: source ~/.nvm/nvm.sh"
|
||||
else
|
||||
log_error "Falló la instalación de NVM."
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# run_module_main()
|
||||
# ---------------------------------------------------------------
|
||||
@@ -98,6 +150,10 @@ run_module_main() {
|
||||
vim nano tmux xdg-utils xdg-user-dirs stow
|
||||
gnome-keyring libsecret seahorse openssh rsync
|
||||
)
|
||||
# Paquetes para desarrollo de software.
|
||||
local PACMAN_DEV=(
|
||||
python python-pip nodejs npm uv
|
||||
)
|
||||
# Paquetes para reproducción y edición multimedia.
|
||||
local PACMAN_MULTIMEDIA=(
|
||||
vlc vlc-plugins-all libdvdcss audacity inkscape
|
||||
@@ -138,7 +194,15 @@ run_module_main() {
|
||||
return 1
|
||||
}
|
||||
|
||||
# Instalar Homebrew si no está presente.
|
||||
log_info "Instalando herramientas de desarrollo..."
|
||||
sudo pacman -S --noconfirm --needed "${PACMAN_DEV[@]}" || {
|
||||
log_warning "Algunas herramientas de desarrollo no se pudieron instalar"
|
||||
}
|
||||
|
||||
# Instalar NVM
|
||||
install_nvm
|
||||
|
||||
# Instalar Homebrew
|
||||
install_homebrew
|
||||
|
||||
log_info "Instalando aplicaciones multimedia..."
|
||||
@@ -249,51 +313,7 @@ EOF
|
||||
fi
|
||||
log_info "Vuelve a iniciar sesión para que las variables de entorno del keyring se apliquen."
|
||||
|
||||
# Busca claves SSH en ~/.ssh y las añade al agente de GNOME Keyring.
|
||||
if command_exists ssh-add; then
|
||||
local ssh_dir="${HOME}/.ssh"
|
||||
if [[ -d "$ssh_dir" ]]; then
|
||||
# Encuentra todas las claves privadas válidas.
|
||||
mapfile -t ssh_private_keys < <(
|
||||
find "$ssh_dir" -maxdepth 1 -type f -perm -u=r \
|
||||
! -name "*.pub" ! -name "*-cert.pub" ! -name "known_hosts" \
|
||||
! -name "known_hosts.*" ! -name "authorized_keys" ! -name "config" \
|
||||
! -name "*.old" ! -name "agent" ! -name "*.bak" 2>/dev/null
|
||||
)
|
||||
if [[ ${#ssh_private_keys[@]} -gt 0 ]]; then
|
||||
log_info "Agregando claves SSH detectadas al keyring (se solicitará la passphrase si aplica)..."
|
||||
for key_path in "${ssh_private_keys[@]}"; do
|
||||
if [[ ! -r "$key_path" ]]; then
|
||||
log_warning "No se puede leer la clave $(basename "$key_path"); revísala manualmente."
|
||||
continue
|
||||
fi
|
||||
# Intenta añadir la clave al agente.
|
||||
if ssh-keygen -y -f "$key_path" >/dev/null 2>&1; then
|
||||
log_info "Registrando clave $(basename "$key_path")..."
|
||||
local spinner_was_active=0
|
||||
if [[ ${SPINNER_ACTIVE:-0} -eq 1 ]]; then spinner_was_active=1; fi
|
||||
if declare -F pause_spinner >/dev/null; then pause_spinner; fi
|
||||
|
||||
if SSH_AUTH_SOCK="$SSH_AUTH_SOCK" ssh-add "$key_path"; then
|
||||
log_success "Clave $(basename "$key_path") añadida al keyring."
|
||||
else
|
||||
log_warning "No se pudo añadir la clave $(basename "$key_path")."
|
||||
fi
|
||||
|
||||
if (( spinner_was_active )) && declare -F resume_spinner >/dev/null; then resume_spinner; fi
|
||||
else
|
||||
log_warning "La clave $(basename "$key_path") parece inválida. Se omite."
|
||||
fi
|
||||
done
|
||||
else
|
||||
log_info "No se encontraron claves privadas SSH en ${ssh_dir}."
|
||||
fi
|
||||
else
|
||||
log_info "No se detectó el directorio ~/.ssh; omitiendo carga de claves."
|
||||
fi
|
||||
else
|
||||
log_warning "ssh-add no está disponible; no se pueden registrar claves en el keyring."
|
||||
fi
|
||||
log_info "La sincronización de claves SSH se realizará por separado con el módulo 'K' después de reiniciar la sesión."
|
||||
|
||||
# Habilita los servicios de las aplicaciones instaladas.
|
||||
if command_exists keyd; then
|
||||
|
||||
Reference in New Issue
Block a user