From f8610a9190fdc116f19e053c1f3253b0abc16708 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 12 Mar 2021 16:46:31 +0100
Subject: [PATCH] restructure

---
 functions/functions                 |  7 +++++++
 modules/20-installation/install     | 13 +++++++++++--
 modules/40-basesystem/pre           |  1 +
 modules/60-de/install               |  4 ----
 modules/60-de/pre                   | 11 +++++++++--
 modules/de.d/pre/system/wayland.mod | 15 ---------------
 modules/de.d/pre/system/xorg.mod    |  6 ------
 7 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 modules/de.d/pre/system/wayland.mod
 delete mode 100644 modules/de.d/pre/system/xorg.mod

diff --git a/functions/functions b/functions/functions
index b7edfa4..402ff48 100644
--- a/functions/functions
+++ b/functions/functions
@@ -142,6 +142,13 @@ ignorepkg() {
 	done
 }
 
+removepkg() {
+	local input=( ${@} )
+	for i in $(seq 0 "$(( ${#input[@]} - 1 ))"); do
+                removepkg+=( "${input[$i]}" )
+        done
+}
+
 check() {
 	if [[ $1 == "alnum" ]]; then
 		if [[ "${2}" =~ ^[[:alnum:]]+$ ]] || [[ "${2}" =~ ^[0-9A-Za-z._]+$ ]]; then
diff --git a/modules/20-installation/install b/modules/20-installation/install
index 9544666..5b0a6ed 100644
--- a/modules/20-installation/install
+++ b/modules/20-installation/install
@@ -18,14 +18,23 @@ echo ""
 echo "recent fingerprint: 60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d"
 echo ""
 
+for i in ${pkg[@]}; do
+	for j in ${removepkg[@]}; do
+		if [[ "${i}" == "${j}"]]; then
+			continue 2
+		fi
+	done
+	toinstall+=( "$i" )
+done
+
 if [[ "${#pkg[@]}" -gt 0 ]]; then
 	inst "${pkg[@]}"
 else
 	echo nothing to do
 fi
 
-if [[ "${#ignorepkg[@]}" -gt 0 ]]; then
-	remove "${ignorepkg[@]}"
+if [[ "${#removepkg[@]}" -gt 0 ]]; then
+	remove "${removepkg[@]}"
 else
 	echo nothing to do
 fi
diff --git a/modules/40-basesystem/pre b/modules/40-basesystem/pre
index 43e3426..4ad7614 100644
--- a/modules/40-basesystem/pre
+++ b/modules/40-basesystem/pre
@@ -14,6 +14,7 @@ setconf add "timezone" "Europe/Berlin"
 
 addpkg base-system void-repo-multilib void-repo-multilib-nonfree void-repo-nonfree btrfs-progs lvm2 cronie socklog-void ntp xtools sudo wireguard-tools gnupg2 progress pwgen net-tools ncdu nmap mtr ioping iotop hdparm smartmontools htop git
 ignorepkg nvi
+removepkg nvi
 servicesenable acpid cronie socklog-unix nanoklogd uuidd
 servicesdisable agetty-tty6 agetty-tty5
 
diff --git a/modules/60-de/install b/modules/60-de/install
index 5d8e7f6..62962e5 100644
--- a/modules/60-de/install
+++ b/modules/60-de/install
@@ -6,8 +6,4 @@ if [[ ! "${cfg[de]}" == "none" ]]; then
 	test -f "${dest}"/etc/locale-user.conf && cp "${dest}"/etc/locale-user.conf "${dest}"/etc/sv/${cfg[dm]}/conf
 fi
 
-if [[ "${cfg[soundsystem]}" == "pipewire" ]]; then
-	source "${modules}"/"${modulename}".d/install/sound/"${cfg[soundsystem]}".mod
-fi
-
 module end
diff --git a/modules/60-de/pre b/modules/60-de/pre
index dfb20a6..19da091 100644
--- a/modules/60-de/pre
+++ b/modules/60-de/pre
@@ -8,7 +8,9 @@ multiplechoice "gfx_hardware" "amd" "nvidia" "intel" "none"
 if [[ ! "${cfg[de]}" == "none" ]]; then
 	addpkg cups cups-filters gutenprint hplip foomatic-db
 	
-	addpkg "firefox"
+	addpkg "firefox-i18n-de" "thunderbird-i18n-de"
+
+	addpkg "aspell-de" "gspell"
 
 	addpkg "alsa-utils" alsa-plugins-pulseaudio pulseaudio
 	
@@ -17,7 +19,12 @@ if [[ ! "${cfg[de]}" == "none" ]]; then
 	servicesenable "dbus" "NetworkManager" "alsa" "cupsd"
 
 	servicesdisable "acpid" 
-	
+
+	addpkg xorg-minimal xorg-fonts mesa-dri vulkan-loader xorg-apps
+
+	removepkg "font-adobe-75dpi" "font-adobe-100dpi"
+	ignorepkg "font-adobe-75dpi" "font-adobe-75dpi"
+
 	test -f "${modules}"/de.d/pre/de/"${cfg[de]}".mod && source "${modules}"/de.d/pre/de/"${cfg[de]}".mod
 	test -f "${modules}"/de.d/pre/system/"${cfg[gfx_system]}".mod && source "${modules}"/de.d/pre/system/"${cfg[gfx_system]}".mod
 	test -f "${modules}"/de.d/pre/gfx/"${cfg[gfx_hardware]}".mod && source "${modules}"/de.d/pre/gfx/"${cfg[gfx_hardware]}".mod
diff --git a/modules/de.d/pre/system/wayland.mod b/modules/de.d/pre/system/wayland.mod
deleted file mode 100644
index 27a4213..0000000
--- a/modules/de.d/pre/system/wayland.mod
+++ /dev/null
@@ -1,15 +0,0 @@
-echo not implemented
-return 
-modulname="wayland"
-startmodul config "${modulname}"
-pkg+=( qt5-wayland )
-postrun_modules+=( "70-de.mod.de/system/${modulname}" )
-
-#ignore+=()
-#services_enable+=()
-#services_disable+=()
-
-cat <<'EOF'>> "${postinstall}"
-startmodul post "wayland"
-MOZ_ENABLE_WAYLAND=1
-EOF
diff --git a/modules/de.d/pre/system/xorg.mod b/modules/de.d/pre/system/xorg.mod
deleted file mode 100644
index ea9e2a5..0000000
--- a/modules/de.d/pre/system/xorg.mod
+++ /dev/null
@@ -1,6 +0,0 @@
-module start "xorg" "XOrg Window System Configure"
-
-addpkg xorg-minimal xorg-fonts mesa-dri vulkan-loader xorg-apps
-ignorepkg font-adobe-75dpi font-adobe-100dpi
-
-module end
\ No newline at end of file