sanitised all of this

build_iso.sh

@@ -10,50 +10,17 @@ else
     fi
 fi
 
-if [[ "$2" == "testing" ]]; then
+cp pacman.def crystal/pacman.conf
-    cp pacman.testing crystal/pacman.conf
-else
-    cp pacman.def crystal/pacman.conf
-fi
-
-if [[ -f aur-pkgs ]]; then
-    if [[ ! -d repo ]]; then
-        mkdir repo
-        mkdir temp
-        for pkg in "$(cat aur-pkgs)"; do
-            pushd temp
-            git clone https://aur.archlinux.org/$pkg.git
-            pushd $pkg
-            makepkg -sf --skippgpcheck
-            cp *.pkg.tar.zst ../../repo/.
-            popd
-            popd
-        done
-        rm -rf temp/
-        pushd repo
-        repo-add aur.db.tar.gz *.pkg.tar.*
-        MP=$(pwd)
-        popd
-
-        echo >> crystal/packages.x86_64
-        for pkg in "$(cat aur-pkgs)"; do
-            echo "${pkg}" >> crystal/packages.x86_64
-        done
-
-    fi
-
-        echo "[aur]" >> crystal/pacman.conf
-        echo "SigLevel = Never" >> crystal/pacman.conf
-        echo "Server = file://${MP}" >> crystal/pacman.conf
-
-fi
-
-# idk if this would've happened automatically?
 cp crystal/pacman.conf crystal/airootfs/etc/.
+
 cp crystal/packages.x86_64 crystal/airootfs/etc/packages.x86_64
 cp /etc/pacman.d/mirrorlist crystal/airootfs/etc/pacman.d/.
+
 echo "Built on $(date +"%D @ %T EST")" > crystal/airootfs/etc/buildstamp
+
 cp chrooted-iso.sh chrooted.sh
+
 time sudo ./mkarchiso -v -w $WORKDIR -o . crystal
+
 sudo rm -rf $WORKDIR
 sudo chown $USER:$USER *.iso

chrooted-iso.sh

@@ -3,7 +3,7 @@
 # This file is run via mkarchiso while chrooted as the new system
 echo "chrooted in the new system, running as $(whoami)"
 
-echo "CrystalLive" > /etc/hostname
+echo "crystal-live" > /etc/hostname
 echo "reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup
 chmod +x /usr/bin/mirrorsetup
 

crystal/bootstrap_packages.x86_64

@@ -21,4 +21,4 @@ arch-install-scripts
 ame
 base
 filesystem
-pfetch
+pfetch

crystal/packages.x86_64

@@ -20,10 +20,11 @@ dosfstools
 systemd-sysvcompat
 cowsay
 btrfs-progs
+xfsprogs
 
 # Things we're hosting
 arch-install-scripts
-ame
+amethyst
 base
 filesystem
 citrine

crystal/profiledef.sh

@@ -3,7 +3,7 @@
 
 iso_name="crystal-live"
 iso_label="CRYS_$(date +%Y%m)"
-iso_publisher="Crystal Linux <https://github.com/crystal-linux>"
+iso_publisher="Crystal Linux <https://getcryst.al>"
 iso_application="Crystal Linux Live"
 iso_version="$(date +"%m-%d-%g-%H-%M")"
 install_dir="arch"

pacman.def

@@ -72,13 +72,13 @@ RemoteFileSigLevel = Never
 # after the header, and they will be used before the default mirrors.
 
 [crystal-x86_64]
-Server = https://repo.getcryst.al/main/$arch/
+Server = https://repo.getcryst.al/x86_64/
 
 [crystal-any]
-Server = https://repo.getcryst.al/main/any/
+Server = https://repo.getcryst.al/any/
 
 [crystal-extra]
-Server = https://repo.getcryst.al/main/extra/
+Server = https://repo.getcryst.al/extra/
 
 #[testing]
 #Include = /etc/pacman.d/mirrorlist

pacman.testing

@@ -1,111 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-Color
-ILoveCandy
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Never
-LocalFileSigLevel = Never
-RemoteFileSigLevel = Never
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[crystal-x86_64]
-Server = https://repo.getcryst.al/testing/$arch/
-
-[crystal-any]
-Server = https://repo.getcryst.al/testing/any
-
-[crystal-extra]
-Server = https://repo.getcryst.al/testing/extra
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs