From 650e47cb1a2d744fab889dd92ec3c15d0ccedef1 Mon Sep 17 00:00:00 2001 From: Matt C Date: Fri, 7 May 2021 13:13:17 -0400 Subject: [PATCH] combine profiles better --- build_iso.sh | 22 ++- chrooted.sh | 18 ++- crystal-cli/airootfs/etc/buildstamp | 1 - crystal-cli/airootfs/etc/crystal/bootopts/cli | 1 - crystal-cli/airootfs/etc/crystal/bootopts/gui | 1 - crystal-cli/airootfs/etc/mkinitcpio.conf | 70 --------- .../airootfs/etc/mkinitcpio.d/linux.preset | 11 -- crystal-cli/airootfs/etc/packages.x86_64 | 20 --- crystal-cli/airootfs/etc/pacman.conf | 111 ------------- crystal-cli/airootfs/etc/pacman.d/.keep | 1 - crystal-cli/airootfs/etc/pacman.d/mirrorlist | 30 ---- crystal-cli/airootfs/etc/profile | 1 - crystal-cli/airootfs/etc/ssh/sshd_config | 116 -------------- crystal-cli/airootfs/etc/sudoers | 2 - .../etc/systemd/network/20-ethernet.network | 13 -- .../cloud-config.service | 1 - .../cloud-final.service | 1 - .../cloud-init-local.service | 1 - .../cloud-init.service | 1 - .../systemd/system/etc-pacman.d-gnupg.mount | 11 -- .../getty@tty1.service.d/autologin.conf | 3 - .../multi-user.target.wants/sshd.service | 1 - .../systemd-networkd.service | 1 - .../systemd-resolved.service | 1 - .../etc-pacman.d-gnupg.mount | 1 - .../pacman-init.service | 1 - .../systemd-networkd-wait-online.service | 1 - .../etc/systemd/system/pacman-init.service | 20 --- .../systemd-networkd.socket | 1 - .../wait-for-only-one-interface.conf | 5 - crystal-cli/airootfs/root/.profile | 3 - crystal-cli/airootfs/root/.xinitrc | 3 - .../loader/entries/archiso-x86_64-linux.conf | 7 - crystal-cli/efiboot/loader/loader.conf | 5 - crystal-cli/packages.gone | 33 ---- crystal-cli/packages.x86_64 | 20 --- crystal-cli/pacman.conf | 111 ------------- crystal-cli/profiledef.sh | 15 -- crystal-cli/syslinux/syslinux-linux.cfg | 8 - crystal-cli/syslinux/syslinux.cfg | 11 -- crystal/airootfs/etc/buildstamp | 2 +- crystal/airootfs/etc/packages.x86_64 | 44 +----- crystal/airootfs/etc/pacman.d/mirrorlist | 146 +++--------------- crystal/packages.x86_64 | 44 +----- 44 files changed, 65 insertions(+), 855 deletions(-) delete mode 100644 crystal-cli/airootfs/etc/buildstamp delete mode 100755 crystal-cli/airootfs/etc/crystal/bootopts/cli delete mode 100755 crystal-cli/airootfs/etc/crystal/bootopts/gui delete mode 100644 crystal-cli/airootfs/etc/mkinitcpio.conf delete mode 100644 crystal-cli/airootfs/etc/mkinitcpio.d/linux.preset delete mode 100644 crystal-cli/airootfs/etc/packages.x86_64 delete mode 100644 crystal-cli/airootfs/etc/pacman.conf delete mode 100644 crystal-cli/airootfs/etc/pacman.d/.keep delete mode 100644 crystal-cli/airootfs/etc/pacman.d/mirrorlist delete mode 100644 crystal-cli/airootfs/etc/profile delete mode 100644 crystal-cli/airootfs/etc/ssh/sshd_config delete mode 100644 crystal-cli/airootfs/etc/sudoers delete mode 100644 crystal-cli/airootfs/etc/systemd/network/20-ethernet.network delete mode 120000 crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service delete mode 120000 crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service delete mode 120000 crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service delete mode 120000 crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service delete mode 100644 crystal-cli/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount delete mode 100644 crystal-cli/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf delete mode 120000 crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service delete mode 120000 crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service delete mode 120000 crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service delete mode 120000 crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount delete mode 120000 crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service delete mode 120000 crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service delete mode 100644 crystal-cli/airootfs/etc/systemd/system/pacman-init.service delete mode 120000 crystal-cli/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket delete mode 100644 crystal-cli/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf delete mode 100755 crystal-cli/airootfs/root/.profile delete mode 100755 crystal-cli/airootfs/root/.xinitrc delete mode 100644 crystal-cli/efiboot/loader/entries/archiso-x86_64-linux.conf delete mode 100644 crystal-cli/efiboot/loader/loader.conf delete mode 100644 crystal-cli/packages.gone delete mode 100644 crystal-cli/packages.x86_64 delete mode 100644 crystal-cli/pacman.conf delete mode 100644 crystal-cli/profiledef.sh delete mode 100644 crystal-cli/syslinux/syslinux-linux.cfg delete mode 100644 crystal-cli/syslinux/syslinux.cfg diff --git a/build_iso.sh b/build_iso.sh index 9947f70..d7012d1 100755 --- a/build_iso.sh +++ b/build_iso.sh @@ -1,10 +1,18 @@ rm -fv *.iso +prof="crystal" + if [[ "$1" == "" ]]; then - printf "Profile: " - read prof + printf "cli/gui : " + read MODE else - prof=$1 + MODE="$1" +fi + +if [[ "$MODE" == "cli" ]]; then + sed -i 's/gnome/#gnome/g' ${prof}/packages.x86_64 + sed -i 's/mesa/#mesa/g' ${prof}/packages.x86_64 + sed -i 's/systemctl/#systemctl/g' chrooted.sh fi WORKDIR=$(mktemp -d) @@ -14,4 +22,10 @@ cp ${prof}/packages.x86_64 ${prof}/airootfs/etc/packages.x86_64 cp /etc/pacman.d/mirrorlist ${prof}/airootfs/etc/pacman.d/. echo "Built on $(date +"%D @ %T EST")" > ${prof}/airootfs/etc/buildstamp time sudo ./mkarchiso -v -w $WORKDIR -o . ${prof} -sudo rm -rf $WORKDIR \ No newline at end of file +sudo rm -rf $WORKDIR + +if [[ "$MODE" == "cli" ]]; then + sed -i 's/#gnome/gnome/g' ${prof}/packages.x86_64 + sed -i 's/#mesa/mesa/g' ${prof}/packages.x86_64 + sed -i 's/#systemctl/systemctl/g' chrooted.sh +fi \ No newline at end of file diff --git a/chrooted.sh b/chrooted.sh index 13ba087..2e40eab 100644 --- a/chrooted.sh +++ b/chrooted.sh @@ -10,12 +10,16 @@ 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 carly until here so that our packages which change +# We don't add crystal until here so that our packages which change # /etc/skel have been installed already -/usr/bin/useradd -m carly -/usr/bin/usermod -p $(echo "pear" | openssl passwd -6 -stdin) carly -/usr/bin/usermod -p $(echo "pear" | openssl passwd -6 -stdin) root -/usr/bin/chmod +x /home/carly/.xinitrc -echo "menu" >> /home/carly/.bashrc +/usr/bin/useradd -m crystal +/usr/bin/usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal +/usr/bin/usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root +/usr/bin/chmod +x /home/crystal/.xinitrc +echo "menu" >> /home/crystal/.bashrc chmod +x /etc/crystal/bootopts/* -echo "Configured the 'carly' user. Exiting chroot." \ No newline at end of file +systemctl enable gdm +sed -i 's/#en_US.UTF-8 UTF-8/#en_US.UTF-8 UTF-8/g' /etc/locale-gen +locale-gen +echo "LANG=en_US.UTF-8" > /etc/locale.conf +echo "Configured the system user. Exiting chroot." \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/buildstamp b/crystal-cli/airootfs/etc/buildstamp deleted file mode 100644 index c4fdee6..0000000 --- a/crystal-cli/airootfs/etc/buildstamp +++ /dev/null @@ -1 +0,0 @@ -Built on 05/05/21 @ 10:38:55 EST diff --git a/crystal-cli/airootfs/etc/crystal/bootopts/cli b/crystal-cli/airootfs/etc/crystal/bootopts/cli deleted file mode 100755 index 51ace71..0000000 --- a/crystal-cli/airootfs/etc/crystal/bootopts/cli +++ /dev/null @@ -1 +0,0 @@ -echo "We haven't setup an installer!" \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/crystal/bootopts/gui b/crystal-cli/airootfs/etc/crystal/bootopts/gui deleted file mode 100755 index 470911a..0000000 --- a/crystal-cli/airootfs/etc/crystal/bootopts/gui +++ /dev/null @@ -1 +0,0 @@ -echo "I don't feel like running a gui kek" \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/mkinitcpio.conf b/crystal-cli/airootfs/etc/mkinitcpio.conf deleted file mode 100644 index 4b7b7fb..0000000 --- a/crystal-cli/airootfs/etc/mkinitcpio.conf +++ /dev/null @@ -1,70 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# vim:set ft=sh -# MODULES -# The following modules are loaded before any boot hooks are -# run. Advanced users may wish to specify all system modules -# in this array. For instance: -# MODULES=(piix ide_disk reiserfs) -MODULES=() - -# BINARIES -# This setting includes any additional binaries a given user may -# wish into the CPIO image. This is run last, so it may be used to -# override the actual binaries included by a given hook -# BINARIES are dependency parsed, so you may safely ignore libraries -BINARIES=() - -# FILES -# This setting is similar to BINARIES above, however, files are added -# as-is and are not parsed in any way. This is useful for config files. -FILES=() - -# HOOKS -# This is the most important setting in this file. The HOOKS control the -# modules and scripts added to the image, and what happens at boot time. -# Order is important, and it is recommended that you do not change the -# order in which HOOKS are added. Run 'mkinitcpio -H ' for -# help on a given hook. -# 'base' is _required_ unless you know precisely what you are doing. -# 'udev' is _required_ in order to automatically load modules -# 'filesystems' is _required_ unless you specify your fs modules in MODULES -# Examples: -## This setup specifies all modules in the MODULES setting above. -## No raid, lvm2, or encrypted root is needed. -# HOOKS=(base) -# -## This setup will autodetect all modules for your system and should -## work as a sane default -# HOOKS=(base udev autodetect block filesystems) -# -## This setup will generate a 'full' image which supports most systems. -## No autodetection is done. -# HOOKS=(base udev block filesystems) -# -## This setup assembles a pata mdadm array with an encrypted root FS. -## Note: See 'mkinitcpio -H mdadm' for more information on raid devices. -# HOOKS=(base udev block mdadm encrypt filesystems) -# -## This setup loads an lvm2 volume group on a usb device. -# HOOKS=(base udev block lvm2 filesystems) -# -## NOTE: If you have /usr on a separate partition, you MUST include the -# usr, fsck and shutdown hooks. -HOOKS=(base udev modconf archiso block filesystems) - -# COMPRESSION -# Use this to compress the initramfs image. By default, gzip compression -# is used. Use 'cat' to create an uncompressed image. -#COMPRESSION="gzip" -#COMPRESSION="bzip2" -#COMPRESSION="lzma" -#COMPRESSION="xz" -#COMPRESSION="lzop" -#COMPRESSION="lz4" -#COMPRESSION="zstd" - -# COMPRESSION_OPTIONS -# Additional options for the compressor -#COMPRESSION_OPTIONS=() diff --git a/crystal-cli/airootfs/etc/mkinitcpio.d/linux.preset b/crystal-cli/airootfs/etc/mkinitcpio.d/linux.preset deleted file mode 100644 index d35f137..0000000 --- a/crystal-cli/airootfs/etc/mkinitcpio.d/linux.preset +++ /dev/null @@ -1,11 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# mkinitcpio preset file for the 'linux' package on archiso - -PRESETS=('archiso') - -ALL_kver='/boot/vmlinuz-linux' -ALL_config='/etc/mkinitcpio.conf' - -archiso_image="/boot/initramfs-linux.img" diff --git a/crystal-cli/airootfs/etc/packages.x86_64 b/crystal-cli/airootfs/etc/packages.x86_64 deleted file mode 100644 index 7ee6f8d..0000000 --- a/crystal-cli/airootfs/etc/packages.x86_64 +++ /dev/null @@ -1,20 +0,0 @@ -xorg -xorg-xinit -arch-install-scripts -reflector -pacman-contrib -nano -doas -linux-firmware -tree -base -cloud-init -linux -mkinitcpio -mkinitcpio-archiso -openssh -syslinux - -crystal-misc -crystal-cli-boot -neofetch \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/pacman.conf b/crystal-cli/airootfs/etc/pacman.conf deleted file mode 100644 index ae291d4..0000000 --- a/crystal-cli/airootfs/etc/pacman.conf +++ /dev/null @@ -1,111 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -Color -TotalDownload -ILoveCandy -# We cannot check disk space from within a chroot environment -#CheckSpace -#VerbosePkgLists - -# By default, pacman accepts packages signed by keys that its local keyring -# trusts (see pacman-key and its man page), as well as unsigned packages. -SigLevel = Never -LocalFileSigLevel = Never -RemoteFileSigLevel = Never - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[crystal] -Server = https://repo.xhec.us/crystal -SigLevel = Never - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -[aur] -Server = https://repo.xhec.us/aur -SigLevel = Never - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -#[multilib] -#Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs diff --git a/crystal-cli/airootfs/etc/pacman.d/.keep b/crystal-cli/airootfs/etc/pacman.d/.keep deleted file mode 100644 index 4a31a76..0000000 --- a/crystal-cli/airootfs/etc/pacman.d/.keep +++ /dev/null @@ -1 +0,0 @@ -#heeho \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/pacman.d/mirrorlist b/crystal-cli/airootfs/etc/pacman.d/mirrorlist deleted file mode 100644 index 9ecf79e..0000000 --- a/crystal-cli/airootfs/etc/pacman.d/mirrorlist +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -################# Arch Linux mirrorlist generated by Reflector ################# -################################################################################ - -# 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 - -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 diff --git a/crystal-cli/airootfs/etc/profile b/crystal-cli/airootfs/etc/profile deleted file mode 100644 index c026a2a..0000000 --- a/crystal-cli/airootfs/etc/profile +++ /dev/null @@ -1 +0,0 @@ -#alias sudo="doas" \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/ssh/sshd_config b/crystal-cli/airootfs/etc/ssh/sshd_config deleted file mode 100644 index 8ef1758..0000000 --- a/crystal-cli/airootfs/etc/ssh/sshd_config +++ /dev/null @@ -1,116 +0,0 @@ -# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/bin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key -#HostKey /etc/ssh/ssh_host_ed25519_key - -# Ciphers and keying -#RekeyLimit default none - -# Logging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#PubkeyAuthentication yes - -# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys - -#AuthorizedPrincipalsFile none - -#AuthorizedKeysCommand none -#AuthorizedKeysCommandUser nobody - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -#PasswordAuthentication yes -#PermitEmptyPasswords no - -# Change to no to disable s/key passwords -ChallengeResponseAuthentication no - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -UsePAM yes - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -#X11Forwarding no -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PermitTTY yes -PrintMotd no # pam does that -#PrintLastLog yes -#TCPKeepAlive yes -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS no -#PidFile /run/sshd.pid -#MaxStartups 10:30:100 -#PermitTunnel no -#ChrootDirectory none -#VersionAddendum none - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/lib/ssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# PermitTTY no -# ForceCommand cvs server diff --git a/crystal-cli/airootfs/etc/sudoers b/crystal-cli/airootfs/etc/sudoers deleted file mode 100644 index 5f74484..0000000 --- a/crystal-cli/airootfs/etc/sudoers +++ /dev/null @@ -1,2 +0,0 @@ -root ALL=(ALL) ALL -carly ALL=(ALL) NOPASSWD: ALL \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/network/20-ethernet.network b/crystal-cli/airootfs/etc/systemd/network/20-ethernet.network deleted file mode 100644 index efa309c..0000000 --- a/crystal-cli/airootfs/etc/systemd/network/20-ethernet.network +++ /dev/null @@ -1,13 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Match] -Name=en* -Name=eth* - -[Network] -DHCP=yes -IPv6PrivacyExtensions=yes - -[DHCP] -RouteMetric=512 diff --git a/crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service deleted file mode 120000 index ebc50f0..0000000 --- a/crystal-cli/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-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service deleted file mode 120000 index 80fa3c8..0000000 --- a/crystal-cli/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-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service deleted file mode 120000 index dd8e9f1..0000000 --- a/crystal-cli/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-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/crystal-cli/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service deleted file mode 120000 index 24c7a26..0000000 --- a/crystal-cli/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 diff --git a/crystal-cli/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/crystal-cli/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount deleted file mode 100644 index f86a91d..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount +++ /dev/null @@ -1,11 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Unit] -Description=Temporary /etc/pacman.d/gnupg directory - -[Mount] -What=tmpfs -Where=/etc/pacman.d/gnupg -Type=tmpfs -Options=mode=0755 diff --git a/crystal-cli/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/crystal-cli/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf deleted file mode 100644 index 4df51e0..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=-/sbin/agetty --autologin carly --noclear %I 38400 linux \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service deleted file mode 120000 index d21ebd9..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/sshd.service \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service deleted file mode 120000 index 4c158e6..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service deleted file mode 120000 index 4f6ae34..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-resolved.service \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount b/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount deleted file mode 120000 index a2bbbbc..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount +++ /dev/null @@ -1 +0,0 @@ -systemd/system/etc-pacman.d-gnupg.mount \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service b/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service deleted file mode 120000 index 80f5df3..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service +++ /dev/null @@ -1 +0,0 @@ -systemd/system/pacman-init.service \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service deleted file mode 120000 index 7d6ad92..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd-wait-online.service \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/system/pacman-init.service b/crystal-cli/airootfs/etc/systemd/system/pacman-init.service deleted file mode 100644 index afbb35e..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/pacman-init.service +++ /dev/null @@ -1,20 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Unit] -Description=Initializes Pacman keyring -Requires=etc-pacman.d-gnupg.mount -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] -WantedBy=multi-user.target diff --git a/crystal-cli/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/crystal-cli/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket deleted file mode 120000 index 51942c8..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/systemd-networkd.socket \ No newline at end of file diff --git a/crystal-cli/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/crystal-cli/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf deleted file mode 100644 index a4d7442..0000000 --- a/crystal-cli/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -[Service] -ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any diff --git a/crystal-cli/airootfs/root/.profile b/crystal-cli/airootfs/root/.profile deleted file mode 100755 index 896139b..0000000 --- a/crystal-cli/airootfs/root/.profile +++ /dev/null @@ -1,3 +0,0 @@ -if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then - exec startx -fi \ No newline at end of file diff --git a/crystal-cli/airootfs/root/.xinitrc b/crystal-cli/airootfs/root/.xinitrc deleted file mode 100755 index d51b594..0000000 --- a/crystal-cli/airootfs/root/.xinitrc +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export DESKTOP_SESSION=plasma -exec startplasma-x11 \ No newline at end of file diff --git a/crystal-cli/efiboot/loader/entries/archiso-x86_64-linux.conf b/crystal-cli/efiboot/loader/entries/archiso-x86_64-linux.conf deleted file mode 100644 index c5abdfc..0000000 --- a/crystal-cli/efiboot/loader/entries/archiso-x86_64-linux.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -title CrystalUX Live (x86_64, UEFI) -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/crystal-cli/efiboot/loader/loader.conf b/crystal-cli/efiboot/loader/loader.conf deleted file mode 100644 index 1ea5ce5..0000000 --- a/crystal-cli/efiboot/loader/loader.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -timeout 3 -default archiso-x86_64-linux.conf diff --git a/crystal-cli/packages.gone b/crystal-cli/packages.gone deleted file mode 100644 index 3918ac8..0000000 --- a/crystal-cli/packages.gone +++ /dev/null @@ -1,33 +0,0 @@ -plasma -ark -gnome-calendar -cheese -evince -noto-fonts-emoji -nautilus -firefox -gambas3 -gpodder -gwenview -kate -kcalc -kmail -knotes -konsole -ktnef -kvantum-qt5 -gnome-maps -gnome-software -gnome-software-packagekit-plugin -archlinux-appstream-data -rhythmbox -spectacle -vlc -gnome-todo -epiphany -latte-dock -dolphin -tk -qtmares -kde-skel -kde-theme \ No newline at end of file diff --git a/crystal-cli/packages.x86_64 b/crystal-cli/packages.x86_64 deleted file mode 100644 index 7ee6f8d..0000000 --- a/crystal-cli/packages.x86_64 +++ /dev/null @@ -1,20 +0,0 @@ -xorg -xorg-xinit -arch-install-scripts -reflector -pacman-contrib -nano -doas -linux-firmware -tree -base -cloud-init -linux -mkinitcpio -mkinitcpio-archiso -openssh -syslinux - -crystal-misc -crystal-cli-boot -neofetch \ No newline at end of file diff --git a/crystal-cli/pacman.conf b/crystal-cli/pacman.conf deleted file mode 100644 index ae291d4..0000000 --- a/crystal-cli/pacman.conf +++ /dev/null @@ -1,111 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -Color -TotalDownload -ILoveCandy -# We cannot check disk space from within a chroot environment -#CheckSpace -#VerbosePkgLists - -# By default, pacman accepts packages signed by keys that its local keyring -# trusts (see pacman-key and its man page), as well as unsigned packages. -SigLevel = Never -LocalFileSigLevel = Never -RemoteFileSigLevel = Never - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[crystal] -Server = https://repo.xhec.us/crystal -SigLevel = Never - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -[aur] -Server = https://repo.xhec.us/aur -SigLevel = Never - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -#[multilib] -#Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs diff --git a/crystal-cli/profiledef.sh b/crystal-cli/profiledef.sh deleted file mode 100644 index 4f3a07c..0000000 --- a/crystal-cli/profiledef.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -# shellcheck disable=SC2034 - -iso_name="crystal-cli-live" -iso_label="CRYS_CLI_$(date +%Y%m)" -iso_publisher="CrystalUX