diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ad71d5..58c4adc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: build +name: Build ISO on: push: branches: @@ -15,7 +15,7 @@ jobs: steps: - name: Build run: | - pacman -Syu --needed --noconfirm && pacman -S git --needed --noconfirm && git clone https://github.com/crystalux-project/iso/ && cd iso && bash deps.sh && bash build_iso.sh + pacman -Syu --needed --noconfirm && pacman -S git archiso pacman-contrib --needed --noconfirm && git clone https://github.com/crystalux-project/iso/ && cd iso && bash build_iso.sh - name: Get current date id: date diff --git a/chrooted.sh b/chrooted.sh index e4b3848..b2cc1a6 100644 --- a/chrooted.sh +++ b/chrooted.sh @@ -7,6 +7,7 @@ echo "CrystalLive" > /etc/hostname #reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist echo "sudo reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup chmod +x /usr/bin/mirrorsetup + # We don't add crystal until here so that our packages which change # /etc/skel have been installed already useradd -m crystal @@ -17,17 +18,20 @@ if [[ -d /etc/crystal/bootopts ]]; then chmod +x /etc/crystal/bootopts/* fi +echo "exec startplasma-x11" > /home/crystal/.xinitrc +cat >> /home/crystal/.zshrc << EOF +PROMPT="%n@%m %~ %# " +alias paste="nc termbin.com 9999" +menu +EOF + chown -R crystal:crystal /home/crystal/ chmod +x /home/crystal/.xinitrc systemctl enable NetworkManager -# IDK if we even *should* auto-set the theme -#sudo -u crystal lookandfeeltool -a org.kde.breezedark.desktop - # i'm tired ok echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen locale-gen echo "LANG=en_US.UTF-8" > /etc/locale.conf -ln -sf /usr/bin/amethyst /usr/bin/ame echo "Configured the system. Exiting chroot." diff --git a/crystal/airootfs/home/crystal/.xinitrc b/crystal/airootfs/home/crystal/.xinitrc deleted file mode 100755 index 6ea224c..0000000 --- a/crystal/airootfs/home/crystal/.xinitrc +++ /dev/null @@ -1 +0,0 @@ -exec startplasma-x11 diff --git a/crystal/airootfs/home/crystal/.zshrc b/crystal/airootfs/home/crystal/.zshrc deleted file mode 100644 index 8a06b24..0000000 --- a/crystal/airootfs/home/crystal/.zshrc +++ /dev/null @@ -1,3 +0,0 @@ -PROMPT="%n@%m %~ %# " -alias paste="nc termbin.com 9999" -menu diff --git a/deps.sh b/deps.sh deleted file mode 100644 index 76068c6..0000000 --- a/deps.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/bash - -pacman -Syu --needed --noconfirm -pacman -S archiso pacman-contrib --noconfirm