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] 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