From 09913880e6c8d5281b9bf710d43f7b649220f343 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Mon, 27 Oct 2025 17:04:20 -0400
Subject: [PATCH] Add omarchy-keyring and keys

---
 builder/archinstall.packages               | 1 +
 builder/build-iso.sh                       | 7 ++++++-
 configs/airootfs/root/.automated_script.sh | 1 +
 configs/airootfs/root/configurator         | 3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/builder/archinstall.packages b/builder/archinstall.packages
index 6b71a7c..bd022ab 100644
--- a/builder/archinstall.packages
+++ b/builder/archinstall.packages
@@ -7,6 +7,7 @@ intel-ucode
 linux-firmware
 linux
 limine
+omarchy-keyring
 openssh
 pipewire
 snapper
diff --git a/builder/build-iso.sh b/builder/build-iso.sh
index 916eb14..0310d57 100755
--- a/builder/build-iso.sh
+++ b/builder/build-iso.sh
@@ -7,6 +7,11 @@ pacman-key --init
 pacman --noconfirm -Sy archlinux-keyring
 pacman --noconfirm -Sy archiso git sudo base-devel jq grub
 
+# Install omarchy-keyring for package verification during build
+# The [omarchy] repo is defined in /configs/pacman-online.conf with SigLevel = Optional TrustAll
+pacman --config /configs/pacman-online.conf --noconfirm -Sy omarchy-keyring
+pacman-key --populate omarchy
+
 # Setup build locations
 build_cache_dir="/var/cache"
 offline_mirror_dir="$build_cache_dir/airootfs/var/cache/omarchy/mirror/offline"
@@ -58,7 +63,7 @@ mkdir -p "$build_cache_dir/airootfs/opt/packages/"
 cp "/tmp/$NODE_FILENAME" "$build_cache_dir/airootfs/opt/packages/"
 
 # Add our additional packages to packages.x86_64
-arch_packages=(linux-t2 git gum jq openssl plymouth tzupdate)
+arch_packages=(linux-t2 git gum jq openssl plymouth tzupdate omarchy-keyring)
 printf '%s\n' "${arch_packages[@]}" >>"$build_cache_dir/packages.x86_64"
 
 # Build list of all the packages needed for the offline mirror
diff --git a/configs/airootfs/root/.automated_script.sh b/configs/airootfs/root/.automated_script.sh
index 2265c31..cccab4d 100644
--- a/configs/airootfs/root/.automated_script.sh
+++ b/configs/airootfs/root/.automated_script.sh
@@ -71,6 +71,7 @@ install_base_system() {
   # Initialize and populate the keyring
   pacman-key --init
   pacman-key --populate archlinux
+  pacman-key --populate omarchy
 
   # Sync the offline database so pacman can find packages
   pacman -Sy --noconfirm
diff --git a/configs/airootfs/root/configurator b/configs/airootfs/root/configurator
index 2bf2ed7..3a7d042 100644
--- a/configs/airootfs/root/configurator
+++ b/configs/airootfs/root/configurator
@@ -383,7 +383,8 @@ cat <<-_EOF_ >user_configuration.json
     },
     "packages": [
         "base-devel",
-        "git"
+        "git",
+        "omarchy-keyring"
     ],
     "profile_config": {
         "gfx_driver": null,