restructure

modules/20-installation/install

@@ -27,14 +27,8 @@ for i in ${pkg[@]}; do
 	toinstall+=( "$i" )
 done
 
-if [[ "${#pkg[@]}" -gt 0 ]]; then
-	inst "${pkg[@]}"
-else
-	echo nothing to do
-fi
-
-if [[ "${#removepkg[@]}" -gt 0 ]]; then
-	remove "${removepkg[@]}"
+if [[ "${#toinstall[@]}" -gt 0 ]]; then
+	inst "${toinstall[@]}"
 else
 	echo nothing to do
 fi

modules/40-basesystem/pre

@@ -12,9 +12,8 @@ setconf add "lang_console" "de-latin1-nodeadkeys"
 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
+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 neovim nano
 ignorepkg nvi
-removepkg nvi
 servicesenable acpid cronie socklog-unix nanoklogd uuidd
 servicesdisable agetty-tty6 agetty-tty5
 

modules/60-de/pre

@@ -22,7 +22,6 @@ if [[ ! "${cfg[de]}" == "none" ]]; then
 
 	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