From e6a456aba60a0297ed9e9f1cb40157316be599fd Mon Sep 17 00:00:00 2001
From: Celestia Ludenberg <ash8820@proton.me>
Date: Sat, 27 Jun 2026 18:15:49 +0200
Subject: [PATCH] ci: copy pacman.conf to both user and system dirs; fix vi
 provider ambiguity

---
 .github/workflows/build.yml     | 9 ++++++---
 iso-profiles/common/common.yaml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eacac54..2614332 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,13 +40,16 @@ jobs:
 
     - name: Override pacman.conf with antergos-pkgs repo
       run: |
-        mkdir -p ~/.config/artools/pacman.conf.d
+        mkdir -p /root/.config/artools/pacman.conf.d
         cp "pacman.conf.d/iso-x86_64.conf" \
-           ~/.config/artools/pacman.conf.d/iso-x86_64.conf
+           /root/.config/artools/pacman.conf.d/iso-x86_64.conf
+        # Also override the default in case USER_CONF_DIR differs
+        cp "pacman.conf.d/iso-x86_64.conf" \
+           /usr/share/artools/pacman.conf.d/iso-x86_64.conf
 
     - name: Build ISO
       run: |
-        sudo -E buildiso -p antergos
+        buildiso -p antergos
 
     - name: Upload ISO artifact
       uses: actions/upload-artifact@v4
diff --git a/iso-profiles/common/common.yaml b/iso-profiles/common/common.yaml
index 26d5f88..09a7f57 100644
--- a/iso-profiles/common/common.yaml
+++ b/iso-profiles/common/common.yaml
@@ -46,7 +46,7 @@ packages-base:
   - sysfsutils
   - texinfo
   - usbutils
-  - vi
+  - ex-vi-compat
   - which
   - xfsprogs
   - zsh