diff --git a/builder/cmds/autostart-offline.sh b/builder/cmds/autostart-offline.sh deleted file mode 100644 index 47bf36c..0000000 --- a/builder/cmds/autostart-offline.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# Set Tokyo Night color scheme for the terminal -set_tokyo_night_colors() { - if [[ $(tty) == "/dev/tty"* ]]; then - # Tokyo Night color palette - echo -en "\e]P01a1b26" # black (background) - echo -en "\e]P1f7768e" # red - echo -en "\e]P29ece6a" # green - echo -en "\e]P3e0af68" # yellow - echo -en "\e]P47aa2f7" # blue - echo -en "\e]P5bb9af7" # magenta - echo -en "\e]P67dcfff" # cyan - echo -en "\e]P7a9b1d6" # white - echo -en "\e]P8414868" # bright black - echo -en "\e]P9f7768e" # bright red - echo -en "\e]PA9ece6a" # bright green - echo -en "\e]PBe0af68" # bright yellow - echo -en "\e]PC7aa2f7" # bright blue - echo -en "\e]PDbb9af7" # bright magenta - echo -en "\e]PE7dcfff" # bright cyan - echo -en "\e]PFc0caf5" # bright white (foreground) - - # Set default foreground and background - echo -en "\033[0m" - clear - fi -} - -run_configurator() { - set -euo pipefail - - # Configurator for user information, disk selection, and wifi configuration - NETWORK_NOT_NEEDED=true ./configurator - - # Get username from installer config for reliable error recovery - export OMARCHY_USER="$(jq -r '.users[0].username' user_credentials.json)" -} - -install_base_system() { - set -euo pipefail - - # Initialize and populate the keyring - pacman-key --init - pacman-key --populate archlinux - - # Sync the offline database so pacman can find packages - pacman -Sy --noconfirm - - # Install using files generated by the ./configurator - # Skip NTP and WKD sync since we're offline (keyring is pre-populated in ISO) - archinstall \ - --config user_configuration.json \ - --creds user_credentials.json \ - --silent \ - --skip-ntp \ - --skip-wkd - - # After archinstall sets up the base system but before our installer runs, - # we need to ensure the offline pacman.conf is in place - cp /etc/pacman.conf /mnt/etc/pacman.conf - - # Mount the offline mirror so it's accessible in the chroot - mkdir -p /mnt/var/cache/omarchy/mirror/offline - mount --bind /var/cache/omarchy/mirror/offline /mnt/var/cache/omarchy/mirror/offline - - # Mount the ruby directory so it's accessible in the chroot - mkdir -p /mnt/var/cache/omarchy/ruby - mount --bind /var/cache/omarchy/ruby /mnt/var/cache/omarchy/ruby - - # No need to ask for sudo during the installation (omarchy itself responsible for removing after install) - mkdir -p /mnt/etc/sudoers.d - cat >/mnt/etc/sudoers.d/99-omarchy-installer </dev/null || true -} - -chroot_bash() { - HOME=/home/$OMARCHY_USER \ - arch-chroot -u $OMARCHY_USER /mnt/ \ - env OMARCHY_CHROOT_INSTALL=1 \ - OMARCHY_OFFLINE_INSTALL=1 \ - OMARCHY_USER_NAME="$(&1 | sed -u 's/\x1b\[[0-9;]*[a-zA-Z]//g' >>"$LOG_FILE" - cleanup - - # Get username from the config file after installation - OMARCHY_USER="$(jq -r '.users[0].username' user_credentials.json)" - - # Install gum early so we have it for formatting - chroot_bash -lc "sudo pacman -S --noconfirm --needed gum" >/dev/null - - # Run Omarchy installer directly (skip boot.sh since it would try to clone again) - chroot_bash -lc "source /home/$OMARCHY_USER/.local/share/omarchy/install.sh || bash" -fi diff --git a/builder/cmds/autostart.sh b/builder/cmds/autostart.sh deleted file mode 100644 index 08a1e52..0000000 --- a/builder/cmds/autostart.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -chroot_bash() { - HOME=/home/$OMARCHY_USER \ - arch-chroot -u $OMARCHY_USER /mnt/ \ - env OMARCHY_CHROOT_INSTALL=1 \ - OMARCHY_USER_NAME="$(/dev/null && umount -R /mnt - - # Install using files generated by the ./configurator - archinstall \ - --config user_configuration.json \ - --creds user_credentials.json \ - --silent - - # No need to ask for sudo during the installation (omarchy itself responsible for removing after install) - mkdir -p /mnt/etc/sudoers.d - cat >/mnt/etc/sudoers.d/99-omarchy-installer </dev/null || echo "https://omarchy.org/install") - chroot_bash -lc "curl -fsSL $OMARCHY_INSTALL_URL | bash || bash" -fi