From 8105765bb1c9b2d32a89fea69d06333444bba50e Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 21 Feb 2022 10:56:11 +0100
Subject: [PATCH] rearrange defaults

---
 etc/archboot/defaults | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/etc/archboot/defaults b/etc/archboot/defaults
index e44a113af..baca9c237 100644
--- a/etc/archboot/defaults
+++ b/etc/archboot/defaults
@@ -1,18 +1,17 @@
 # defaults for archboot
 # firmware to install
 _LINUX_FIRMWARE="linux-firmware"
+# grub config to use
+_GRUB_CONFIG="/usr/share/archboot/grub/grub.cfg"
+### server setup
+# release directory
+_DIR="$(date +%Y.%m)"
+# delete old version from server
+_PURGE_DATE="3 month"
 # custom pacman.conf on x86_64
 _CUSTOM_PACMAN_CONF="/etc/archboot/pacman.conf.archboot"
 # custom mirrorlist on x86_64
 _CUSTOM_MIRRORLIST="/etc/archboot/mirrorlist.archboot"
-# grub config to use
-_GRUB_CONFIG="/usr/share/archboot/grub/grub.cfg"
-### server setup
-_DIR="$(date +%Y.%m)"
-# delete old version from server
-_PURGE_DATE="3 month"
-_PACMAN_AARCH64="pacman-aarch64-chroot"
-_PACMAN_AARCH64_CHROOT="${_PACMAN_AARCH64}-latest.tar.zst"
 # local paths
 _ISO_HOME="/home/tobias/Arch/iso"
 _ISO_HOME_ARCH="${_ISO_HOME}/${_ARCH}"
@@ -23,6 +22,8 @@ _SERVER_HOME="/home/tpowa"
 _SERVER_PUBLIC="${_SERVER_HOME}/public_html"
 _SERVER_IMAGE_DIR="${_SERVER_PUBLIC}/archboot-images"
 _SERVER_SOURCE_DIR="${_SERVER_PUBLIC}/archboot-sources"
+_PACMAN_AARCH64="pacman-aarch64-chroot"
+_PACMAN_AARCH64_CHROOT="${_PACMAN_AARCH64}-latest.tar.zst"
 _SERVER_PACMAN_AARCH64="${_SERVER_PUBLIC}/archboot-helper/${_PACMAN_AARCH64}"
 # public download paths
 _ARCHBOOT_PUBLIC="https://pkgbuild.com/~tpowa"