Add hera

_machines/hera.yml

@@ -0,0 +1,62 @@
+font_size: 11
+
+gpu: intel
+cpu: intel
+
+# make sure that display manager works
+system_default_target: "graphical.target"
+
+users:
+- name: hannes
+  vt: 1
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
+      manage_css: true
+    media:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+      bigger_font: true
+  mail: hannes@hkoerber.de
+  autologin: false
+  ssh_agent: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  environment: {}
+
+screen:
+  1: HDMI-1
+  2: HDMI-1
+  3: HDMI-1
+  4: HDMI-1
+  5: HDMI-1
+  6: HDMI-1
+  7: HDMI-1
+  8: HDMI-1
+  9: HDMI-1
+  0: HDMI-1
+
+workspace: []
+
+environment:
+  MACHINE_TYPE: "workstation"
+  MACHINE_HAS_KEEPASSXC: "false"
+  MACHINE_HAS_NEXTCLOUD: "false"
+  MACHINE_HAS_STEAM: "false"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1080"

install_scripts/hera.sh

@@ -0,0 +1,130 @@
+#!/usr/bin/env bash
+
+set -o xtrace
+set -o nounset
+set -o errexit
+
+DEVICE="/dev/nvme0n1"
+
+if [[ ! -b "${DEVICE}" ]] ; then
+    printf '%s does not look like a device\n' "${DEVICE}"
+    exit 1
+fi
+
+if [[ ! -d /sys/firmware/efi/efivars ]] ; then
+    printf 'efivars does not exist, looks like the system is not booted in EFI mode\n'
+    exit 1
+fi
+
+loadkeys de-latin1
+
+timedatectl set-ntp true
+
+sed -e 's/\s*\([^#]*\).*/\1/' << EOF | sfdisk ${DEVICE}
+    label: gpt
+    device: ${DEVICE}
+
+    ${DEVICE}p1 : name=uefi, size=512M , type=uefi
+    ${DEVICE}p2 : name=boot, size=512M , type=linux
+    ${DEVICE}p3 : name=swap, size=16G  , type=linux
+    ${DEVICE}p4 : name=root, size=60G  , type=linux
+    ${DEVICE}p5 : name=home,             type=linux
+EOF
+
+# might take a bit for the new partion table to be updated in-kernel
+sleep 1
+
+yes | mkfs.fat -F32 /dev/disk/by-partlabel/uefi
+yes | mkfs.ext4 /dev/disk/by-partlabel/boot
+yes | mkfs.ext4 /dev/disk/by-partlabel/root
+yes | mkfs.ext4 /dev/disk/by-partlabel/home
+
+mkswap /dev/disk/by-partlabel/swap
+swapon /dev/disk/by-partlabel/swap
+
+mount /dev/disk/by-partlabel/root /mnt
+
+mkdir /mnt/efi
+mount /dev/disk/by-partlabel/uefi /mnt/efi
+
+mkdir /mnt/boot
+mount /dev/disk/by-partlabel/boot /mnt/boot
+
+mkdir /mnt/home
+mount /dev/disk/by-partlabel/home /mnt/home
+
+pacstrap /mnt base linux-zen linux-firmware networkmanager intel-ucode grub efibootmgr
+
+genfstab -U /mnt >> /mnt/etc/fstab
+
+cat << CHROOTSCRIPT > /mnt/chroot-script.sh
+
+set -o xtrace
+set -o errexit
+set -o nounset
+
+ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+hwclock --systohc
+
+sed -i 's/^#de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen
+sed -i 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
+
+locale-gen
+
+printf 'LANG=de_DE.UTF-8\n' > /etc/locale.conf
+
+printf 'KEYMAP=de-latin1\nFONT=lat2-16\n' > /etc/vconsole.conf
+
+printf 'hera\n' > /etc/hostname
+
+cat <<EOF > /etc/hosts
+127.0.0.1 localhost
+::1       localhost
+127.0.1.1 hera
+EOF
+
+sed -i 's/^HOOKS=.*$/HOOKS=(base udev autodetect keyboard keymap consolefont modconf block filesystems resume fsck)/' /etc/mkinitcpio.conf
+
+mkinitcpio -P
+
+grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB
+
+sed -i 's/^GRUB_DISABLE_RECOVERY=.*$/GRUB_DISABLE_RECOVERY=/' /etc/default/grub
+sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID=\$(blkid -s UUID -o value /dev/disk/by-partlabel/swap)\"/" /etc/default/grub
+
+grub-mkconfig -o /boot/grub/grub.cfg
+
+systemctl enable NetworkManager
+
+passwd
+
+# enable root autologin on first boot
+
+mkdir /etc/systemd/system/getty@tty1.service.d/
+cat << EOF > /etc/systemd/system/getty@tty1.service.d/autologin.conf
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root %I $TERM
+EOF
+# ExecStartPost=/bin/rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
+# ExecStartPost=/bin/rmdir /etc/systemd/system/getty@tty1.service.d/
+
+# Run
+cat << 'EOF' > /root/.bash_profile
+    if [[ "\$(tty)" == "/dev/tty1" ]] ; then
+        while ! ping -w 3 -c 3 8.8.8.8 ; do
+            nmtui
+            sleep 5
+        done
+        rm -rf /etc/systemd/system/getty@tty1.service.d/
+        if /var/lib/dotfiles/install.sh ; then
+            rm -f /root/.bash_profile
+            reboot
+        fi
+    fi
+EOF
+CHROOTSCRIPT
+
+chmod +x /mnt/chroot-script.sh
+arch-chroot /mnt /chroot-script.sh
+rm -f /mnt/chroot-script.sh

test.sh

@@ -241,7 +241,7 @@ configure_new_system() {
     wait
 }
 
-machines=(ares neptune dionysus)
+machines=(ares neptune dionysus hera)
 if (($# > 0)); then
     machines=("${@}")
 fi
@@ -271,6 +271,13 @@ for hostname in "${machines[@]}"; do
             "-drive" "if=pflash,format=raw,file=${tmpdir}/efivars.fd"
         )
         ;;
+    hera)
+        hostqemuopts=(
+            "-device" "nvme,serial=rootnvme,drive=root"
+            "-drive" "if=pflash,format=raw,readonly=true,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd"
+            "-drive" "if=pflash,format=raw,file=${tmpdir}/efivars.fd"
+        )
+        ;;
     *)
         printf "unknown hostname: %s\n" "${hostname}" >&2
         exit 1