Put 'wifiName' variable used by 'nmcli' command inside double quotes

README.md

@@ -6,13 +6,13 @@ The purpose of this branch is to modularize as many functions of the scripts as
 
 ## Checklist
 [X]	Rename all `base-` scripts to remove `base-`
-[ ]	Move (at least almost) all Debian related commands and tasks to `debian.sh`
+[X]	Move (at least almost) all Debian related commands and tasks to `debian.sh`
-[ ]	Move (at least almost) all Fedora related commands and tasks to `fedora.sh`
+[X]	Move (at least almost) all Fedora related commands and tasks to `fedora.sh`
-[ ]	Move (at least almost) all elementary OS related commands and tasks to `elementary.sh`
+[X]	Move (at least almost) all elementary OS related commands and tasks to `elementary.sh`
-[ ]	Rename flags in all distro specific scripts from numbered (i.e. `-1`, `-2`) to descriptive (i.e. `--mmdebstrap`, `--network-interfaces`)
+[X]	Rename flags in all distro specific scripts from numbered (i.e. `-1`, `-2`) to descriptive (i.e. `--mmdebstrap`, `--network-interfaces`)
 [X]	Move all EFI related commands and tasks to a new `efi.sh` script
 [X]	Rename `mkfs.zfs.sh` to `zfs.sh`
-[ ]	Point any distro-specific commands/tasks that are shared with Debian to use `debian.sh` to avoid any unnecessary duplication
+[X]	Point any distro-specific commands/tasks that are shared with Debian to use `debian.sh` to avoid any unnecessary duplication
 [ ]	Rewrite `README.md`
-[ ]	Rename all script-specific variables to lowercase with singular capital letters to seperate words in variable name
+[X]	Rename all script-specific variables to lowercase with singular capital letters to seperate words in variable name
-[ ]	Update how `baseDir` is set using `realpath $(basedir "${0}")`
+[X]	Update how `baseDir` is set using `realpath $(dirname "${0}")`

adduser.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -euo pipefail
+
+baseDir="$(realpath "$(dirname "${0}")")"
+
+source \
+	/etc/os-release
+source \
+	"${baseDir}/system.conf"
+
+
+printf \
+	'Adding user account...\n'
+
+adduser ${username}
+
+if [[ "${ID}" == 'fedora' ]]; then
+	printf \
+		'\033[?47h\033[2J\033[H'
+
+	cat << EOF
+
+Enter a password for the new user account:
+EOF
+	passwd \
+		${username}
+
+	printf \
+		'\033[?47l'
+
+	usermod \
+		-a \
+		-G \
+		audio,cdrom,dip,floppy,wheel,video,dialout \
+		${username}
+else
+	if [[ -z "$(cat /etc/group | grep 'lpadmin')" ]]; then
+		groupadd --gid 108 lpadmin
+	fi
+
+	groups='audio,cdrom,dip,floppy,plugdev,sudo,video,dialout,lpadmin'
+
+	if [[ "${ID}" == 'debian' ]]; then
+		groups+=',netdev'
+	fi
+
+	usermod \
+		-a \
+		-G \
+		${groups} \
+		${username}
+fi

apt-snapshot.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -euo pipefail
+
+
+cat << EOF | tee /usr/bin/zfs-system-snapshot-apt &> /dev/null
+#!/bin/bash
+set -euo pipefail
+
+
+TIMESTAMP="\$(date +%Y_%m_%d-%H_%M_%S)"
+
+
+if [[ -z "\$(zfs list -t snapshot | grep 'apt-\${TIMESTAMP}')" ]]; then
+    zfs snapshot \$(zfs mount | grep 'ROOT' | sed 's| .*||')@apt-\${TIMESTAMP} && printf "\n- Snapshot taken\n\n"
+fi
+EOF
+
+chmod \
+	+x \
+	/usr/bin/zfs-system-snapshot-apt
+
+printf \
+	'DPkg::Pre-Install-Pkgs {"/usr/bin/zfs-system-snapshot-apt";};\n' | \
+	tee /etc/apt/apt.conf.d/90-zfs_system-snapshot &> /dev/null
+
+printf \
+	'DPkg::Post-Invoke {"apt moo";};\n' | \
+	tee /etc/apt/apt.conf.d/99-apt_moo &> /dev/null

boilerplate.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -euo pipefail
+
+baseDir="$(realpath "$(dirname "${0}")")"
+
+
+printf "Enter name of new script (without file extension):\n${baseDir}/"
+read -r newScript
+
+cat << EOF | tee "${baseDir}/${newScript}.sh" &> /dev/null
+#!/bin/bash
+set -euo pipefail
+
+baseDir="\$(realpath "\$(dirname "\${0}")")"
+
+source \\
+	/etc/os-release
+source \\
+	"\${baseDir}/system.conf"
+EOF
+
+chmod +x "${baseDir}/${newScript}.sh"

chroot.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -euo pipefail
+
+baseDir="$(realpath "$(dirname "${0}")")"
+
+
+printf \
+	"\nNow chrooting into /mnt...\n\n"
+
+if [[ "${*}" == *--continue* ]]; then
+	chroot \
+		/mnt \
+		"$(printf "${baseDir}\n" | sed 's|.*\/|\/|')/install.sh"
+else
+	chroot \
+		/mnt
+fi

debian.sh

@@ -9,8 +9,33 @@ source \
 	"${baseDir}/system.conf"
 
 
+if [[ "${1}" == '--live' ]]; then
+	if [[ "${ID}" == 'debian' ]] && [[ ! "$(hostname)" == "debian-live" ]]; then
+		cat << EOF | tee /etc/apt/sources.list.d/contrib.sources 1> /dev/null
+Enabled:		yes
+Types:			deb
+URIs:			http://deb.debian.org/debian/
+Suites:			${VERSION_CODENAME}
+Components:		contrib
+Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
+EOF
+	fi
+
+	apt \
+		--update \
+		install \
+		--yes \
+		mmdebstrap \
+		gdisk \
+		linux-headers-generic \
+		systemd-timesyncd \
+		whois \
+		zfsutils-linux
+fi
+
 if [[ "${1}" == '--mmdebstrap' ]]; then
 	packages=(\
+ca-certificates \
 console-setup \
 cryptsetup \
 curl \
@@ -28,6 +53,8 @@ network-manager \
 openssh-{client,server} \
 popularity-contest \
 printer-driver-all \
+rsync \
+sudo \
 systemd-timesyncd \
 tasksel \
 zfs-initramfs \
@@ -48,7 +75,9 @@ zstd\
 		${include} \
 		"${VERSION_CODENAME}" \
 		/mnt
-elif [[ "${1}" == '--network-interfaces' ]]; then
+fi
+
+if [[ "${1}" == '--network-interfaces' ]]; then
 	networkInterface=($(ip -br addr show | sed 's| .*$||g' | grep -v '^lo' | grep -v 'tailscale' | grep -v '^wg'))
 	shopt -s extglob
 
@@ -58,7 +87,9 @@ allow-hotplug	${networkInterface[$i]}
 iface		${networkInterface[$i]}	inet	dhcp
 EOF
 	done
-elif [[ "${1}" == '--sources' ]]; then
+fi
+
+if [[ "${1}" == '--sources' ]]; then
 	cat << EOF | tee /mnt/etc/apt/sources.list.d/${VERSION_CODENAME}.sources &> /dev/null
 # ${VERSION_CODENAME^}
 Enabled:		yes
@@ -87,3 +118,115 @@ EOF
 
 	rm /mnt/etc/apt/sources.list
 fi
+
+if [[ "${1}" == '--dpkg-reconfigure' ]]; then
+	cat << EOF
+
+Regardless of the language(s) you choose, be sure to enable 'en_US.UTF-8'!
+Press any key to continue...
+EOF
+
+	read -srn 1
+
+	dpkg-reconfigure \
+		locales \
+		tzdata \
+		keyboard-configuration \
+		console-setup
+fi
+
+if [[ "${1}" == '--purge-os-prober' ]]; then
+	apt \
+		purge \
+		--yes \
+		os-prober
+fi
+
+if [[ "${1}" == '--network-manager' ]]; then
+	cp \
+		/etc/NetworkManager/NetworkManager.conf \
+		/etc/NetworkManager/NetworkManager.conf.orig
+
+	cat \
+		/etc/NetworkManager/NetworkManager.conf.orig | \
+		sed 's|managed=false|managed=true|' | \
+		tee /etc/NetworkManager/NetworkManager.conf &> /dev/null
+fi
+
+if [[ "${1}" == '--contrib' ]]; then
+	cat << EOF | tee --append /etc/apt/sources.list.d/${VERSION_CODENAME}.sources &> /dev/null
+
+# ${VERSION_CODENAME^} Backports
+Enabled:		yes
+Types:			deb deb-src
+URIs:			http://deb.debian.org/debian/
+Suites:			${VERSION_CODENAME}-backports
+Components:		main non-free-firmware contrib
+Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
+EOF
+
+	cat << EOF | tee /etc/apt/preferences.d/backports.pref &> /dev/null
+Package:		*
+Pin:			release	n=${VERSION_CODENAME}*
+Pin-Priority:	990
+
+Package:		linux-*
+Pin:			release	n=${VERSION_CODENAME}-backports
+Pin-Priority:	-1
+EOF
+
+	if [[ "${VERSION_CODENAME}" == 'bookworm' ]]; then
+	cat << EOF | tee --append /etc/apt/preferences.d/backports.pref &> /dev/null
+
+Package: /wayland/
+Pin: release n=${VERSION_CODENAME}-backports
+Pin-Priority: -1
+EOF
+	fi
+fi
+
+if [[ "${1}" == '--tasksel' ]]; then
+	if [[ ! -f /usr/bin/tasksel ]]; then
+		apt \
+			--update \
+			install \
+			--yes \
+			tasksel
+	fi
+
+	tasksel \
+		--new-install
+fi
+
+if [[ "${1}" == '--initramfs' ]]; then
+	printf \
+		"UMASK=0077\n" | \
+		tee /etc/initramfs-tools/conf.d/umask.conf &> /dev/null
+
+	update-initramfs \
+		-c \
+		-k all
+fi
+
+if [[ "${1}" == '--logrotate' ]]; then
+	for file in /etc/logrotate.d/* ; do
+		if grep -Eq "(^|[^#y])compress" "$file" ; then
+			sed -i -r "s/(^|[^#y])(compress)/\1#\2/" "$file"
+		fi
+	done
+fi
+
+if [[ "${1}" == '--systemctl-enable' ]]; then
+	systemctl \
+		enable \
+		zfs.target
+	systemctl \
+		enable \
+		zfs-import-cache
+	systemctl \
+		enable \
+		zfs-mount
+	systemctl \
+		enable \
+		zfs-import.target
+fi

efi.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 
-baseDir="$(realpath "$(basename "${0}")")"
+baseDir="$(realpath "$(dirname "${0}")")"
 
 
 source \

elementary.sh

@@ -26,6 +26,7 @@ nano \
 network-manager \
 openssh-{client,server} \
 popularity-contest \
+rsync \
 zfs-initramfs \
 zstd\
 )
@@ -44,7 +45,9 @@ zstd\
 		${include} \
 		"${UBUNTU_VERSION_CODENAME}" \
 		/mnt
-elif [[ "${1}" == '--sources' ]]; then
+fi
+
+if [[ "${1}" == '--sources' ]]; then
 	cat <<EOF >/mnt/etc/apt/sources.list.d/${UBUNTU_VERSION_CODENAME}.sources
 # ${UBUNTU_VERSION_CODENAME^}
 Enabled:		yes
@@ -90,11 +93,15 @@ Signed-By:		/etc/apt/trusted.gpg.d/patches.key.asc
 EOF
 
 	rm /mnt/etc/apt/sources.list
-elif [[ "${1}" == '--skel' ]]; then
+fi
+
+if [[ "${1}" == '--skel' ]]; then
 	rsync -pogAXtlHrDx \
 		/etc/skel \
 			/mnt/etc
-elif [[ "${1}" == '--elementary' ]]; then
+fi
+
+if [[ "${1}" == '--elementary' ]]; then
 	cp \
 		/etc/os-release \
 		/mnt/etc
@@ -103,3 +110,90 @@ elif [[ "${1}" == '--elementary' ]]; then
 		/etc/apt/trusted.gpg.d/{elementary,patches}.key.asc \
 		/mnt/etc/apt/trusted.gpg.d/
 fi
+
+if [[ "${1}" == '--network' ]]; then
+	mkdir \
+		-p \
+		/mnt/run/systemd/resolve/
+
+	mount \
+		--bind \
+		/run/systemd/resolve/ \
+		/mnt/run/systemd/resolve/
+
+	touch \
+		/mnt/etc/NetworkManager/conf.d/10-globally-managed-devices.conf
+fi
+
+if [[ "${1}" == '--apps' ]]; then
+	app=(\
+io.elementary.calculator \
+io.elementary.camera \
+io.elementary.capnet-assist \
+io.elementary.maps \
+io.elementary.music \
+io.elementary.screenshot \
+io.elementary.videos \
+org.gnome.Epiphany \
+org.gnome.Evince \
+org.gnome.FileRoller \
+org.gnome.font-viewer\
+)
+
+	apps="app/${app[0]}/x86_64/stable"
+
+	for ((i=1;i<${#app[@]};i++)); do
+		apps+=" app/${app[${i}]}/x86_64/stable"
+	done
+
+	flatpak \
+		install \
+		appcenter \
+		-y \
+		${apps}
+fi
+
+if [[ "${1}" == '--purge' ]]; then
+	apt \
+		purge \
+		--yes \
+		--autoremove \
+		gnome-software \
+		snapd
+fi
+
+if [[ "${1}" == '--desktop' ]]; then
+	apt \
+		install \
+		--yes \
+		elementary-desktop
+fi
+
+if [[ "${1}" == '--namarupa' ]]; then
+	curl \
+		--progress \
+		--location \
+		--remote-name \
+		--continue-at - \
+		--output-dir '/tmp' \
+		'https://github.com/lenemter/wingpanel-indicator-namarupa/raw/main/com.github.lenemter.wingpanel-indicator-namarupa.deb'
+
+	apt \
+		--update \
+		install \
+		--yes \
+		'/tmp/com.github.lenemter.wingpanel-indicator-namarupa.deb'
+
+	mkdir \
+		-p \
+		/home/${username}/.config/autostart
+
+	cp \
+		/etc/xdg/autostart/indicator-application.desktop \
+		/home/${username}/.config/autostart/
+
+	sed \
+		-i \
+		's/^OnlyShowIn.*/OnlyShowIn=Unity;GNOME;Pantheon;/' \
+		/home/${username}/.config/autostart/indicator-application.desktop
+fi

fedora.sh

@@ -9,6 +9,34 @@ source \
 	"${baseDir}/system.conf"
 
 
+if [[ "${1}" == '--live' ]]; then
+	if [[ "${VERSION_ID}" -lt '41' ]]; then
+		dnf config-manager \
+			--disable \
+			updates
+	else
+		dnf config-manager \
+			setopt \
+			updates.enabled=0
+	fi
+
+	dnf install \
+		-y \
+		https://zfsonlinux.org/fedora/zfs-release-${zolFedoraVer}$(rpm --eval "%{dist}").noarch.rpm
+
+	dnf install \
+		-y \
+		https://dl.fedoraproject.org/pub/fedora/linux/releases/${VERSION_ID}/Everything/x86_64/os/Packages/k/kernel-devel-$(uname -r).rpm
+
+	dnf install \
+		-y \
+		zfs \
+		gdisk
+
+	modprobe \
+		zfs
+fi
+
 if [[ "${1}" == '--rsync' ]]; then
 	mkdir -p /run/install
 
@@ -24,13 +52,77 @@ if [[ "${1}" == '--rsync' ]]; then
 		--exclude=/etc/machine-id \
 		--info=progress2 \
 		/run/install/ /mnt
-elif [[ "${1}" == '--resolv-conf' ]]; then
+fi
+
+if [[ "${1}" == '--resolv-conf' ]]; then
 	mv /mnt/etc/resolv.conf \
 		/mnt/etc/resolv.conf.orig
 
 	cp -L \
 		/etc/resolv.conf \
 		/mnt/etc
-elif [[ "${1}" == '-3' ]]; then
+fi
-	#
+
+if [[ "${1}" == '--dracut' ]]; then
+	dracut \
+		--force \
+		--regenerate-all
+fi
+
+if [[ "${1}" == '--zfs-install' ]]; then
+	if [[ "${encryption}" == 'yes' ]]; then
+		cat << EOF | tee /etc/dracut.conf.d/zol.conf &> /dev/null
+nofsck="yes"
+add_dracutmodules+=" zfs "
+omit_dracutmodules+=" btrfs "
+install_items+=" /etc/zfs/keys/${hostname,,}.key "
+EOF
+	else
+		cat <<EOF >/etc/dracut.conf.d/zol.conf
+nofsck="yes"
+add_dracutmodules+=" zfs "
+omit_dracutmodules+=" btrfs "
+EOF
+	fi
+
+	if [[ "${VERSION_ID}" -lt '41' ]]; then
+		dnf \
+			config-manager \
+			--disable \
+			updates
+	else
+		dnf \
+			config-manager \
+			setopt \
+			updates.enabled=0
+	fi
+
+	dnf \
+		install \
+		-y \
+		https://dl.fedoraproject.org/pub/fedora/linux/releases/${VERSION_ID}/Everything/x86_64/os/Packages/k/kernel-devel-$(uname -r).rpm
+
+	dnf \
+		--releasever=${VERSION_ID} \
+		install \
+		-y \
+		https://zfsonlinux.org/fedora/zfs-release-${ZOL_FEDORA_VER}$(rpm --eval "%{dist}").noarch.rpm
+
+	dnf \
+		install \
+		-y \
+		zfs \
+		zfs-dracut
+
+	if [[ "${VERSION_ID}" -lt '41' ]]; then
+		dnf \
+			config-manager \
+			--enable \
+			updates
+	else
+		dnf \
+			config-manager \
+			setopt \
+			updates.enabled=1
+	fi
 fi

finalize.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 
-BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
+baseDir="$(realpath "$(dirname "${0}")")"
 
 
 printf '\033[?47l\012'

home-fix-setup.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+set -euo pipefail
+
+baseDir="$(realpath "$(dirname "${0}")")"
+
+source \
+	/etc/os-release
+source \
+	"${baseDir}/system.conf"
+
+
+cat << EOF | tee /usr/bin/home-fix.sh &> /dev/null
+#!/bin/bash
+set -euo pipefail
+
+chown -R ${username}:${username} /home/${username}
+
+sudo -u ${username} cp -a /etc/skel/. /home/${username}
+
+if [[ ! -z "\$(find -P /home/${username}/ | grep '\.face')" ]]; then
+	find -P /home/${username}/ | grep '\.face' | xargs -d '\n' -I {} rm {}
+fi
+
+if [[ ! -z "\$(find -P /var/spool/cron | grep 'root')" ]]; then
+    rm \$(find -P /var/spool/cron | grep 'root')
+fi
+
+printf "\$(date +%Y-%m-%d\ %H:%M:%S) I did the thing\n" | tee /var/log/home-fix.log &> /dev/null
+
+if [[ -f '/usr/bin/home-fix.sh' ]]; then
+    rm /usr/bin/home-fix.sh
+fi
+
+zfs snapshot ${hostname,,}/ROOT/${ID}@home-fix
+
+zfs snapshot -r ${hostname,,}/home/${username}@home-fix
+EOF
+
+chmod \
+	+x \
+	/usr/bin/home-fix.sh
+
+if [[ "${ID}" == 'fedora' ]]; then
+	printf \
+		"@reboot\tsudo -u ${username} '${baseDir}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \
+		tee /var/spool/cron/root &> /dev/null
+elif [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
+	printf \
+		"@reboot\tsudo -u ${username} '${baseDir}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \
+		tee /var/spool/cron/crontabs/root &> /dev/null
+
+	chown \
+		:crontab \
+		/var/spool/cron/crontabs/root
+
+	chmod \
+		0600 \
+		/var/spool/cron/crontabs/root
+fi

host-id.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+
+
+cp \
+	/etc/hostid \
+	/mnt/etc/

hostname.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -euo pipefail
+
+
+baseDir="$(realpath "$(dirname "${0}")")"
+
+source \
+	"${baseDir}/system.conf"
+
+
+printf \
+	"${hostname}\n" | tee /mnt/etc/hostname &> /dev/null
+
+printf \
+	"127.0.1.1\t${hostname}\n" | tee --append /mnt/etc/hosts &> /dev/null

install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-baseDir="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
+baseDir="$(realpath "$(dirname "${0}")")"
 
 printf \
 	'\033[?47l\012'
@@ -29,139 +29,33 @@ source \
 source \
 	"${baseDir}/system.conf"
 
-if [[ ! "${DISK}" == **/dev/disk/by-id/** ]]; then
-	if [[ "${DISK}" == **/dev/nvme** ]]; then
-		PART1='p1'
-		PART2='p2'
-	else
-		PART1='1'
-		PART2='2'
-	fi
-else
-	PART1='-part1'
-	PART2='-part2'
-fi
 
 if [[ ! -f "/etc/mtab" ]]; then
-	ln \
+	"${baseDir}/mtab.sh"
-		-s \
-		/proc/self/mounts \
-		/etc/mtab
-fi
-
-if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	apt \
-		update
 fi
 
 if [[ "${ID}" == 'fedora' ]]; then
-	if [[ "${ENCRYPTION}" == 'yes' ]]; then
+	"${baseDir}/fedora.sh" --zfs-install
-		cat << EOF | tee /etc/dracut.conf.d/zol.conf &> /dev/null
-nofsck="yes"
-add_dracutmodules+=" zfs "
-omit_dracutmodules+=" btrfs "
-install_items+=" /etc/zfs/keys/${HOSTNAME,,}.key "
-EOF
-	else
-		cat <<EOF >/etc/dracut.conf.d/zol.conf
-nofsck="yes"
-add_dracutmodules+=" zfs "
-omit_dracutmodules+=" btrfs "
-EOF
-	fi
-fi
-
-if [[ "${ID}" == 'fedora' ]]; then
-	if [[ "${VERSION_ID}" -lt '41' ]]; then
-		dnf \
-			config-manager \
-			--disable \
-			updates
-	else
-		dnf \
-			config-manager \
-			setopt \
-			updates.enabled=0
-	fi
-
-	dnf \
-		install \
-		-y \
-		https://dl.fedoraproject.org/pub/fedora/linux/releases/${VERSION_ID}/Everything/x86_64/os/Packages/k/kernel-devel-$(uname -r).rpm
-
-	dnf \
-		--releasever=${VERSION_ID} \
-		install \
-		-y \
-		https://zfsonlinux.org/fedora/zfs-release-${ZOL_FEDORA_VER}$(rpm --eval "%{dist}").noarch.rpm
-
-	dnf \
-		install \
-		-y \
-		zfs \
-		zfs-dracut
-
-	if [[ "${VERSION_ID}" -lt '41' ]]; then
-		dnf \
-			config-manager \
-			--enable \
-			updates
-	else
-		dnf \
-			config-manager \
-			setopt \
-			updates.enabled=1
-	fi
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	cat << EOF
+	"${baseDir}/debian.sh" --dpkg-reconfigure
-
-Regardless of the language(s) you choose, be sure to enable 'en_US.UTF-8'!
-Press any key to continue...
-EOF
-
-	read -srn 1
-
-	dpkg-reconfigure \
-		locales \
-		tzdata \
-		keyboard-configuration \
-		console-setup
 fi
 
-if [[ "${ID}" == 'debian' ]]; then
+"${baseDir}/partition.sh" --efi
-	printf \
-		'REMAKE_INITRD=yes\n' | \
-		tee /etc/dkms/zfs.conf &> /dev/null
-fi
-
-if [[ ! "${*}" = *--no-part* ]]; then
-	mkdosfs \
-		-F 32 \
-		-s 1 \
-		-n EFI \
-		${DISK}${PART1}
-fi
-
-mkdir \
-	-p \
-	/boot/efi
-
-printf \
-	"/dev/disk/by-uuid/$(blkid -s UUID -o value ${DISK}${PART1}) /boot/efi vfat defaults 0 0\n" | \
-	tee --append /etc/fstab &> /dev/null
-
-sleep 5
-
-mount \
-	/boot/efi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	apt \
+	if [[ -e '/usr/bin/os-prober' ]]; then
-		purge \
+		"${baseDir}/debian.sh" --purge-os-prober
-		--yes \
+	fi
-		os-prober
+fi
+
+if [[ "${ID}" == 'elementary' ]]; then
+	"${baseDir}/elementary.sh" --desktop
+
+	"${baseDir}/elementary.sh" --purge
+
+	"${baseDir}/elementary.sh" --apps
 fi
 
 printf \
@@ -177,76 +71,32 @@ passwd
 printf \
 	'\033[?47l'
 
-if [[ "${ENABLE_SWAP}" == "yes" ]]; then
+"${baseDir}/swap.sh"
-	printf \
-		"swap\t${DISK}${PART2}\t/dev/random\tswap,cipher=aes-xts-plain64,size=512\n" | \
-		tee /etc/crypttab &> /dev/null
-
-	printf \
-		'dev/mapper/swap\tnone\tswap\tsw\t0\t0\n' | \
-		tee --append /etc/fstab &> /dev/null
-fi
 
 if [[ "${ID}" == 'debian' ]]; then
-	cp \
+	"${baseDir}/debian.sh" --network-manager
-		/etc/NetworkManager/NetworkManager.conf \
-		/etc/NetworkManager/NetworkManager.conf.orig
-
-	cat \
-		/etc/NetworkManager/NetworkManager.conf.orig | \
-		sed 's|managed=false|managed=true|' | \
-		tee /etc/NetworkManager/NetworkManager.conf &> /dev/null
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	printf \
+	"${baseDir}/debian.sh" --initramfs
-		"UMASK=0077\n" | \
-		tee /etc/initramfs-tools/conf.d/umask.conf &> /dev/null
-
-	update-initramfs \
-		-c \
-		-k all
 elif [[ "${ID}" == 'fedora' ]]; then
-	dracut \
+	"${baseDir}/fedora.sh" --dracut
-		--force \
-		--regenerate-all
 fi
 
-zfs \
+"${baseDir}/zfs.sh" --splash
-	set \
-	org.zfsbootmenu:commandline='quiet splash rhgb noresume' \
-	${HOSTNAME,,}/ROOT/${ID}
 
-if [[ ! "${*}" = *--no-part* ]]; then
+if [[ ! -z "$(zfs list | grep 'keystore')" ]]; then
-	if [[ ! -z "$(zfs list | grep 'keystore')" ]]; then
+	"${baseDir}/zfs.sh" --keystore
-		zfs \
-			set \
-			org.zfsbootmenu:keysource=${HOSTNAME,,}/keystore \
-			${HOSTNAME,,}
-	fi
 fi
 
-if [[ ! "${*}" = *--no-part* ]]; then
+"${baseDir}/efi.sh"
-	"${baseDir}/efi.sh"
-fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	systemctl \
+	"${baseDir}/debian.sh" --systemctl-enable
-		enable \
-		zfs.target
-	systemctl \
-		enable \
-		zfs-import-cache
-	systemctl \
-		enable \
-		zfs-mount
-	systemctl \
-		enable \
-		zfs-import.target
 fi
 
 zfs \
 	snapshot \
-	${HOSTNAME,,}/ROOT/${ID}@install
+	${hostname,,}/ROOT/${ID}@install
 
 "${baseDir}/post-inst.sh"

list.sh

@@ -2,18 +2,18 @@
 set -euo pipefail
 
 
-BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
+baseDir="$(realpath "$(dirname "${0}")")"
 
 
-DISKS_BY_ID="$(ls -Ago /dev/disk/by-id/ | grep -v 'sr' | grep -v 'dm-' | grep -v 'nvme-eui.' | grep -v '\-part' | grep -v 'wwn-' | grep -v '_[1-9] -> ' | grep -v 'total' | sed -e 's|^.*\:[0-5][0-9] ||g')"
+disksById="$(ls -Ago /dev/disk/by-id/ | grep -v 'sr' | grep -v 'dm-' | grep -v 'nvme-eui.' | grep -v '\-part' | grep -v 'wwn-' | grep -v '_[1-9] -> ' | grep -v 'total' | sed -e 's|^.*\:[0-5][0-9] ||g')"
-DISKS="$(lsblk -do name | grep -v 'loop' | grep -v 'sr' | grep -v 'zram' | grep -v 'NAME')"
+disks="$(lsblk -do name | grep -v 'loop' | grep -v 'sr' | grep -v 'zram' | grep -v 'NAME')"
-NETWORK_INTERFACES="$(ip -br addr show | sed -e 's| .*$||g' | grep -v '^lo' | grep -v 'tailscale' | grep -v '^wg')"
+networkInterfaces="$(ip -br addr show | sed -e 's| .*$||g' | grep -v '^lo' | grep -v 'tailscale' | grep -v '^wg')"
 
 
 cat << EOF
 #######################################
 ##                                   ##
-##  $(cat "${BASEDIR}/title") Script  ##
+##  $(cat "${baseDir}/title") Script  ##
 ##                                   ##
 ##   Jean  <jean@easthighnerd.net>   ##
 ##                                   ##
@@ -34,13 +34,13 @@ EOF
 cat << EOF
 
 Available disks (/dev/disk/by-id/):
-${DISKS_BY_ID}
+${disksById}
 
 Available disks (/dev/):
-${DISKS}
+${disks}
 
 Available network interfaces:
-${NETWORK_INTERFACES}
+${networkInterfaces}
 
 
 Press any key to return to the main menu

menu.sh

@@ -2,17 +2,17 @@
 set -euo pipefail
 
 
-BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
+baseDir="$(realpath "$(dirname "${0}")")"
-OPTION='start'
+option='start'
 
 
-while [[ ! "${OPTION}" == 'Exit' ]]; do
+while [[ ! "${option}" == 'Exit' ]]; do
     printf '\033[?47h\033[2J\033[H'
 
     cat << EOF
 #######################################
 ##                                   ##
-##  $(cat "${BASEDIR}/title") Script  ##
+##  $(cat "${baseDir}/title") Script  ##
 ##                                   ##
 ##   Jean  <jean@easthighnerd.net>   ##
 ##                                   ##
@@ -26,10 +26,10 @@ while [[ ! "${OPTION}" == 'Exit' ]]; do
 #################
 
 EOF
-    select OPTION in 'List' 'Configure' 'Pre Install' 'Install' 'WiFi Setup' 'Post Install' 'Finalize' 'Exit'
+    select option in 'List' 'Configure' 'Install' 'Finalize' 'WiFi Setup' 'Exit'
     do
-      case "${OPTION}" in
+      case "${option}" in
-        'List'|'Configure'|'Pre Install'|'Install'|'WiFi Setup'|'Post Install'|'Finalize'|'Exit')
+        'List'|'Configure'|'Install'|'Finalize'|'WiFi Setup'|'Exit')
           break
           ;;
         *)
@@ -40,20 +40,16 @@ EOF
 
     printf '\033[2J\033[H'
 
-  if [[ "${OPTION}" == 'List' ]]; then
+  if [[ "${option}" == 'List' ]]; then
-    "${BASEDIR}/list.sh"
+    "${baseDir}/list.sh"
-  elif [[ "${OPTION}" == 'Configure' ]]; then
+  elif [[ "${option}" == 'Configure' ]]; then
-    "${BASEDIR}/configure.sh"
+    "${baseDir}/configure.sh"
-  elif [[ "${OPTION}" == 'Pre Install' ]]; then
+  elif [[ "${option}" == 'Install' ]]; then
-    "${BASEDIR}/pre-inst.sh"
+    "${baseDir}/pre-inst.sh"
-  elif [[ "${OPTION}" == 'Install' ]]; then
+  elif [[ "${option}" == 'Finalize' ]]; then
-    "${BASEDIR}/install.sh"
+    "${baseDir}/finalize.sh"
-  elif [[ "${OPTION}" == 'WiFi Setup' ]]; then
+  elif [[ "${option}" == 'WiFi Setup' ]]; then
-    "${BASEDIR}/wifi.sh"
+    "${baseDir}/wifi.sh"
-  elif [[ "${OPTION}" == 'Post Install' ]]; then
-    "${BASEDIR}/post-inst.sh"
-  elif [[ "${OPTION}" == 'Finalize' ]]; then
-    "${BASEDIR}/finalize.sh"
   fi
 
   printf '\033[?47h\033[2J\033[H'

mkdir-tmpfs.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -euo pipefail
+
+
+mkdir \
+	-p \
+	/mnt/run
+
+mount \
+	-t \
+	tmpfs \
+	tmpfs \
+	/mnt/run
+
+mkdir \
+	-p \
+	/mnt/run/lock

mount.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -euo pipefail
+
+
+mount \
+	--types proc \
+	proc \
+	/mnt/proc
+
+mount \
+	--types sysfs \
+	sys \
+	/mnt/sys
+
+mount \
+	--bind \
+	/dev \
+	/mnt/dev
+
+mount \
+	--types devpts \
+	pts \
+	/mnt/dev/pts
+
+mount \
+	--types efivarfs \
+	efivarfs \
+	/mnt/sys/firmware/efi/efivars

mtab.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euo pipefail
+
+
+ln \
+	-s \
+	/proc/self/mounts \
+	/etc/mtab

partition.sh

@@ -1,62 +1,96 @@
 #!/bin/bash
 set -euo pipefail
 
-BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
+baseDir="$(realpath "$(dirname "${0}")")"
 
 source \
 	/etc/os-release
 source \
-	"${BASEDIR}/system.conf"
+	"${baseDir}/system.conf"
 
-if [[ ! "${DISK}" == **/dev/disk/by-id/** ]]; then
+
-	if [[ "${DISK}" == **/dev/nvme** ]]; then
+if [[ "${1}" == '--disk' ]]; then
-		PART3='p3'
+	if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
+		if [[ "${disk}" == **/dev/nvme** ]]; then
+			part3='p3'
+		else
+			part3='3'
+		fi
 	else
-		PART3='3'
+		part3='-part3'
 	fi
-else
-	PART3='-part3'
-fi
 
-swapoff \
+	swapoff \
-	--all
+		--all
 
-wipefs \
+	wipefs \
-	-a \
+		-a \
-	${DISK}
+		${disk}
 
-if [[ ! "${DISK_TYPE}" == 'HDD' ]]; then
+	if [[ ! "${diskType}" == 'HDD' ]]; then
-	blkdiscard \
+		blkdiscard \
-		-f \
+			-f \
-		${DISK}
+			${disk}
-fi
-
-sgdisk \
-	--zap-all \
-	${DISK}
-
-sgdisk \
-	-n1:0:+512M \
-	-t1:EF00 \
-	-c1:EFI \
-	${DISK}
-
-if [[ "${ENABLE_SWAP}" == "yes" ]]; then
-	SWAP_SIZE="$(((($(vmstat -sS M | grep 'total memory' | sed 's/ M total memory//') / 1024) + 1) * 2))"
-
-	if [[ "${SWAP_SIZE#}" -gt '32' ]]; then
-		SWAP_SIZE='32'
 	fi
 
 	sgdisk \
-		-n2:0:+${SWAP_SIZE}G \
+		--zap-all \
-		-t2:BF02 \
+		${disk}
-		-c2:swap \
+
-		${DISK}
+	sgdisk \
+		-n1:0:+512M \
+		-t1:EF00 \
+		-c1:EFI \
+		${disk}
+
+	if [[ "${enableSwap}" == "yes" ]]; then
+		swapSize="$(((($(vmstat -sS M | grep 'total memory' | sed 's/ M total memory//') / 1024) + 1) * 2))"
+
+		if [[ "${swapSize#}" -gt '16' ]]; then
+			swapSize='16'
+		fi
+
+		sgdisk \
+			-n2:0:+${swapSize}G \
+			-t2:BF02 \
+			-c2:swap \
+			${disk}
+	fi
+
+	sgdisk \
+		-n3:0:0 \
+		-t3:BF00 \
+		-c3:${ID} \
+		${disk}
 fi
 
-sgdisk \
+if [[ "${1}" == '--efi' ]]; then
-	-n3:0:0 \
+	if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
-	-t3:BF00 \
+		if [[ "${disk}" == **/dev/nvme** ]]; then
-	-c3:${ID} \
+			part1='p1'
-	${DISK}
+		else
+			part1='1'
+		fi
+	else
+		part1='-part1'
+	fi
+
+	mkdosfs \
+		-F 32 \
+		-s 1 \
+		-n EFI \
+		${disk}${part1}
+
+	mkdir \
+	-p \
+	/boot/efi
+
+	printf \
+		"/dev/disk/by-uuid/$(blkid -s UUID -o value ${disk}${part1}) /boot/efi vfat defaults 0 0\n" | \
+		tee --append /etc/fstab &> /dev/null
+
+	sleep 5
+
+	mount \
+		/boot/efi
+fi

post-inst.sh

@@ -2,7 +2,12 @@
 set -euo pipefail
 
 
-BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
+baseDir="$(realpath "$(dirname "${0}")")"
+
+source \
+	/etc/os-release
+source \
+	"${baseDir}/system.conf"
 
 
 printf \
@@ -11,7 +16,7 @@ printf \
 cat << EOF
 #######################################
 ##                                   ##
-##  $(cat "${BASEDIR}/title") Script  ##
+##  $(cat "${baseDir}/title") Script  ##
 ##                                   ##
 ##   Jean  <jean@easthighnerd.net>   ##
 ##                                   ##
@@ -28,231 +33,34 @@ cat << EOF
 EOF
 
 
-source \
+"${baseDir}/zfs.sh" --home
-	/etc/os-release
 
-source \
+"${baseDir}/adduser.sh"
-	"${BASEDIR}/system.conf"
-
-
-if [[ ! "${*}" = *--no-part* ]]; then
-	zfs create\
-		${HOSTNAME,,}/home/${USERNAME}
-
-	zfs create\
-		${HOSTNAME,,}/home/${USERNAME}/.config
-
-	zfs create\
-		-o canmount=off\
-		${HOSTNAME,,}/home/${USERNAME}/.var
-
-	zfs create\
-		${HOSTNAME,,}/home/${USERNAME}/.var/app
-
-	zfs create\
-		-o canmount=off\
-		${HOSTNAME,,}/home/${USERNAME}/.local
-
-	zfs create\
-		-o canmount=off\
-		${HOSTNAME,,}/home/${USERNAME}/.local/share
-
-	zfs create\
-		${HOSTNAME,,}/home/${USERNAME}/.local/share/flatpak
-
-	printf \
-		'Adding user account...\n'
-
-	adduser ${USERNAME}
-else
-	adduser --no-create-home ${USERNAME}
-fi
-
-if [[ "${ID}" == 'fedora' ]]; then
-	printf \
-		'\033[?47h\033[2J\033[H'
-
-	cat << EOF
-
-Enter a password for the new user account:
-EOF
-	passwd \
-		${USERNAME}
-
-	printf \
-		'\033[?47l'
-
-	usermod \
-		-a \
-		-G \
-		audio,cdrom,dip,floppy,wheel,video,dialout \
-		${USERNAME}
-else
-	if [[ -z "$(cat /etc/group | grep 'lpadmin')" ]]; then
-		groupadd --gid 108 lpadmin
-	fi
-
-	usermod \
-		-a \
-		-G \
-		audio,cdrom,dip,floppy,netdev,plugdev,sudo,video,dialout,lpadmin \
-		${USERNAME}
-fi
 
 if [[ "${ID}" == 'elementary' ]]; then
-	cat << EOF > /etc/apt/sources.list.d/backports.list
+	"${baseDir}/elementary.sh" --namarupa
-deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_VERSION_CODENAME}-backports main restricted universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ ${UBUNTU_VERSION_CODENAME}-backports main restricted universe multiverse
-EOF
-
-	cat << EOF > /etc/apt/preferences.d/backports.pref
-Package: *
-Pin: release n=${UBUNTU_VERSION_CODENAME}*
-Pin-Priority: 990
-
-Package: linux* /wayland/
-Pin: release n=${UBUNTU_VERSION_CODENAME}-backports
-Pin-Priority: -1
-EOF
 elif [[ "${ID}" == 'debian' ]]; then
-	cat << EOF | tee --append /etc/apt/sources.list.d/${VERSION_CODENAME}.sources &> /dev/null
+	"${baseDir}/debian.sh" --contrib
-
-# ${VERSION_CODENAME^} Backports
-Enabled:		yes
-Types:			deb deb-src
-URIs:			http://deb.debian.org/debian/
-Suites:			${VERSION_CODENAME}-backports
-Components:		main non-free-firmware contrib
-Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
-EOF
-
-	cat << EOF | tee /etc/apt/preferences.d/backports.pref &> /dev/null
-Package:		*
-Pin:			release	n=${VERSION_CODENAME}*
-Pin-Priority:	990
-
-Package:		linux-*
-Pin:			release	n=${VERSION_CODENAME}-backports
-Pin-Priority:	-1
-EOF
-
-	if [[ "${VERSION_CODENAME}" == 'bookworm' ]]; then
-	cat << EOF | tee --append /etc/apt/preferences.d/backports.pref &> /dev/null
-
-Package: /wayland/
-Pin: release n=${VERSION_CODENAME}-backports
-Pin-Priority: -1
-EOF
-	fi
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
 	apt \
+		--update \
 		dist-upgrade \
 		--yes
 fi
 
-if [[ "${ID}" == 'elementary' ]]; then
+if [[ "${ID}" = 'debian' ]]; then
-	apt \
+	"${baseDir}/debian.sh" --tasksel
-		install \
-		--yes \
-		--autoremove \
-		elementary-desktop
-elif [[ "${ID}" = 'debian' ]]; then
-	if [[ ! -f /usr/bin/tasksel ]]; then
-		apt \
-			install \
-			--yes \
-			tasksel
-	fi
-
-	tasksel \
-		--new-install
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	for file in /etc/logrotate.d/* ; do
+	"${baseDir}/debian.sh" --logrotate
-		if grep -Eq "(^|[^#y])compress" "$file" ; then
-			sed -i -r "s/(^|[^#y])(compress)/\1#\2/" "$file"
-		fi
-	done
 
-	cat << EOF | tee /usr/bin/zfs-system-snapshot-apt &> /dev/null
+	"${baseDir}/apt-snapshot.sh"
-#!/bin/bash
-set -euo pipefail
-
-
-TIMESTAMP="\$(date +%Y_%m_%d-%H_%M_%S)"
-
-
-if [[ -z "\$(zfs list -t snapshot | grep 'apt-\${TIMESTAMP}')" ]]; then
-    zfs snapshot \$(zfs mount | grep 'ROOT' | sed 's| .*||')@apt-\${TIMESTAMP} && printf "\n- Snapshot taken\n\n"
-fi
-EOF
-
-	chmod \
-		+x \
-		/usr/bin/zfs-system-snapshot-apt
-
-	printf \
-		'DPkg::Pre-Install-Pkgs {"/usr/bin/zfs-system-snapshot-apt";};\n' | \
-		tee /etc/apt/apt.conf.d/90-zfs_system-snapshot &> /dev/null
-
-	printf \
-		'DPkg::Post-Invoke {"apt moo";};\n' | \
-		tee /etc/apt/apt.conf.d/99-apt_moo &> /dev/null
 fi
 
-if [[ ! "${*}" = *--no-part* ]]; then
+"${baseDir}/home-fix-setup.sh"
-	cat << EOF | tee /usr/bin/home-fix.sh &> /dev/null
-#!/bin/bash
-set -euo pipefail
-
-chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}
-
-sudo -u ${USERNAME} cp -a /etc/skel/. /home/${USERNAME}
-
-if [[ ! -z "\$(find -P /home/${USERNAME}/ | grep '\.face')" ]]; then
-	find -P /home/${USERNAME}/ | grep '\.face' | xargs -d '\n' -I {} rm {}
-fi
-
-if [[ ! -z "\$(find -P /var/spool/cron | grep 'root')" ]]; then
-    rm \$(find -P /var/spool/cron | grep 'root')
-fi
-
-printf "\$(date +%Y-%m-%d\ %H:%M:%S) I did the thing\n" | tee /var/log/home-fix.log &> /dev/null
-
-if [[ -f '/usr/bin/home-fix.sh' ]]; then
-    rm /usr/bin/home-fix.sh
-fi
-
-zfs snapshot ${HOSTNAME,,}/ROOT/${ID}@home-fix
-
-zfs snapshot -r ${HOSTNAME,,}/home/${USERNAME}@home-fix
-EOF
-
-	chmod \
-		+x \
-		/usr/bin/home-fix.sh
-
-	if [[ "${ID}" == 'fedora' ]]; then
-		printf \
-			"@reboot\tsudo -u ${USERNAME} '${BASEDIR}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \
-			tee /var/spool/cron/root &> /dev/null
-	elif [[ "${ID}" == 'debian' ]]; then
-		printf \
-			"@reboot\tsudo -u ${USERNAME} '${BASEDIR}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \
-			tee /var/spool/cron/crontabs/root &> /dev/null
-
-		chown \
-			:crontab \
-			/var/spool/cron/crontabs/root
-
-		chmod \
-			0600 \
-			/var/spool/cron/crontabs/root
-	fi
-fi
 
 if [[ ! -f '/usr/bin/shutdown' ]]; then
 	ln -s /sbin/shutdown /usr/bin/shutdown
@@ -264,7 +72,7 @@ fi
 
 zfs \
 	snapshot \
-	${HOSTNAME,,}/ROOT/${ID}@post-install
+	${hostname,,}/ROOT/${ID}@post-install
 
 printf \
 	'\033[?47h\033[2J\033[H'

pre-inst.sh

@@ -31,20 +31,6 @@ source \
 	"${baseDir}/system.conf"
 
 
-if [[ "${ID}" == 'debian' ]]; then
-	if [[ ! "$(hostname)" == "debian-live" ]]; then
-		cat << EOF | tee /etc/apt/sources.list.d/contrib.sources 1> /dev/null
-Enabled:		yes
-Types:			deb
-URIs:			http://deb.debian.org/debian/
-Suites:			${VERSION_CODENAME}
-Components:		contrib
-Signed-By:		/usr/share/keyrings/debian-archive-keyring.gpg
-EOF
-	fi
-fi
-
-
 if [[ -f '/usr/bin/gsettings' ]]; then
 	gsettings \
 		set \
@@ -54,72 +40,27 @@ if [[ -f '/usr/bin/gsettings' ]]; then
 fi
 
 if [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
-	apt \
+	"${baseDir}/debian.sh" --live
-		update && \
-	apt \
-		install \
-		--yes \
-		mmdebstrap \
-		gdisk \
-		systemd-timesyncd \
-		whois \
-		zfsutils-linux
 elif [[ "${ID}" == 'fedora' ]]; then
-	if [[ "${VERSION_ID}" -lt '41' ]]; then
+	"${baseDir}/fedora.sh" --live
-		dnf config-manager \
-			--disable \
-			updates
-	else
-		dnf config-manager \
-			setopt \
-			updates.enabled=0
-	fi
-
-	dnf install \
-		-y \
-		https://zfsonlinux.org/fedora/zfs-release-${zolFedoraVer}$(rpm --eval "%{dist}").noarch.rpm
-
-	dnf install \
-		-y \
-		https://dl.fedoraproject.org/pub/fedora/linux/releases/${VERSION_ID}/Everything/x86_64/os/Packages/k/kernel-devel-$(uname -r).rpm
-
-	dnf install \
-		-y \
-		zfs \
-		gdisk
-
-	modprobe \
-		zfs
 fi
 
 timedatectl
 
 if [[ ! "$(hostname)" == "debian-live" ]]; then
-	zgenhostid \
+	"${baseDir}/zfs.sh" --host-id
-		-f \
-		0x00bab10c
 fi
 
 
-"${baseDir}/partition.sh"
+"${baseDir}/partition.sh" --disk
 
 sleep 5
 
-"${baseDir}/zfs.sh"
+"${baseDir}/zfs.sh" --format
 
-mkdir \
+"${baseDir}/zfs.sh" --create
-	-p \
-	/mnt/run
 
-mount \
+"${baseDir}/mkdir-tmpfs.sh"
-	-t \
-	tmpfs \
-	tmpfs \
-	/mnt/run
-
-mkdir \
-	-p \
-	/mnt/run/lock
 
 if [[ "${ID}" == 'elementary' ]]; then
 	"${baseDir}/elementary.sh" --mmdebstrap
@@ -129,14 +70,12 @@ elif [[ "${ID}" == 'fedora' ]]; then
 	"${baseDir}/fedora.sh" --rsync
 fi
 
-printf \
+"${baseDir}/hostname.sh"
-	"${hostname}\n" | tee /mnt/etc/hostname &> /dev/null
-
-printf \
-	"127.0.1.1\t${hostname}\n" | tee --append /mnt/etc/hosts &> /dev/null
 
 if [[ "${ID}" == 'debian' ]]; then
 	"${baseDir}/debian.sh" --network-interfaces
+elif [[ "${ID}" == 'elementary' ]]; then
+	"${baseDir}/elementary.sh" --network
 fi
 
 if [[ "${ID}" == 'elementary' ]]; then
@@ -145,67 +84,31 @@ elif [[ "${ID}" == 'debian' ]]; then
 	"${baseDir}/debian.sh" --sources
 fi
 
-mount \
+"${baseDir}/mount.sh"
-	--rbind \
-	/dev \
-	/mnt/dev
 
-mount \
+"${baseDir}/host-id.sh"
-	--rbind \
-	/proc \
-	/mnt/proc
-
-mount \
-	--rbind \
-	/sys \
-	/mnt/sys
-
-cp \
-	/etc/hostid \
-	/mnt/etc/
 
 if [[ "${ID}" == 'fedora' ]]; then
 	"${baseDir}/fedora.sh" --resolv-conf
 fi
 
-rsync -pogAXtlHrDx \
+"${baseDir}/rsync.sh"
-	"${baseDir}" \
-		/mnt
 
 if [[ "${ID}" == 'elementary' ]]; then
 	"${baseDir}/elementary.sh" --skel
 fi
 
-# if [[ ! "${*}" = *--no-part* ]]; then
+if [[ -f "/etc/zfs/keys/${hostname,,}.key" ]]; then
-	if [[ -f "/etc/zfs/keys/${hostname,,}.key" ]]; then
+	"${baseDir}/zfs.sh" --key
-		cp \
+fi
-			/etc/zfs/keys/${hostname,,}.key \
-			/mnt/etc/zfs/keys/
-	fi
-# fi
 
 if [[ "${ID}" == 'elementary' ]]; then
 	"${baseDir}/elementary.sh" --elementary
 fi
 
-printf \
+"${baseDir}/chroot.sh" --continue
-	"\nNow chrooting into /mnt...\n\n"
 
-chroot \
+"${baseDir}/zfs.sh" --unmount
-	/mnt \
-	"$(printf "${baseDir}\n" | sed 's|.*\/|\/|')/install.sh"
-
-mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | xargs -I {} umount -Rlf {}
-
-if [[ "${ID}" == 'fedora' ]]; then
-	umount \
-		-nR \
-		/mnt
-fi
-
-zpool \
-	export \
-	-a
 
 printf \
 	'\033[?47h\033[2J\033[H'

rbind.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -euo pipefail
+
+
+mount \
+	--rbind \
+	/dev \
+	/mnt/dev
+
+mount \
+	--rbind \
+	/proc \
+	/mnt/proc
+
+mount \
+	--rbind \
+	/sys \
+	/mnt/sys

rsync.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -euo pipefail
+
+baseDir="$(realpath "$(dirname "${0}")")"
+
+
+rsync -pogAXtlHrDx \
+	"${baseDir}" \
+		/mnt

swap.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+set -euo pipefail
+
+baseDir="$(realpath "$(dirname "${0}")")"
+
+source \
+	"${baseDir}/system.conf"
+
+
+if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
+	if [[ "${disk}" == **/dev/nvme** ]]; then
+		part2='p2'
+	else
+		part2='2'
+	fi
+else
+	part2='-part2'
+fi
+
+
+if [[ "${enableSwap}" == "yes" ]]; then
+	printf \
+		"swap\t${disk}${part2}\t/dev/random\tswap,cipher=aes-xts-plain64,size=512\n" | \
+		tee /etc/crypttab &> /dev/null
+
+	printf \
+		'dev/mapper/swap\tnone\tswap\tsw\t0\t0\n' | \
+		tee --append /etc/fstab &> /dev/null
+fi

wifi.sh

@@ -7,13 +7,13 @@ set -euo pipefail
 # resolvectl status | grep 'Link' | sed -e 's|^.*(||g; s|).*||g' | while read -r INTERFACE; do resolvectl dns ${INTERFACE} 9.9.9.9; done && sleep 3 && nmcli device status | grep -v 'DEVICE' | grep -v 'lo' | sed -e 's| .*||g' | while read -r INTERFACE; do nmcli device disconnect ${INTERFACE}; sleep 1; nmcli device connect ${INTERFACE}; done
 
 
-BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
+baseDir="$(realpath "$(dirname "${0}")")"
 
 
 cat << EOF
 #######################################
 ##                                   ##
-##  $(cat "${BASEDIR}/title") Script  ##
+##  $(cat "${baseDir}/title") Script  ##
 ##                                   ##
 ##   Jean  <jean@easthighnerd.net>   ##
 ##                                   ##
@@ -35,9 +35,9 @@ nmcli radio wifi on
 nmcli device wifi list
 
 printf "Enter the SSID of the WiFi network you wish to connect to:\n"
-read -r WIFI_NAME
+read -r wifiName
 
-nmcli --ask device wifi connect ${WIFI_NAME}
+nmcli --ask device wifi connect "${wifiName}"
 
 cat << EOF
 

zfs.sh

@@ -1,57 +1,57 @@
 #!/bin/bash
 set -euo pipefail
 
-BASEDIR="$(dirname "${0}" | sed "s|^\.|${PWD}|")"
+baseDir="$(realpath "$(dirname "${0}")")"
 
 source \
 	/etc/os-release
 source \
-	"${BASEDIR}/system.conf"
+	"${baseDir}/system.conf"
 
 
-if [[ ! "${DISK}" == **/dev/disk/by-id/** ]]; then
+if [[ ! "${disk}" == **/dev/disk/by-id/** ]]; then
-	if [[ "${DISK}" == **/dev/nvme** ]]; then
+	if [[ "${disk}" == **/dev/nvme** ]]; then
-		PART3='p3'
+		part3='p3'
 	else
-		PART3='3'
+		part3='3'
 	fi
 else
-	PART3='-part3'
+	part3='-part3'
 fi
 
 
-# if [[ ! "${*}" = *--no-part* ]]; then
+if [[ "${1}" == '--format' ]]; then
-	if [[ "${ENCRYPTION}" == 'yes' ]]; then
+	if [[ "${encryption}" == 'yes' ]]; then
-		ZPOOL_PASSWORD='A'
+		zpoolPassword='A'
-		ZPOOL_PASSWORD_VERIFY='B'
+		zpoolPasswordVerify='B'
 
 		printf \
 			'\033[?47h\033[2J\033[H'
 
-		while [[ ! "${ZPOOL_PASSWORD}" == "${ZPOOL_PASSWORD_VERIFY}" ]] || [[ -z "${ZPOOL_PASSWORD}" ]] || [[ "${#ZPOOL_PASSWORD}" -lt '8' ]]; do
+		while [[ ! "${zpoolPassword}" == "${zpoolPasswordVerify}" ]] || [[ -z "${zpoolPassword}" ]] || [[ "${#zpoolPassword}" -lt '8' ]]; do
 			printf \
-				"\nEnter a password to encrypt your root pool (minimum 8 characters):\n"
+				"Enter a password to encrypt your root pool (minimum 8 characters):\n"
 			read \
 				-r \
 				-s \
-				ZPOOL_PASSWORD
+				zpoolPassword
 
 			printf \
-				"\nVerify the password to encrypt your root pool:\n"
+				"Verify the password to encrypt your root pool:\n"
 			read \
 				-r \
 				-s \
-				ZPOOL_PASSWORD_VERIFY
+				zpoolPasswordVerify
 
-			if [[ ! "${ZPOOL_PASSWORD}" == "${ZPOOL_PASSWORD_VERIFY}" ]]; then
+			if [[ ! "${zpoolPassword}" == "${zpoolPasswordVerify}" ]]; then
 				printf \
-					"ERROR:\tPasswords do not match!\n"
+					"ERROR:\tPasswords do not match!\n\n"
-			elif [[ -z "${ZPOOL_PASSWORD}" ]]; then
+			elif [[ -z "${zpoolPassword}" ]]; then
 				printf \
-					"ERROR:\tPassword is empty!\n"
+					"ERROR:\tPassword is empty!\n\n"
-			elif [[ "${#ZPOOL_PASSWORD}" -lt '8' ]]; then
+			elif [[ "${#zpoolPassword}" -lt '8' ]]; then
 				printf \
-					"ERROR:\tPassword is too short!\n"
+					"ERROR:\tPassword is too short!\n\n"
 			fi
 		done
 
@@ -63,18 +63,18 @@ fi
 			/etc/zfs/keys/
 
 		printf \
-			"${ZPOOL_PASSWORD}\n" | tee /etc/zfs/keys/${HOSTNAME,,}.key &> /dev/null
+			"${zpoolPassword}\n" | tee /etc/zfs/keys/${hostname,,}.key &> /dev/null
 
 		chmod \
 			000 \
-			/etc/zfs/keys/${HOSTNAME,,}.key
+			/etc/zfs/keys/${hostname,,}.key
 
 		zpool create \
 			-o ashift=12 \
 			-o autotrim=on \
 			-o compatibility=openzfs-2.1-linux \
 			-O encryption=on \
-			-O keylocation=file:///etc/zfs/keys/${HOSTNAME,,}.key \
+			-O keylocation=file:///etc/zfs/keys/${hostname,,}.key \
 			-O keyformat=passphrase \
 			-O acltype=posixacl \
 			-O xattr=sa \
@@ -85,8 +85,8 @@ fi
 			-O canmount=off \
 			-O mountpoint=/ \
 			-R /mnt \
-			${HOSTNAME,,} \
+			${hostname,,} \
-			${DISK}${PART3}
+			${disk}${part3}
 	else
 		zpool create \
 			-o ashift=12 \
@@ -102,42 +102,31 @@ fi
 			-O canmount=off \
 			-O mountpoint=/ \
 			-R /mnt \
-			${HOSTNAME,,} \
+			${hostname,,} \
-			${DISK}${PART3}
+			${disk}${part3}
 	fi
+fi
 
+if [[ "${1}" == '--create' ]]; then
 	zfs create \
 		-o canmount=off \
 		-o mountpoint=none \
-		${HOSTNAME,,}/ROOT
+		${hostname,,}/ROOT
-# else
-# 	zpool import \
-# 		-N \
-# 		-R \
-# 		/mnt \
-# 		${HOSTNAME,,}
-#
-# 	zfs load-key \
-# 		-r \
-# 		-L prompt \
-# 		${HOSTNAME,,}
-# fi
 
-zfs create \
-	-o canmount=noauto \
-	-o mountpoint=/ \
-	${HOSTNAME,,}/ROOT/${ID}
-
-zfs mount \
-	${HOSTNAME,,}/ROOT/${ID}
-
-# if [[ ! "${*}" = *--no-part* ]]; then
 	zfs create \
-		${HOSTNAME,,}/home
+		-o canmount=noauto \
+		-o mountpoint=/ \
+		${hostname,,}/ROOT/${ID}
+
+	zfs mount \
+		${hostname,,}/ROOT/${ID}
+
+	zfs create \
+		${hostname,,}/home
 
 	zfs create \
 		-o mountpoint=/root \
-		${HOSTNAME,,}/home/root
+		${hostname,,}/home/root
 
 	chmod \
 		700 \
@@ -146,29 +135,29 @@ zfs mount \
 	zfs create \
 		-o canmount=off \
 		-o mountpoint=/var \
-		${HOSTNAME,,}/var
+		${hostname,,}/var
 
 	zfs create \
 		-o canmount=off \
-		${HOSTNAME,,}/var/lib
+		${hostname,,}/var/lib
 
 	zfs create \
-		${HOSTNAME,,}/var/log
+		${hostname,,}/var/log
 
 	zfs create \
-		${HOSTNAME,,}/var/spool
+		${hostname,,}/var/spool
 
 	zfs create \
 		-o com.sun:auto-snapshot=false \
-		${HOSTNAME,,}/var/cache
+		${hostname,,}/var/cache
 
 	zfs create \
 		-o com.sun:auto-snapshot=false \
-		${HOSTNAME,,}/var/lib/nfs
+		${hostname,,}/var/lib/nfs
 
 	zfs create \
 		-o com.sun:auto-snapshot=false \
-		${HOSTNAME,,}/var/tmp
+		${hostname,,}/var/tmp
 
 	chmod \
 		1777 \
@@ -176,99 +165,114 @@ zfs mount \
 
 	zfs create \
 		-o mountpoint=/srv \
-		${HOSTNAME,,}/srv
+		${hostname,,}/srv
 
 	zfs create \
 		-o canmount=off \
 		-o mountpoint=/usr \
-		${HOSTNAME,,}/usr
+		${hostname,,}/usr
 
 	zfs create \
-		${HOSTNAME,,}/usr/local
+		${hostname,,}/usr/local
 
 	zfs create \
-		${HOSTNAME,,}/var/games
+		${hostname,,}/var/games
 
 	zfs create \
-		${HOSTNAME,,}/var/lib/AccountsService
+		${hostname,,}/var/lib/AccountsService
 
 	zfs create \
-		${HOSTNAME,,}/var/lib/NetworkManager
+		${hostname,,}/var/lib/NetworkManager
 
 	zfs create \
-		${HOSTNAME,,}/var/www
+		${hostname,,}/var/www
 
 	zfs create \
 		-o com.sun:auto-snapshot=false \
 		-o mountpoint=/tmp \
-		${HOSTNAME,,}/tmp
+		${hostname,,}/tmp
 
-	if [[ "${ENCRYPTION}" == 'yes' ]]; then
+	if [[ "${encryption}" == 'yes' ]]; then
 		zfs create \
 			-o com.sun:auto-snapshot=false \
 			-o mountpoint=/etc/zfs/keys \
-			${HOSTNAME,,}/keystore
+			${hostname,,}/keystore
 	fi
 
 	zpool set \
-		bootfs=${HOSTNAME,,}/ROOT/${ID} \
+		bootfs=${hostname,,}/ROOT/${ID} \
-		${HOSTNAME,,}
+		${hostname,,}
-# else
-# 	zfs mount \
-# 	${HOSTNAME,,}/home
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/home/root
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/log
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/spool
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/cache
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/lib/nfs
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/tmp
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/srv
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/usr/local
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/games
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/lib/AccountsService
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/lib/NetworkManager
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/var/www
-#
-# 	zfs mount \
-# 	${HOSTNAME,,}/keystore
-# fi
 
-if [[ "${ID}" == 'fedora' ]]; then
+	if [[ "${ID}" == 'fedora' ]]; then
-	"${BASEDIR}/base-fedora.sh" -1
+		"${baseDir}/fedora.sh" --rsync
-fi
+	fi
 
-# if [[ ! "${*}" = *--no-part* ]]; then
 	zfs create \
-		${HOSTNAME,,}/var/mail
+		${hostname,,}/var/mail
 
 	chmod \
 		1777 \
 		/mnt/tmp
-# else
+fi
-# 	zfs mount \
+
-# 	${HOSTNAME,,}/var/mail
+if [[ "${1}" == '--key' ]]; then
-# fi
+	cp \
+		/etc/zfs/keys/${hostname,,}.key \
+		/mnt/etc/zfs/keys/
+fi
+
+if [[ "${1}" == '--unmount' ]]; then
+	umount \
+		-nR \
+		/mnt
+
+	zpool \
+		export \
+		${hostname,,}
+fi
+
+if [[ "${1}" == '--host-id' ]]; then
+	zgenhostid \
+		-f \
+		0x00bab10c
+fi
+
+if [[ "${1}" == '--home' ]]; then
+	zfs create\
+		${hostname,,}/home/${username}
+
+	zfs create\
+		${hostname,,}/home/${username}/.config
+
+	zfs create\
+		-o canmount=off\
+		${hostname,,}/home/${username}/.var
+
+	zfs create\
+		${hostname,,}/home/${username}/.var/app
+
+	zfs create\
+		-o canmount=off\
+		${hostname,,}/home/${username}/.local
+
+	zfs create\
+		-o canmount=off\
+		${hostname,,}/home/${username}/.local/share
+
+	zfs create\
+		${hostname,,}/home/${username}/.local/share/flatpak
+fi
+
+if [[ "${1}" == '--keystore' ]]; then
+	zfs \
+		set \
+		org.zfsbootmenu:keysource=${hostname,,}/keystore \
+		${hostname,,}
+fi
+
+if [[ "${1}" == '--splash' ]]; then
+	zfs \
+		set \
+		org.zfsbootmenu:commandline='quiet splash rhgb noresume' \
+		${hostname,,}/ROOT/${ID}
+fi