diff --git a/arch-setup.sh b/arch-setup.sh index e2b581f..df05fc8 100755 --- a/arch-setup.sh +++ b/arch-setup.sh @@ -50,7 +50,7 @@ fi echo -e "${CYAN}" echo "╔══════════════════════════════════════════════════════════════╗" echo "║ VPS Setup & Hardening Script ║" -echo "║ Arch Linux · Docker · OMATERM · Git ║" +echo "║ Arch Linux · Docker · OMATERM ║" echo "╚══════════════════════════════════════════════════════════════╝" echo -e "${NC}" @@ -72,27 +72,12 @@ if ! [[ "$DEPLOY_USER" =~ ^[a-z_][a-z0-9_-]*$ ]]; then exit 1 fi -# Git name -read -rp "Git display name [Gavin]: " input_git_name -GIT_NAME="${input_git_name:-Gavin}" - -# Git email -read -rp "Git email: " input_git_email -GIT_EMAIL="${input_git_email}" - -if [ -z "$GIT_EMAIL" ]; then - warn "No Git email set — you can configure this later" - GIT_EMAIL="not-set@example.com" -fi - # Confirm echo "" echo -e "${CYAN}━━━ Confirm settings ━━━${NC}" echo "" echo " SSH alias: $SSH_ALIAS" echo " Deploy user: $DEPLOY_USER" -echo " Git name: $GIT_NAME" -echo " Git email: $GIT_EMAIL" echo " Timezone: $TIMEZONE" echo "" read -p "Continue? (y/n) " -n 1 -r @@ -109,12 +94,12 @@ fi step "1/8 · System updates & essential packages" pacman -Syu --noconfirm +# Minimal host package set — omaterm's container brings its own tooling +# (git, tmux, agents, tailscale all live inside it) pacman -S --noconfirm --needed \ ufw \ fail2ban \ curl \ - tmux \ - git \ docker \ docker-compose @@ -389,20 +374,6 @@ pacman -S --noconfirm --needed pacman-contrib systemctl enable --now paccache.timer log "paccache.timer enabled — old package versions pruned weekly" -# ============================================================================= -# GIT CONFIGURATION -# ============================================================================= - -step "Git configuration" - -su - $DEPLOY_USER << GITEOF -git config --global user.name "$GIT_NAME" -git config --global user.email "$GIT_EMAIL" -git config --global init.defaultBranch main -GITEOF - -log "Git configured for $DEPLOY_USER" - # ============================================================================= # GENERATE LOCAL SSH CONFIG FILE # =============================================================================