diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67454d4..188a68a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,8 @@ jobs: id: build run: | # Set BUILD_DATE - export BUILD_DATE=$(date +'%m-%d-%g-%H-%M') + # 2022-09-29 + export BUILD_DATE=$(date +'%Y-%m-%d') # Make sure container is up-to-date pacman -Syu --needed --noconfirm diff --git a/chrooted-iso.sh b/chrooted-iso.sh index 5647ad4..56fda90 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -26,6 +26,12 @@ Type=Application Icon=nautilus Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /home/crystal/.config/autostart/no-lock-screen.desktop +# Set default session to Onyx +echo "[User] +Session=onyx +Icon=/var/lib/AccountsService/icons/crystal +SystemAccount=false" > /var/lib/AccountsService/users/crystal + # Jade-GUI Autostart cp \ /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ @@ -36,7 +42,10 @@ chown -R crystal:crystal /home/crystal/ chmod +x /home/crystal/.config/autostart/*.desktop # Services +systemctl enable vmtoolsd +systemctl enable vmware-vmblock-fuse systemctl enable NetworkManager +systemctl enable reflector systemctl enable gdm # Mirrorlist @@ -50,8 +59,4 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen echo "LANG=en_US.UTF-8" > /etc/locale.conf locale-gen -# Onyx as default gdm session -rm /usr/share/xsessions/gnome* -rm /usr/share/wayland-sessions/gnome* - echo "Configured the system. Exiting chroot." diff --git a/crystal/airootfs/etc/systemd/system/pacman-init.service b/crystal/airootfs/etc/systemd/system/pacman-init.service index afbb35e..33d69ce 100644 --- a/crystal/airootfs/etc/systemd/system/pacman-init.service +++ b/crystal/airootfs/etc/systemd/system/pacman-init.service @@ -9,11 +9,8 @@ After=etc-pacman.d-gnupg.mount [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/bin/bash -c "echo hi" ExecStart=/usr/bin/pacman-key --init ExecStart=/usr/bin/pacman-key --populate archlinux -ExecStart=/usr/bin/reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist -ExecStart=/usr/bin/sed -i 's/#Server/Server/g' /etc/pacman.d/mirrorlist [Install] diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64 index e58b457..201f917 100644 --- a/crystal/packages.x86_64 +++ b/crystal/packages.x86_64 @@ -1,11 +1,13 @@ # Arch packages arch-install-scripts +archlinux-keyring btrfs-progs cowsay curl curl dosfstools edk2-shell +gtkmm3 linux linux-firmware memtest86+ @@ -19,9 +21,20 @@ reflector syslinux systemd-sysvcompat tree +virtualbox-guest-utils +open-vm-tools xfsprogs zsh +# Fonts +noto-fonts +noto-fonts-emoji +noto-fonts-extra +noto-fonts-cjk + +# Networking +openvpn + # GUI Target firefox gdm @@ -30,6 +43,8 @@ gparted mesa spice-vdagent xorg +pipewire +pipewire-pulse # Things we're hosting base @@ -37,16 +52,16 @@ filesystem grub lsb-release neofetch -pfetch sudo # Our packages -amethyst +ame crystal-wallpapers +crystal-mirrorlist +crystal-keyring jade jade-gui # Text editors -micro nano vim diff --git a/crystal/pacman.conf b/crystal/pacman.conf index f642589..e42ecc0 100644 --- a/crystal/pacman.conf +++ b/crystal/pacman.conf @@ -73,10 +73,10 @@ RemoteFileSigLevel = Never # after the header, and they will be used before the default mirrors. [crystal-x86_64] -Server = https://repo.getcryst.al/x86_64/ +Include = /etc/pacman.d/crystal-mirrorlist [crystal-any] -Server = https://repo.getcryst.al/any/ +Include = /etc/pacman.d/crystal-mirrorlist #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/crystal/profiledef.sh b/crystal/profiledef.sh index f4e4598..77c15ec 100644 --- a/crystal/profiledef.sh +++ b/crystal/profiledef.sh @@ -2,10 +2,10 @@ # shellcheck disable=SC2034 iso_name="crystal-live" -iso_label="CRYS_$(date +%Y%m)" +iso_label="CRYS_$(date +'%Y-%m-%d')" iso_publisher="Crystal Linux " iso_application="Crystal Linux Live" -iso_version="$(date +"%m-%d-%g-%H-%M")" +iso_version="$(date +'%Y-%m-%d')" install_dir="arch" bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="x86_64"