From b4d1d4fca22e56df7edf76b5eccbcc4029e5d7cb Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 00:34:07 +0100
Subject: [PATCH 01/16] cleanup

---
 .gitignore                        |  7 +------
 build_iso.sh                      |  4 ----
 chrooted.sh                       | 26 ++++++++++++++++++++++++++
 crystal/airootfs/etc/buildstamp   |  2 +-
 pacman.def => crystal/pacman.conf |  0
 trigger_build                     |  1 -
 6 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100755 chrooted.sh
 rename pacman.def => crystal/pacman.conf (100%)
 delete mode 100644 trigger_build

diff --git a/.gitignore b/.gitignore
index a24d8a6..8fd2cf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
 *.iso
-*.tar.gz
-sysroot/
-sysroot.*
-crystal/pacman.conf
 crystal/airootfs/etc/pacman.conf
-repo/
-chrooted.sh
\ No newline at end of file
+crystal/airootfs/etc/buildstamp
diff --git a/build_iso.sh b/build_iso.sh
index 535841e..977cc30 100755
--- a/build_iso.sh
+++ b/build_iso.sh
@@ -10,10 +10,6 @@ else
     fi
 fi
 
-# Copy pacman config to the airootfs
-cp crystal/pacman.conf crystal/.
-cp crystal/packages.x86_64 crystal/.
-
 echo "Built on $(date +"%D @ %T EST")" > crystal/airootfs/etc/buildstamp
 
 time sudo ./mkarchiso -v -w $WORKDIR -o . crystal
diff --git a/chrooted.sh b/chrooted.sh
new file mode 100755
index 0000000..b820478
--- /dev/null
+++ b/chrooted.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+echo "Chrooted in the new system, running as $(whoami)"
+
+# User setup
+useradd -mG wheel crystal
+usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal
+usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root
+chsh -s /usr/bin/zsh crystal
+
+# Desktop icon for Jade's GUI
+mkdir -p /home/crystal/Desktop
+cp /usr/share/applications/Jade.desktop /home/crystal/Desktop/Install.desktop
+chown -R crystal:crystal /home/crystal/
+
+# Services
+systemctl enable NetworkManager
+systemctl enable reflector
+systemctl enable gdm
+systemctl enable jade-gui
+
+# Hostname and Locale
+echo "crystal-live" > /etc/hostname
+echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+locale-gen
+echo "LANG=en_US.UTF-8" > /etc/locale.conf
+echo "Configured the system. Exiting chroot."
diff --git a/crystal/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp
index 0b506eb..227fcae 100644
--- a/crystal/airootfs/etc/buildstamp
+++ b/crystal/airootfs/etc/buildstamp
@@ -1 +1 @@
-Built on 07/29/22 @ 23:50:24 EST
+Built on 07/30/22 @ 00:03:09 EST
diff --git a/pacman.def b/crystal/pacman.conf
similarity index 100%
rename from pacman.def
rename to crystal/pacman.conf
diff --git a/trigger_build b/trigger_build
deleted file mode 100644
index 36a166f..0000000
--- a/trigger_build
+++ /dev/null
@@ -1 +0,0 @@
-21/06/2022 - from now on commit to this file to trigger a build lol, think of it like a weird message board - michal

From e18d5b549cf7a4a3eb32be9690b5b68c2b9e23d5 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 01:05:16 +0100
Subject: [PATCH 02/16] Add time warning to jade-gui service desc

---
 crystal/airootfs/etc/systemd/system/jade-gui.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crystal/airootfs/etc/systemd/system/jade-gui.service b/crystal/airootfs/etc/systemd/system/jade-gui.service
index bbe16b1..ac8c902 100644
--- a/crystal/airootfs/etc/systemd/system/jade-gui.service
+++ b/crystal/airootfs/etc/systemd/system/jade-gui.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Installs Jade's GUI counterpart
+Description=Installing Jade's GUI counterpart (This may take a while)
 Before=gdm.service
 
 [Service]

From 8d1b3e12b45fcc7d3a0bd4fe37f4924df448c829 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:07:44 +0100
Subject: [PATCH 03/16] Fixed installation of jade-gui flatpak on ISO

---
 chrooted.sh                                          |  4 +++-
 crystal/airootfs/etc/buildstamp                      |  2 +-
 crystal/airootfs/etc/systemd/system/jade-gui.service | 12 ------------
 inject.sh                                            |  2 +-
 4 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 crystal/airootfs/etc/systemd/system/jade-gui.service

diff --git a/chrooted.sh b/chrooted.sh
index b820478..1ac9868 100755
--- a/chrooted.sh
+++ b/chrooted.sh
@@ -7,6 +7,9 @@ usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal
 usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root
 chsh -s /usr/bin/zsh crystal
 
+# Install Jade's GUI
+flatpak install -y --noninteractive /usr/share/jade-gui/jade-gui.flatpak
+
 # Desktop icon for Jade's GUI
 mkdir -p /home/crystal/Desktop
 cp /usr/share/applications/Jade.desktop /home/crystal/Desktop/Install.desktop
@@ -16,7 +19,6 @@ chown -R crystal:crystal /home/crystal/
 systemctl enable NetworkManager
 systemctl enable reflector
 systemctl enable gdm
-systemctl enable jade-gui
 
 # Hostname and Locale
 echo "crystal-live" > /etc/hostname
diff --git a/crystal/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp
index 227fcae..645edd7 100644
--- a/crystal/airootfs/etc/buildstamp
+++ b/crystal/airootfs/etc/buildstamp
@@ -1 +1 @@
-Built on 07/30/22 @ 00:03:09 EST
+Built on 07/30/22 @ 11:52:24 EST
diff --git a/crystal/airootfs/etc/systemd/system/jade-gui.service b/crystal/airootfs/etc/systemd/system/jade-gui.service
deleted file mode 100644
index ac8c902..0000000
--- a/crystal/airootfs/etc/systemd/system/jade-gui.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Installing Jade's GUI counterpart (This may take a while)
-Before=gdm.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/mount -o remount,size=2G /run/archiso/cowspace
-ExecStart=/bin/flatpak install -y --noninteractive /usr/share/jade-gui/jade-gui.flatpak
-
-[Install]
-WantedBy=multi-user.target
diff --git a/inject.sh b/inject.sh
index dece4e4..8268f48 100755
--- a/inject.sh
+++ b/inject.sh
@@ -6,7 +6,7 @@ echo "Chrooting to $1, and running chrooted.sh"
 cp chrooted.sh ${1}/.
 cp crystal/pacman.conf ${1}/.
 chmod +x ${1}/chrooted.sh
-chroot $1 /bin/bash -c ./chrooted.sh
+arch-chroot $1 /bin/bash -c ./chrooted.sh
 rm ${1}/chrooted.sh
 
 echo "inject.sh completed."

From 53acdcb355d1efac55278dd51aa894bcb9bf3e1e Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:11:42 +0100
Subject: [PATCH 04/16] Cleaned up packages definition

---
 crystal/packages.x86_64 | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64
index 4c91efa..2aeb358 100644
--- a/crystal/packages.x86_64
+++ b/crystal/packages.x86_64
@@ -1,42 +1,42 @@
 # Arch packages
-archinstall
-arch-install-scripts
 arch-install-scripts
 btrfs-progs
 cowsay
 curl
+curl
 dosfstools
 edk2-shell
-firefox
-gdm
-gparted
 linux
 linux-firmware
 memtest86+
-mesa
 mkinitcpio
 mkinitcpio-archiso
 networkmanager
-zsh
-curl
 openbsd-netcat
 openssh
 pacman-contrib
 reflector
-spice-vdagent
 syslinux
 systemd-sysvcompat
 tree
 xfsprogs
-xorg
-xorg-apps
-xorg-xinit
 zsh
+zsh
+
+# GUI Target
+firefox
+gdm
+gnome
+gparted
+mesa
+spice-vdagent
+xorg
 
 # Things we're hosting
 base
 filesystem
 grub
+lsb-release
 neofetch
 pfetch
 sudo

From 3c4949e2e78e028024a3c5c2c762a000bbc96194 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:18:51 +0100
Subject: [PATCH 05/16] Consistency in syslinux conf

---
 crystal/syslinux/crystal_head.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crystal/syslinux/crystal_head.cfg b/crystal/syslinux/crystal_head.cfg
index 642b465..a49879a 100644
--- a/crystal/syslinux/crystal_head.cfg
+++ b/crystal/syslinux/crystal_head.cfg
@@ -1,6 +1,6 @@
 SERIAL 0 115200
 UI vesamenu.c32
-MENU TITLE Crystal
+MENU TITLE Crystal Linux
 MENU BACKGROUND splash.png
 
 MENU WIDTH 78

From 8b755a91e589dd02dc14b56455161222421c6c95 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:21:40 +0100
Subject: [PATCH 06/16] Removed mirrorlist in favor of letting reflector decide
 pacman mirrorlist at boot

---
 crystal/airootfs/etc/pacman.d/.keep      |  1 -
 crystal/airootfs/etc/pacman.d/mirrorlist | 15 ---------------
 2 files changed, 16 deletions(-)
 delete mode 100644 crystal/airootfs/etc/pacman.d/.keep
 delete mode 100644 crystal/airootfs/etc/pacman.d/mirrorlist

diff --git a/crystal/airootfs/etc/pacman.d/.keep b/crystal/airootfs/etc/pacman.d/.keep
deleted file mode 100644
index 4a31a76..0000000
--- a/crystal/airootfs/etc/pacman.d/.keep
+++ /dev/null
@@ -1 +0,0 @@
-#heeho
\ No newline at end of file
diff --git a/crystal/airootfs/etc/pacman.d/mirrorlist b/crystal/airootfs/etc/pacman.d/mirrorlist
deleted file mode 100644
index a6a19a4..0000000
--- a/crystal/airootfs/etc/pacman.d/mirrorlist
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-################# Arch Linux mirrorlist generated by Reflector #################
-################################################################################
-
-# With:       reflector @/etc/xdg/reflector/reflector.conf
-# When:       2022-07-29 20:11:36 UTC
-# From:       https://archlinux.org/mirrors/status/json/
-# Retrieved:  2022-07-29 20:11:36 UTC
-# Last Check: 2022-07-29 19:49:23 UTC
-
-Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch
-Server = https://america.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://europe.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://sydney.mirror.pkgbuild.com/$repo/os/$arch

From 3c2baabaa2a5677f1ac20e1e10188d587b7c68e3 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:24:29 +0100
Subject: [PATCH 07/16] Cleaned up .zshrc

---
 crystal/airootfs/etc/skel/.zshrc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/crystal/airootfs/etc/skel/.zshrc b/crystal/airootfs/etc/skel/.zshrc
index e646e8c..e506332 100644
--- a/crystal/airootfs/etc/skel/.zshrc
+++ b/crystal/airootfs/etc/skel/.zshrc
@@ -1,11 +1,15 @@
 PROMPT="%n@%m %~ %# "
 
-main() {
-  clear
-  pfetch
+credentials() {
   echo "Live Credentials -"
   echo "crystal: crystal // root: crystal"
   echo
+}
+
+main() {
+  clear
+  pfetch
+  credentials
   cowsay \
     "Don't forget to set up Wi-Fi in the Settings app if required!"
 }

From 04e4892e55bc555ce8c0583c775712001625c5d8 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:24:59 +0100
Subject: [PATCH 08/16] Removed useless Defaults in sudoers

---
 crystal/airootfs/etc/sudoers | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crystal/airootfs/etc/sudoers b/crystal/airootfs/etc/sudoers
index 759d5be..fe78cdb 100644
--- a/crystal/airootfs/etc/sudoers
+++ b/crystal/airootfs/etc/sudoers
@@ -1,5 +1,4 @@
 Defaults env_keep += "PATH"
-Defaults insults
 
 root ALL=(ALL) NOPASSWD: ALL
 %wheel ALL=(ALL) NOPASSWD: ALL
\ No newline at end of file

From 8419431845da3976f5091a8422c67132b25f6f2f Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:27:01 +0100
Subject: [PATCH 09/16] Removed empty services

---
 .../systemd/system/cloud-init.target.wants/cloud-config.service  | 1 -
 .../systemd/system/cloud-init.target.wants/cloud-final.service   | 1 -
 .../system/cloud-init.target.wants/cloud-init-local.service      | 1 -
 .../systemd/system/cloud-init.target.wants/cloud-init.service    | 1 -
 4 files changed, 4 deletions(-)
 delete mode 120000 crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service
 delete mode 120000 crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service
 delete mode 120000 crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service
 delete mode 120000 crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service

diff --git a/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service
deleted file mode 120000
index ebc50f0..0000000
--- a/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/cloud-config.service
\ No newline at end of file
diff --git a/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service
deleted file mode 120000
index 80fa3c8..0000000
--- a/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/cloud-final.service
\ No newline at end of file
diff --git a/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service
deleted file mode 120000
index dd8e9f1..0000000
--- a/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/cloud-init-local.service
\ No newline at end of file
diff --git a/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
deleted file mode 120000
index 24c7a26..0000000
--- a/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/cloud-init.service
\ No newline at end of file

From b93568746d8ed42a78a090214547ffd27c89014d Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:28:10 +0100
Subject: [PATCH 10/16] Removed useless getty autologin, gdm handles autologin
 now

---
 .../etc/systemd/system/getty@tty1.service.d/autologin.conf     | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 crystal/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf

diff --git a/crystal/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/crystal/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf
deleted file mode 100644
index 39378dd..0000000
--- a/crystal/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin crystal --noclear %I 38400 linux
\ No newline at end of file

From caab18d6cd2124888c734586040bab835dd6b4d6 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:39:53 +0100
Subject: [PATCH 11/16] stopped tracking buildstamp

---
 crystal/airootfs/etc/buildstamp | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 crystal/airootfs/etc/buildstamp

diff --git a/crystal/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp
deleted file mode 100644
index 645edd7..0000000
--- a/crystal/airootfs/etc/buildstamp
+++ /dev/null
@@ -1 +0,0 @@
-Built on 07/30/22 @ 11:52:24 EST

From a091424bcc35ac4d1e7ac51b36486ac7b524be15 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 12:54:50 +0100
Subject: [PATCH 12/16] Added schema to disable lock screen in GNOME

---
 chrooted.sh                                        |  1 +
 .../etc/systemd/system/crystal-gschema.service     | 14 ++++++++++++++
 .../schemas/99_crystal-iso.gschema.override        |  2 ++
 3 files changed, 17 insertions(+)
 create mode 100644 crystal/airootfs/etc/systemd/system/crystal-gschema.service
 create mode 100644 crystal/airootfs/usr/share/glib-2.0/schemas/99_crystal-iso.gschema.override

diff --git a/chrooted.sh b/chrooted.sh
index 1ac9868..394bfd9 100755
--- a/chrooted.sh
+++ b/chrooted.sh
@@ -19,6 +19,7 @@ chown -R crystal:crystal /home/crystal/
 systemctl enable NetworkManager
 systemctl enable reflector
 systemctl enable gdm
+systemctl enable crystal-gschema
 
 # Hostname and Locale
 echo "crystal-live" > /etc/hostname
diff --git a/crystal/airootfs/etc/systemd/system/crystal-gschema.service b/crystal/airootfs/etc/systemd/system/crystal-gschema.service
new file mode 100644
index 0000000..e5d9bd8
--- /dev/null
+++ b/crystal/airootfs/etc/systemd/system/crystal-gschema.service
@@ -0,0 +1,14 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[Unit]
+Description=Builds Crystal ISO GSchemas
+Before=gdm.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+
+[Install]
+WantedBy=graphical.target
diff --git a/crystal/airootfs/usr/share/glib-2.0/schemas/99_crystal-iso.gschema.override b/crystal/airootfs/usr/share/glib-2.0/schemas/99_crystal-iso.gschema.override
new file mode 100644
index 0000000..8234fef
--- /dev/null
+++ b/crystal/airootfs/usr/share/glib-2.0/schemas/99_crystal-iso.gschema.override
@@ -0,0 +1,2 @@
+[org.gnome.desktop.screensaver]
+lock-enabled=true
\ No newline at end of file

From 298d6595f1c429a3d6d493072e9c830dd94f2784 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 14:39:13 +0100
Subject: [PATCH 13/16] Moved GSchema Compilation to chrooted.sh

---
 chrooted.sh                                        |  4 +++-
 .../etc/systemd/system/crystal-gschema.service     | 14 --------------
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 crystal/airootfs/etc/systemd/system/crystal-gschema.service

diff --git a/chrooted.sh b/chrooted.sh
index 394bfd9..90abd19 100755
--- a/chrooted.sh
+++ b/chrooted.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 echo "Chrooted in the new system, running as $(whoami)"
 
+# Compile GSchemas
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
 # User setup
 useradd -mG wheel crystal
 usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal
@@ -19,7 +22,6 @@ chown -R crystal:crystal /home/crystal/
 systemctl enable NetworkManager
 systemctl enable reflector
 systemctl enable gdm
-systemctl enable crystal-gschema
 
 # Hostname and Locale
 echo "crystal-live" > /etc/hostname
diff --git a/crystal/airootfs/etc/systemd/system/crystal-gschema.service b/crystal/airootfs/etc/systemd/system/crystal-gschema.service
deleted file mode 100644
index e5d9bd8..0000000
--- a/crystal/airootfs/etc/systemd/system/crystal-gschema.service
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[Unit]
-Description=Builds Crystal ISO GSchemas
-Before=gdm.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
-[Install]
-WantedBy=graphical.target

From e810f64d9f89fe523fc6d05b45394b66d677c5f7 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 16:05:10 +0100
Subject: [PATCH 14/16] Temp thing while lockscreen still happens

---
 chrooted.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chrooted.sh b/chrooted.sh
index 90abd19..89f0a3f 100755
--- a/chrooted.sh
+++ b/chrooted.sh
@@ -6,6 +6,7 @@ glib-compile-schemas /usr/share/glib-2.0/schemas
 
 # User setup
 useradd -mG wheel crystal
+usermod -c "Password: \"crystal\"" crystal
 usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal
 usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root
 chsh -s /usr/bin/zsh crystal

From 2dbfaf4f0540877c96dbbb73688ef02591e30d23 Mon Sep 17 00:00:00 2001
From: Michal <michal@tar.black>
Date: Sat, 30 Jul 2022 18:43:38 +0100
Subject: [PATCH 15/16] Fixed mirrorlist and desktop icon

---
 chrooted.sh                                           |  8 +++++---
 .../airootfs/etc/systemd/system/mirrorlist.service    | 11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 crystal/airootfs/etc/systemd/system/mirrorlist.service

diff --git a/chrooted.sh b/chrooted.sh
index 89f0a3f..02f2022 100755
--- a/chrooted.sh
+++ b/chrooted.sh
@@ -6,7 +6,7 @@ glib-compile-schemas /usr/share/glib-2.0/schemas
 
 # User setup
 useradd -mG wheel crystal
-usermod -c "Password: \"crystal\"" crystal
+usermod -c "Password // \"crystal\"" crystal
 usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal
 usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root
 chsh -s /usr/bin/zsh crystal
@@ -16,12 +16,14 @@ flatpak install -y --noninteractive /usr/share/jade-gui/jade-gui.flatpak
 
 # Desktop icon for Jade's GUI
 mkdir -p /home/crystal/Desktop
-cp /usr/share/applications/Jade.desktop /home/crystal/Desktop/Install.desktop
+cp \
+  /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \
+  /home/crystal/Desktop/Install.desktop
 chown -R crystal:crystal /home/crystal/
 
 # Services
 systemctl enable NetworkManager
-systemctl enable reflector
+systemctl enable mirrorlist
 systemctl enable gdm
 
 # Hostname and Locale
diff --git a/crystal/airootfs/etc/systemd/system/mirrorlist.service b/crystal/airootfs/etc/systemd/system/mirrorlist.service
new file mode 100644
index 0000000..fcf9b44
--- /dev/null
+++ b/crystal/airootfs/etc/systemd/system/mirrorlist.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Generates Base Crystal ISO Mirrorlist
+Requires=network-online.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/bash -c "reflector > /etc/pacman.d/mirrorlist"
+
+[Install]
+WantedBy=multi-user.target

From d93972dfee9d907806fe5e9cef4722064fe40f40 Mon Sep 17 00:00:00 2001
From: axtloss <axtlos@tar.black>
Date: Fri, 5 Aug 2022 20:09:36 +0200
Subject: [PATCH 16/16] Remove onyx from package list

---
 crystal/packages.x86_64 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64
index 2aeb358..cb1ef68 100644
--- a/crystal/packages.x86_64
+++ b/crystal/packages.x86_64
@@ -21,7 +21,6 @@ systemd-sysvcompat
 tree
 xfsprogs
 zsh
-zsh
 
 # GUI Target
 firefox
@@ -46,7 +45,6 @@ amethyst
 crystal-wallpapers
 jade
 jade-gui
-onyx
 
 # Text editors
 micro