Merge branch 'development' into main

main
Michal 2 years ago committed by GitHub
commit 7a4a19b433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,25 +0,0 @@
#!/usr/bin/env bash
rm -fv *.iso
if [[ "$1" == "" ]]; then
WORKDIR=$(mktemp -d)
else
WORKDIR="$1"
if [[ ! -d "$WORKDIR" ]]; then
mkdir -p "$WORKDIR"
fi
fi
cp pacman.def crystal/pacman.conf
cp crystal/pacman.conf crystal/airootfs/etc/.
cp crystal/packages.x86_64 crystal/airootfs/etc/packages.x86_64
cp /etc/pacman.d/mirrorlist crystal/airootfs/etc/pacman.d/.
echo "Built on $(date +"%D @ %T EST")" > crystal/airootfs/etc/buildstamp
cp chrooted-bootstrp.sh chrooted.sh
time sudo ./mkarchiso -m bootstrap -v -w $WORKDIR -o . crystal
sudo rm -rf $WORKDIR
sudo chown $USER:$USER *.iso

@ -10,15 +10,12 @@ else
fi
fi
cp pacman.def crystal/pacman.conf
cp crystal/pacman.conf crystal/airootfs/etc/.
cp crystal/packages.x86_64 crystal/airootfs/etc/packages.x86_64
cp /etc/pacman.d/mirrorlist crystal/airootfs/etc/pacman.d/.
# 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
cp chrooted-iso.sh chrooted.sh
time sudo ./mkarchiso -v -w $WORKDIR -o . crystal
sudo rm -rf $WORKDIR

@ -1,35 +0,0 @@
#!/bin/bash
# This file is run via mkarchiso while chrooted as the new system
echo "chrooted in the new system, running as $(whoami)"
echo "CrystalLive" > /etc/hostname
echo "reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup
chmod +x /usr/bin/mirrorsetup
cp /pacman.conf /etc/pacman.conf
# We don't add crystal until here so that our packages which change
# /etc/skel have been installed already
useradd -m 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
cat >> /home/crystal/.zshrc << EOF
PROMPT="%n@%m %~ %# "
alias paste="nc termbin.com 9999"
clear
pfetch
EOF
echo "zsh" > /home/crystal/.bashrc
chown -R crystal:crystal /home/crystal/
systemctl enable NetworkManager
# 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
echo "Configured the system. Exiting chroot."

@ -1,52 +0,0 @@
#!/bin/bash
# This file is run via mkarchiso while chrooted as the new system
echo "chrooted in the new system, running as $(whoami)"
echo "crystal-live" > /etc/hostname
echo "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
usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal
usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root
chsh -s /usr/bin/zsh crystal
cat >> /home/crystal/.zshrc << EOF
PROMPT="%n@%m %~ %# "
alias paste="nc termbin.com 9999"
clear
pfetch
echo "live credentials -"
echo "crystal:crystal // root:crystal"
echo
alias nmtui="nmtui && source .zshrc"
cowsay "don't forget to set up wifi in the settings app if required."
if [[ -z "\$DISPLAY" ]]; then
gsettings set org.gnome.desktop.interface gtk-theme "crystal-obsidian"
gsettings set org.gnome.desktop.interface icon-theme "crystal-obsidian-icons"
gsettings set org.gnome.desktop.background picture-uri "file:///usr/share/backgrounds/crystal/extended logo.png"
startx
fi
EOF
cat >> /home/crystal/.xinitrc << EOF
export XDG_CURRENT_DESKTOP=Budgie:GNOME
exec budgie-desktop
EOF
echo "zsh" > /home/crystal/.bashrc
mkdir -p /home/crystal/Desktop
cp /usr/share/applications/Jade.desktop /home/crystal/Desktop/Install.desktop
chown -R crystal:crystal /home/crystal/
systemctl enable NetworkManager
# 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
echo "Configured the system. Exiting chroot."

@ -1 +1 @@
Built on 02/03/22 @ 01:03:31 EST
Built on 07/29/22 @ 23:50:24 EST

@ -0,0 +1,3 @@
[daemon]
AutomaticLoginEnable=true
AutomaticLogin=crystal

@ -10,7 +10,6 @@ openssh
syslinux
networkmanager
zsh
ckbcomp
curl
openbsd-netcat
memtest86+
@ -38,13 +37,14 @@ pfetch
grub
# Our in-house
jade-gui
jade
onyx
amethyst
citrine
crystal-wallpapers
# Text editors (issue #2)
nano
micro
vim
vim

@ -3,28 +3,13 @@
################################################################################
# With: reflector @/etc/xdg/reflector/reflector.conf
# When: 2021-05-05 03:24: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
# 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://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 = https://geo.mirror.pkgbuild.com/$repo/os/$arch
Server = https://sydney.mirror.pkgbuild.com/$repo/os/$arch

@ -1,5 +1,5 @@
polkit.addRule(function(action, subject){
if (subject.isInGroup("crystal")) {
if (subject.isInGroup("wheel")) {
return polkit.Result.YES;
}
));
});

@ -0,0 +1,13 @@
PROMPT="%n@%m %~ %# "
main() {
clear
pfetch
echo "Live Credentials -"
echo "crystal: crystal // root: crystal"
echo
cowsay \
"Don't forget to set up Wi-Fi in the Settings app if required!"
}
main

@ -1,3 +1,5 @@
root ALL=(ALL) ALL
crystal ALL=(ALL) NOPASSWD: ALL
Defaults env_keep += "QTDIR PATH QT_PLUGIN_PATH QT_INCLUDE_PATH QML2_IMPORT_PATH KDE_SESSION_VERSION KDE_FULL_SESSION"
Defaults env_keep += "PATH"
Defaults insults
root ALL=(ALL) NOPASSWD: ALL
%wheel ALL=(ALL) NOPASSWD: ALL

@ -0,0 +1,12 @@
[Unit]
Description=Installs Jade's GUI counterpart
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

@ -1,33 +0,0 @@
arch-install-scripts
reflector
pacman-contrib
nano
linux-firmware
tree
linux
mkinitcpio
mkinitcpio-archiso
openssh
grub
networkmanager
zsh
ckbcomp
curl
openbsd-netcat
edk2-shell
sudo
systemd-sysvcompat
# Things we're hosting
arch-install-scripts
amethyst
base
filesystem
pfetch

@ -1,50 +1,54 @@
# Arch packages
archinstall
arch-install-scripts
reflector
pacman-contrib
linux-firmware
tree
arch-install-scripts
btrfs-progs
cowsay
curl
dosfstools
edk2-shell
firefox
gdm
gparted
linux
linux-firmware
memtest86+
mesa
mkinitcpio
mkinitcpio-archiso
openssh
syslinux
networkmanager
zsh
curl
openbsd-netcat
memtest86+
edk2-shell
sudo
dosfstools
openssh
pacman-contrib
reflector
spice-vdagent
syslinux
systemd-sysvcompat
cowsay
btrfs-progs
tree
xfsprogs
gparted
archinstall
xorg
xorg-apps
xorg-xinit
mesa
firefox
zsh
# Things we're hosting
arch-install-scripts
base
filesystem
grub
neofetch
pfetch
grub
sudo
# Our in-house
jade-gui
jade
onyx
# Our packages
amethyst
crystal-wallpapers
jade
jade-gui
onyx
# Text editors (issue #2)
nano
# Text editors
micro
nano
vim

Loading…
Cancel
Save