From fd401b10fe76d6e84dc5950664978fd2793adf0a Mon Sep 17 00:00:00 2001
From: John Nats <dev@jnats.xyz>
Date: Sun, 9 May 2021 21:45:44 +0100
Subject: [PATCH] changed setup for kde liveiso

---
 crystal/airootfs/etc/buildstamp          |  2 +-
 crystal/airootfs/etc/doas.conf           |  2 --
 crystal/airootfs/etc/packages.x86_64     |  5 ++--
 crystal/airootfs/etc/pacman.d/mirrorlist | 32 +++++++-----------------
 crystal/airootfs/root/.profile           |  2 +-
 crystal/airootfs/root/.xinitrc           |  2 +-
 crystal/packages.x86_64                  |  5 ++--
 7 files changed, 16 insertions(+), 34 deletions(-)
 delete mode 100644 crystal/airootfs/etc/doas.conf

diff --git a/crystal/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp
index 522e448..5950922 100644
--- a/crystal/airootfs/etc/buildstamp
+++ b/crystal/airootfs/etc/buildstamp
@@ -1 +1 @@
-Built on 05/09/21 @ 00:13:45 EST
+Built on 05/09/21 @ 20:54:16 EST
diff --git a/crystal/airootfs/etc/doas.conf b/crystal/airootfs/etc/doas.conf
deleted file mode 100644
index d5a6a89..0000000
--- a/crystal/airootfs/etc/doas.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-permit persist root
-permit persist crystal
\ No newline at end of file
diff --git a/crystal/airootfs/etc/packages.x86_64 b/crystal/airootfs/etc/packages.x86_64
index 29db55a..283fca9 100644
--- a/crystal/airootfs/etc/packages.x86_64
+++ b/crystal/airootfs/etc/packages.x86_64
@@ -3,7 +3,6 @@ xorg-xinit
 reflector
 pacman-contrib
 nano
-doas
 linux-firmware
 tree
 cloud-init
@@ -12,7 +11,7 @@ mkinitcpio
 mkinitcpio-archiso
 openssh
 syslinux
-gnome
+plasma
 mesa
 
 # Things we're hosting
@@ -22,4 +21,4 @@ base
 crystal-misc
 crystal-cli-boot
 crystal-branding
-neofetch
\ No newline at end of file
+neofetch
diff --git a/crystal/airootfs/etc/pacman.d/mirrorlist b/crystal/airootfs/etc/pacman.d/mirrorlist
index 9ecf79e..c136403 100644
--- a/crystal/airootfs/etc/pacman.d/mirrorlist
+++ b/crystal/airootfs/etc/pacman.d/mirrorlist
@@ -2,29 +2,15 @@
 ################# Arch Linux mirrorlist generated by Reflector #################
 ################################################################################
 
-# With:       reflector @/etc/xdg/reflector/reflector.conf
-# When:       2021-05-05 03:24:13 UTC
+# With:       reflector --verbose --connection-timeout 2 --threads 10 --country 'United Kingdom' --latest 100 --age 24 --score 50 --sort rate --fastest 6 --save /etc/pacman.d/mirrorlist
+# When:       2021-05-07 10:52:13 UTC
 # From:       https://www.archlinux.org/mirrors/status/json/
-# Retrieved:  2021-05-05 03:22:27 UTC
-# Last Check: 2021-05-05 03:12:27 UTC
+# Retrieved:  2021-05-07 10:52:02 UTC
+# Last Check: 2021-05-07 10:35:17 UTC
 
-Server = https://america.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://arch.mirror.square-r00t.net/$repo/os/$arch
-Server = https://mirror.pkgbuild.com/$repo/os/$arch
-Server = https://europe.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://mirror.chaoticum.net/arch/$repo/os/$arch
 Server = https://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch
-Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = https://mirror.easylee.nl/archlinux/$repo/os/$arch
-Server = https://mirror.pseudoform.org/$repo/os/$arch
-Server = https://archmirror.it/repos/$repo/os/$arch
-Server = https://mirror.telepoint.bg/archlinux/$repo/os/$arch
-Server = https://asia.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://archlinux.thaller.ws/$repo/os/$arch
-Server = https://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch
-Server = https://mirror.lty.me/archlinux/$repo/os/$arch
-Server = https://ftp.sh.cvut.cz/arch/$repo/os/$arch
-Server = https://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
-Server = https://mirrors.neusoft.edu.cn/archlinux/$repo/os/$arch
-Server = https://arch.mirror.constant.com/$repo/os/$arch
-Server = https://arch.jensgutermuth.de/$repo/os/$arch
+Server = http://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch
+Server = rsync://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch
+Server = http://mirrors.manchester.m247.com/arch-linux/$repo/os/$arch
+Server = https://mirrors.melbourne.co.uk/archlinux/$repo/os/$arch
+Server = http://mirrors.melbourne.co.uk/archlinux/$repo/os/$arch
diff --git a/crystal/airootfs/root/.profile b/crystal/airootfs/root/.profile
index 896139b..0774c3d 100755
--- a/crystal/airootfs/root/.profile
+++ b/crystal/airootfs/root/.profile
@@ -1,3 +1,3 @@
 if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
   exec startx
-fi
\ No newline at end of file
+fi
diff --git a/crystal/airootfs/root/.xinitrc b/crystal/airootfs/root/.xinitrc
index d51b594..b508e5c 100755
--- a/crystal/airootfs/root/.xinitrc
+++ b/crystal/airootfs/root/.xinitrc
@@ -1,3 +1,3 @@
 #!/bin/bash
 export DESKTOP_SESSION=plasma
-exec startplasma-x11
\ No newline at end of file
+exec startplasma-x11
diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64
index 29db55a..283fca9 100644
--- a/crystal/packages.x86_64
+++ b/crystal/packages.x86_64
@@ -3,7 +3,6 @@ xorg-xinit
 reflector
 pacman-contrib
 nano
-doas
 linux-firmware
 tree
 cloud-init
@@ -12,7 +11,7 @@ mkinitcpio
 mkinitcpio-archiso
 openssh
 syslinux
-gnome
+plasma
 mesa
 
 # Things we're hosting
@@ -22,4 +21,4 @@ base
 crystal-misc
 crystal-cli-boot
 crystal-branding
-neofetch
\ No newline at end of file
+neofetch