Separate network section (doc/readability)

2 files changed, 8 insertions, 4 deletions

diff --git a/mkartix b/mkartix
index e62dd36..a3850eb 100755
--- a/mkartix
+++ b/mkartix
@@ -30,12 +30,16 @@ export LANG="en_US.UTF-8"
 export LC_COLLATE="C"
 EOT
 
+sed -i "s/keymap=\"us\"/keymap=\"${KEYMAP}\"/" /etc/conf.d/keymaps
+
 pacman -S --needed --noconfirm btrfs-progs grub os-prober
 grub-install --recheck --target=${TARGET} ${DRIVE}
 grub-mkconfig -o /boot/grub/grub.cfg
 
 echo -en 'artix\nartix' | passwd
 
+# Network
+
 echo artix > /etc/hostname
 
 cat <<EOT > /etc/hosts
@@ -53,8 +57,6 @@ EOT
 
 sed -i 's/hostname="localhost"/hostname="artix"/' /etc/conf.d/hostname
 
-sed -i "s/keymap=\"us\"/keymap=\"${KEYMAP}\"/" /etc/conf.d/keymaps
-
 # Repositories
 ## Artix
 cat <<EOT >> /etc/pacman.conf
diff --git a/mkcryptartix b/mkcryptartix
index 3fd4b68..b0e7934 100755
--- a/mkcryptartix
+++ b/mkcryptartix
@@ -30,6 +30,8 @@ export LANG="en_US.UTF-8"
 export LC_COLLATE="C"
 EOT
 
+sed -i "s/keymap=\"us\"/keymap=\"${KEYMAP}\"/" /etc/conf.d/keymaps
+
 sed -i "s/HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)/HOOKS=(base udev autodetect modconf block keyboard keymap encrypt filesystems fsck)/" /etc/mkinitcpio.conf
 
 pacman -S --needed --noconfirm btrfs-progs grub os-prober device-mapper-openrc cryptsetup-openrc
@@ -107,6 +109,8 @@ pacman -Rns --noconfirm libxkbcommon-x11 # Not needed by all users
 
 echo -en 'artix\nartix' | passwd
 
+# Network
+
 echo artix > /etc/hostname
 
 cat <<EOT > /etc/hosts
@@ -124,8 +128,6 @@ EOT
 
 sed -i 's/hostname="localhost"/hostname="artix"/' /etc/conf.d/hostname
 
-sed -i "s/keymap=\"us\"/keymap=\"${KEYMAP}\"/" /etc/conf.d/keymaps
-
 # Repositories
 ## Artix
 cat <<EOT >> /etc/pacman.conf