From b0765f952551b50cc703d8b7279051e16d0ee3c6 Mon Sep 17 00:00:00 2001 From: teldra Date: Fri, 12 Mar 2021 16:28:20 +0100 Subject: [PATCH] refactoring --- modules/40-basesystem/install | 14 ++++++-------- modules/40-basesystem/langs/de_DE.mod | 3 --- modules/40-basesystem/langs/en_US.mod | 3 --- modules/40-basesystem/pre | 23 +++-------------------- modules/{70-de => 60-de}/install | 0 modules/{70-de => 60-de}/pre | 13 +++++++++---- modules/{60-network => 70-network}/pre | 0 modules/de.d/install/sound/pipewire.mod | 10 ---------- modules/de.d/pre/cupsd.mod | 6 ------ modules/de.d/pre/sound/pipewire.mod | 3 --- modules/de.d/pre/sound/pulseaudio.mod | 5 ----- modules/{ => off}/81-maze/pre | 0 12 files changed, 18 insertions(+), 62 deletions(-) delete mode 100644 modules/40-basesystem/langs/de_DE.mod delete mode 100644 modules/40-basesystem/langs/en_US.mod rename modules/{70-de => 60-de}/install (100%) rename modules/{70-de => 60-de}/pre (76%) rename modules/{60-network => 70-network}/pre (100%) delete mode 100644 modules/de.d/install/sound/pipewire.mod delete mode 100644 modules/de.d/pre/cupsd.mod delete mode 100644 modules/de.d/pre/sound/pipewire.mod delete mode 100644 modules/de.d/pre/sound/pulseaudio.mod rename modules/{ => off}/81-maze/pre (100%) diff --git a/modules/40-basesystem/install b/modules/40-basesystem/install index b13f4ee..f18fec4 100644 --- a/modules/40-basesystem/install +++ b/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 \ No newline at end of file +module end diff --git a/modules/40-basesystem/langs/de_DE.mod b/modules/40-basesystem/langs/de_DE.mod deleted file mode 100644 index 389c02f..0000000 --- a/modules/40-basesystem/langs/de_DE.mod +++ /dev/null @@ -1,3 +0,0 @@ -setconf add "lang" "de_DE" -setconf add "lang_console" "de-latin1-nodeadkeys" -setconf add "timezone" "Europe/Berlin" diff --git a/modules/40-basesystem/langs/en_US.mod b/modules/40-basesystem/langs/en_US.mod deleted file mode 100644 index ed59775..0000000 --- a/modules/40-basesystem/langs/en_US.mod +++ /dev/null @@ -1,3 +0,0 @@ -setconf add "lang" "en_US" -setconf add "lang_console" "de-latin1-nodeadkeys" -setconf add "timezone" "Europe/Berlin" diff --git a/modules/40-basesystem/pre b/modules/40-basesystem/pre index b73defd..43e3426 100644 --- a/modules/40-basesystem/pre +++ b/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 diff --git a/modules/70-de/install b/modules/60-de/install similarity index 100% rename from modules/70-de/install rename to modules/60-de/install diff --git a/modules/70-de/pre b/modules/60-de/pre similarity index 76% rename from modules/70-de/pre rename to modules/60-de/pre index 3b8ae75..bffa7b8 100644 --- a/modules/70-de/pre +++ b/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" diff --git a/modules/60-network/pre b/modules/70-network/pre similarity index 100% rename from modules/60-network/pre rename to modules/70-network/pre diff --git a/modules/de.d/install/sound/pipewire.mod b/modules/de.d/install/sound/pipewire.mod deleted file mode 100644 index 7a258ba..0000000 --- a/modules/de.d/install/sound/pipewire.mod +++ /dev/null @@ -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 \ No newline at end of file diff --git a/modules/de.d/pre/cupsd.mod b/modules/de.d/pre/cupsd.mod deleted file mode 100644 index 7d31c99..0000000 --- a/modules/de.d/pre/cupsd.mod +++ /dev/null @@ -1,6 +0,0 @@ -module start "cups" "Printing Configure" - -addpkg cups cups-filters gutenprint hplip foomatic-db -servicesenable cupsd - -module end diff --git a/modules/de.d/pre/sound/pipewire.mod b/modules/de.d/pre/sound/pipewire.mod deleted file mode 100644 index 227ef35..0000000 --- a/modules/de.d/pre/sound/pipewire.mod +++ /dev/null @@ -1,3 +0,0 @@ -module start "pipewire" "Pipewire Configure" -addpkg pipewire alsa-pipewire libjack-pipewire libspa-jack -module end \ No newline at end of file diff --git a/modules/de.d/pre/sound/pulseaudio.mod b/modules/de.d/pre/sound/pulseaudio.mod deleted file mode 100644 index 5125e97..0000000 --- a/modules/de.d/pre/sound/pulseaudio.mod +++ /dev/null @@ -1,5 +0,0 @@ -module start "pulseaudio" "Pulseaudio Configure" - -addpkg alsa-plugins-pulseaudio pulseaudio - -module end \ No newline at end of file diff --git a/modules/81-maze/pre b/modules/off/81-maze/pre similarity index 100% rename from modules/81-maze/pre rename to modules/off/81-maze/pre