diff --git a/install.sh b/install.sh index 120599f8..468b732a 100644 --- a/install.sh +++ b/install.sh @@ -9,65 +9,10 @@ export OMARCHY_INSTALL="$OMARCHY_PATH/install" export OMARCHY_INSTALL_LOG_FILE="/var/log/omarchy-install.log" export PATH="$OMARCHY_PATH/bin:$PATH" -# Helpers -source $OMARCHY_INSTALL/helpers/chroot.sh -source $OMARCHY_INSTALL/helpers/logo.sh -source $OMARCHY_INSTALL/helpers/gum.sh -source $OMARCHY_INSTALL/helpers/errors.sh -source $OMARCHY_INSTALL/helpers/logging.sh -source $OMARCHY_INSTALL/helpers/layout.sh - -# Preparation -source $OMARCHY_INSTALL/preflight/guard.sh -source $OMARCHY_INSTALL/preflight/begin.sh -run_logged $OMARCHY_INSTALL/preflight/show-env.sh -run_logged $OMARCHY_INSTALL/preflight/pacman.sh -run_logged $OMARCHY_INSTALL/preflight/migrations.sh -run_logged $OMARCHY_INSTALL/preflight/first-run-mode.sh -run_logged $OMARCHY_INSTALL/preflight/disable-mkinitcpio.sh - -# Packages -run_logged $OMARCHY_INSTALL/packaging/base.sh -run_logged $OMARCHY_INSTALL/packaging/fonts.sh -run_logged $OMARCHY_INSTALL/packaging/lazyvim.sh -run_logged $OMARCHY_INSTALL/packaging/icons.sh -run_logged $OMARCHY_INSTALL/packaging/webapps.sh -run_logged $OMARCHY_INSTALL/packaging/tuis.sh - -# Configs -run_logged $OMARCHY_INSTALL/config/config.sh -run_logged $OMARCHY_INSTALL/config/theme.sh -run_logged $OMARCHY_INSTALL/config/branding.sh -run_logged $OMARCHY_INSTALL/config/git.sh -run_logged $OMARCHY_INSTALL/config/gpg.sh -run_logged $OMARCHY_INSTALL/config/timezones.sh -run_logged $OMARCHY_INSTALL/config/increase-sudo-tries.sh -run_logged $OMARCHY_INSTALL/config/increase-lockout-limit.sh -run_logged $OMARCHY_INSTALL/config/ssh-flakiness.sh -run_logged $OMARCHY_INSTALL/config/detect-keyboard-layout.sh -run_logged $OMARCHY_INSTALL/config/xcompose.sh -run_logged $OMARCHY_INSTALL/config/mise-ruby.sh -run_logged $OMARCHY_INSTALL/config/docker.sh -run_logged $OMARCHY_INSTALL/config/mimetypes.sh -run_logged $OMARCHY_INSTALL/config/localdb.sh -run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh -run_logged $OMARCHY_INSTALL/config/hardware/network.sh -run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh -run_logged $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh -run_logged $OMARCHY_INSTALL/config/hardware/bluetooth.sh -run_logged $OMARCHY_INSTALL/config/hardware/printer.sh -run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh -run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh -run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh -run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh -run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh - -# Login -run_logged $OMARCHY_INSTALL/login/plymouth.sh -run_logged $OMARCHY_INSTALL/login/limine-snapper.sh -run_logged $OMARCHY_INSTALL/login/enable-mkinitcpio.sh -run_logged $OMARCHY_INSTALL/login/alt-bootloaders.sh - -# Post-install -run_logged $OMARCHY_INSTALL/post-install/pacman.sh -source $OMARCHY_INSTALL/post-install/finished.sh +# Install +source $OMARCHY_INSTALL/helpers/all.sh +source $OMARCHY_INSTALL/preflight/all.sh +source $OMARCHY_INSTALL/packaging/all.sh +source $OMARCHY_INSTALL/configs/all.sh +source $OMARCHY_INSTALL/login/all.sh +source $OMARCHY_INSTALL/post-install/all.sh diff --git a/install/config/all.sh b/install/config/all.sh new file mode 100644 index 00000000..8a44517e --- /dev/null +++ b/install/config/all.sh @@ -0,0 +1,26 @@ +run_logged $OMARCHY_INSTALL/config/config.sh +run_logged $OMARCHY_INSTALL/config/theme.sh +run_logged $OMARCHY_INSTALL/config/branding.sh +run_logged $OMARCHY_INSTALL/config/git.sh +run_logged $OMARCHY_INSTALL/config/gpg.sh +run_logged $OMARCHY_INSTALL/config/timezones.sh +run_logged $OMARCHY_INSTALL/config/increase-sudo-tries.sh +run_logged $OMARCHY_INSTALL/config/increase-lockout-limit.sh +run_logged $OMARCHY_INSTALL/config/ssh-flakiness.sh +run_logged $OMARCHY_INSTALL/config/detect-keyboard-layout.sh +run_logged $OMARCHY_INSTALL/config/xcompose.sh +run_logged $OMARCHY_INSTALL/config/mise-ruby.sh +run_logged $OMARCHY_INSTALL/config/docker.sh +run_logged $OMARCHY_INSTALL/config/mimetypes.sh +run_logged $OMARCHY_INSTALL/config/localdb.sh +run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh +run_logged $OMARCHY_INSTALL/config/hardware/network.sh +run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh +run_logged $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh +run_logged $OMARCHY_INSTALL/config/hardware/bluetooth.sh +run_logged $OMARCHY_INSTALL/config/hardware/printer.sh +run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh +run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh +run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh +run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh +run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh diff --git a/install/helpers/all.sh b/install/helpers/all.sh new file mode 100644 index 00000000..5481e767 --- /dev/null +++ b/install/helpers/all.sh @@ -0,0 +1,6 @@ +source $OMARCHY_INSTALL/helpers/chroot.sh +source $OMARCHY_INSTALL/helpers/logo.sh +source $OMARCHY_INSTALL/helpers/gum.sh +source $OMARCHY_INSTALL/helpers/errors.sh +source $OMARCHY_INSTALL/helpers/logging.sh +source $OMARCHY_INSTALL/helpers/layout.sh diff --git a/install/iso.sh b/install/iso.sh new file mode 100644 index 00000000..7676ccc0 --- /dev/null +++ b/install/iso.sh @@ -0,0 +1,14 @@ +# Called by Omarchy ISO setup before starting configurator and archinstall + +source "$OMARCHY_INSTALL/preflight/set-size-vars.sh" +source "$OMARCHY_INSTALL/helpers/logo.sh" +source "$OMARCHY_INSTALL/preflight/gum.sh" +source "$OMARCHY_INSTALL/helpers/tail-log-output.sh" +source "$OMARCHY_INSTALL/helpers/trap-errors.sh" + +source $OMARCHY_INSTALL/helpers/chroot.sh +source $OMARCHY_INSTALL/helpers/logo.sh +source $OMARCHY_INSTALL/helpers/gum.sh +source $OMARCHY_INSTALL/helpers/errors.sh +source $OMARCHY_INSTALL/helpers/logging.sh +source $OMARCHY_INSTALL/helpers/layout.sh diff --git a/install/login/all.sh b/install/login/all.sh new file mode 100644 index 00000000..e4be282f --- /dev/null +++ b/install/login/all.sh @@ -0,0 +1,4 @@ +run_logged $OMARCHY_INSTALL/login/plymouth.sh +run_logged $OMARCHY_INSTALL/login/limine-snapper.sh +run_logged $OMARCHY_INSTALL/login/enable-mkinitcpio.sh +run_logged $OMARCHY_INSTALL/login/alt-bootloaders.sh diff --git a/install/packaging/all.sh b/install/packaging/all.sh new file mode 100644 index 00000000..52788734 --- /dev/null +++ b/install/packaging/all.sh @@ -0,0 +1,6 @@ +run_logged $OMARCHY_INSTALL/packaging/base.sh +run_logged $OMARCHY_INSTALL/packaging/fonts.sh +run_logged $OMARCHY_INSTALL/packaging/lazyvim.sh +run_logged $OMARCHY_INSTALL/packaging/icons.sh +run_logged $OMARCHY_INSTALL/packaging/webapps.sh +run_logged $OMARCHY_INSTALL/packaging/tuis.sh diff --git a/install/post-install/all.sh b/install/post-install/all.sh new file mode 100644 index 00000000..4242b627 --- /dev/null +++ b/install/post-install/all.sh @@ -0,0 +1,2 @@ +run_logged $OMARCHY_INSTALL/post-install/pacman.sh +source $OMARCHY_INSTALL/post-install/finished.sh diff --git a/install/preflight/all.sh b/install/preflight/all.sh new file mode 100644 index 00000000..88354659 --- /dev/null +++ b/install/preflight/all.sh @@ -0,0 +1,7 @@ +source $OMARCHY_INSTALL/preflight/guard.sh +source $OMARCHY_INSTALL/preflight/begin.sh +run_logged $OMARCHY_INSTALL/preflight/show-env.sh +run_logged $OMARCHY_INSTALL/preflight/pacman.sh +run_logged $OMARCHY_INSTALL/preflight/migrations.sh +run_logged $OMARCHY_INSTALL/preflight/first-run-mode.sh +run_logged $OMARCHY_INSTALL/preflight/disable-mkinitcpio.sh