refactoring

modules/40-basesystem/install

@@ -16,13 +16,11 @@ echo "#ignorepkg=wifi-firmware"; } > "${dest}"/etc/xbps.d/10-ignore-firmware.con
 { echo "en_DK.UTF-8 UTF-8";
 echo "en_US.UTF-8 UTF-8"; } > "${dest}"/etc/default/libc-locales
 echo "LANG=en_US.UTF-8" > "${dest}"/etc/locale.conf
-if [[ ! -z "${cfg[lang]}" ]]; then
-	echo "KEYMAP=${cfg[lang_console]}" > "${dest}"/etc/vconsole.conf
-	echo "${cfg[lang]}.UTF-8 UTF-8" >> "${dest}"/etc/default/libc-locales
-	echo "LANG=${cfg[lang]}.UTF-8" > "${dest}"/etc/locale-user.conf
-	cp -a "${dest}"/etc/profile.d/locale.sh "${dest}"/etc/profile.d/locale-user.sh
-	sed -i 's/locale.conf/locale-user.conf/' "${dest}"/etc/profile.d/locale-user.sh
-fi
+echo "KEYMAP=${cfg[lang_console]}" > "${dest}"/etc/vconsole.conf
+echo "${cfg[lang]}.UTF-8 UTF-8" >> "${dest}"/etc/default/libc-locales
+echo "LANG=${cfg[lang]}.UTF-8" > "${dest}"/etc/locale-user.conf
+cp -a "${dest}"/etc/profile.d/locale.sh "${dest}"/etc/profile.d/locale-user.sh
+sed -i 's/locale.conf/locale-user.conf/' "${dest}"/etc/profile.d/locale-user.sh
 
 { echo "tmpfs							/tmp	tmpfs	defaults,nosuid,nodev		0 0";
 echo "/dev/mapper/voidvg.${diskid}-root	/	btrfs	defaults,subvol=void-rootfs	0 0";
@@ -61,4 +59,4 @@ sed -i "s/Europe\/Madrid/${cfg[timezone]//\//\\/}/" "${dest}/etc/rc.conf"
 sed -i "/HARDWARECLOCK/s/^#//g" "${dest}/etc/rc.conf"
 sed -i "/FONT=/s/^#//g" "${dest}/etc/rc.conf"
 
-module end
+module end

modules/40-basesystem/langs/de_DE.mod

@@ -1,3 +0,0 @@
-setconf add "lang" "de_DE"
-setconf add "lang_console" "de-latin1-nodeadkeys"
-setconf add "timezone" "Europe/Berlin"

modules/40-basesystem/langs/en_US.mod

@@ -1,3 +0,0 @@
-setconf add "lang" "en_US"
-setconf add "lang_console" "de-latin1-nodeadkeys"
-setconf add "timezone" "Europe/Berlin"

modules/40-basesystem/pre

@@ -7,27 +7,10 @@ while input "hostname?" "void"; do
 	fi
 done
 
-if grep -q -v "^#" /etc/default/libc-locales; then
-	grep -v "^#" /etc/default/libc-locales | awk '{print $1}' | sed 's/.UTF-8//'
-	echo maybe one of these
-fi
+setconf add "lang" "de_DE"
+setconf add "lang_console" "de-latin1-nodeadkeys"
+setconf add "timezone" "Europe/Berlin"
 
-while input "language search [en_US|de_DE|..]:" "en_US"; do
-	lang_tmp="${output}"
-	break
-	#if sed 's/#//' /etc/default/libc-locales | grep "UTF-8" | sed 's/.UTF-8//' | awk '{print $1}' "${output}"; then
-	#	lang_tmp="${output}"
-	#	break
-	#elif ! grep -i -q "${output}" /etc/default/libc-locales; then
-	#	echo not found: "${output}"
-	#elif grep -i -q "${output}" /etc/default/libc-locales; then
-	#	echo exact match please: "${output}"
-	#	grep -i "${output}" /etc/default/libc-locales | sed 's/.UTF-8//' | awk '{print $1}' | sed 's/#//'
-	#fi
-
-done
-
-source "${modules}"/40-"${modulename}"/langs/"${lang_tmp}".mod
 
 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

modules/60-de/pre

@@ -4,21 +4,26 @@ setconf "add" "gfx_system" "xorg"
 multiplechoice "de" "kde5" "i3wm" "gnome" "none"
 multiplechoice "gfx_hardware" "amd" "nvidia" "intel" "none"
 
-multiplechoice "soundsystem" "pulseaudio" "pipewire" "none"
 
 if [[ ! "${cfg[soundsystem]}" == "none" ]]; then
-	addpkg "alsa-utils"
+	addpkg "alsa-utils" alsa-plugins-pulseaudio pulseaudio
 	servicesenable "alsa"
-	source "${modules}"/de.d/pre/sound/"${cfg[soundsystem]}".mod
+
+
 fi
 
 if [[ ! "${cfg[de]}" == "none" ]]; then
+	addpkg cups cups-filters gutenprint hplip foomatic-db
+	
 	addpkg "firefox"
+
+	addpkg "alsa-utils" alsa-plugins-pulseaudio pulseaudio
+
+	servicesenable "alsa" "cupsd"
 	servicesdisable "acpid" 
 	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
-	test -f "${modules}"/de.d/pre/cupsd.mod && source "${modules}"/de.d/pre/cupsd.mod
 fi
 
 module "end"

modules/de.d/install/sound/pipewire.mod

@@ -1,10 +0,0 @@
-module start "pipewire" "Pipewire Install"
-
-mkdir -p "${dest}"/etc/alsa/conf.d
-ln -sf /usr/share/alsa/alsa.conf.d/50-pipewire.conf "${dest}"/etc/alsa/conf.d
-ln -sf /usr/share/alsa/alsa.conf.d/99-pipewire-default.conf "${dest}"/etc/alsa/conf.d
-mkdir -p "${dest}"/etc/ld.so.conf.d/
-echo "/usr/lib/pipewire-0.3/jack" > "${dest}"/etc/ld.so.conf.d/zpipewire-jack.conf
-ldconfig
-
-module end

modules/de.d/pre/cupsd.mod

@@ -1,6 +0,0 @@
-module start "cups" "Printing Configure"
-
-addpkg cups cups-filters gutenprint hplip foomatic-db
-servicesenable cupsd
-
-module end

modules/de.d/pre/sound/pipewire.mod

@@ -1,3 +0,0 @@
-module start "pipewire" "Pipewire Configure"
-addpkg pipewire alsa-pipewire libjack-pipewire libspa-jack 
-module end

modules/de.d/pre/sound/pulseaudio.mod

@@ -1,5 +0,0 @@
-module start "pulseaudio" "Pulseaudio Configure"
-
-addpkg alsa-plugins-pulseaudio pulseaudio
-
-module end