From af45138c1799ccec7f6df4a31245c9c37f9114ce Mon Sep 17 00:00:00 2001
From: Blake Romero <blake@blkrom.com>
Date: Tue, 30 May 2023 12:57:34 +0100
Subject: Combine package installs

---
 install-artix.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/install-artix.sh b/install-artix.sh
index 4521cdb..c81de74 100755
--- a/install-artix.sh
+++ b/install-artix.sh
@@ -143,19 +143,21 @@ ucode=amd-ucode
 [[ $(grep "vendor_id" /proc/cpuinfo) == *Intel* ]] && ucode=intel-ucode
 
 # Install base packages
-basestrap /mnt base base-devel runit elogind-runit
-basestrap /mnt linux linux-firmware
 basestrap /mnt \
+          base base-devel runit elogind-runit
+
+# Install Linux & utilities
+basestrap /mnt linux linux-firmware \
           grub efibootmgr os-prober \
           btrfs-progs mkinitcpio-nfs-utils \
-          git vim man-db man-pages ${ucode}
-# Install services
+          git vim man-db man-pages ${ucode} \
+          runit-bash-completions
+
+# Install runit services
 basestrap /mnt \
           cryptsetup-runit \
           iwd-runit dhcpcd-runit openntpd-runit \
           cronie-runit openssh-runit ufw-runit
-# Extra packages
-basestrap /mnt runit-bash-completions
 
 # Enable runit services
 services="ufw iwd dhcpcd openntpd cronie openssh"
-- 
cgit