diff --git a/modules/60-de/pre b/modules/60-de/pre index bffa7b8..dfb20a6 100644 --- a/modules/60-de/pre +++ b/modules/60-de/pre @@ -5,22 +5,19 @@ multiplechoice "de" "kde5" "i3wm" "gnome" "none" multiplechoice "gfx_hardware" "amd" "nvidia" "intel" "none" -if [[ ! "${cfg[soundsystem]}" == "none" ]]; then - addpkg "alsa-utils" alsa-plugins-pulseaudio pulseaudio - servicesenable "alsa" - - -fi - if [[ ! "${cfg[de]}" == "none" ]]; then addpkg cups cups-filters gutenprint hplip foomatic-db addpkg "firefox" addpkg "alsa-utils" alsa-plugins-pulseaudio pulseaudio + + addpkg "NetworkManager" + + servicesenable "dbus" "NetworkManager" "alsa" "cupsd" - 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 diff --git a/modules/70-network/pre b/modules/70-network/pre deleted file mode 100644 index 7f69718..0000000 --- a/modules/70-network/pre +++ /dev/null @@ -1,16 +0,0 @@ -module "start" "network" "Network Configure" - -multiplechoice "networksystem" "networkmanager" "dhcpcd" "none" - -if [[ "${cfg[networksystem]}" == "networkmanager" ]]; then - addpkg "dbus" "NetworkManager" - servicesenable "dbus" "NetworkManager" - servicesdisable "dhcpcd" -elif [[ "${cfg[networksystem]}" == "dhcpcd" ]]; then - addpkg "dhcpcd" - servicesenable "dhcpcd" -elif [[ "${cfg[networksystem]}" == "none" ]]; then - echo "nothing selected" -fi - -module "end" \ No newline at end of file diff --git a/modules/80-laptop/install b/modules/off/80-laptop/install similarity index 100% rename from modules/80-laptop/install rename to modules/off/80-laptop/install diff --git a/modules/80-laptop/pre b/modules/off/80-laptop/pre similarity index 100% rename from modules/80-laptop/pre rename to modules/off/80-laptop/pre