Refactor interactive module

archinstall/lib/disk/partitioning_menu.py

@@ -566,7 +566,7 @@ async def _suggest_partition_layout(
 			if not await self._reset_confirmation():
 				return None
 
-		from archinstall.lib.interactions.disk_conf import suggest_single_disk_layout
+		from archinstall.lib.disk.disk_menu import suggest_single_disk_layout
 
 		return await suggest_single_disk_layout(self._device)
 

archinstall/lib/general/__init__.py

@@ -0,0 +1,19 @@
+from archinstall.lib.general.general_menu import (
+	add_number_of_parallel_downloads,
+	select_archinstall_language,
+	select_hostname,
+	select_ntp,
+	select_timezone,
+)
+from archinstall.lib.general.system_menu import select_driver, select_kernel, select_swap
+
+__all__ = [
+	'add_number_of_parallel_downloads',
+	'select_archinstall_language',
+	'select_driver',
+	'select_hostname',
+	'select_kernel',
+	'select_ntp',
+	'select_swap',
+	'select_timezone',
+]

archinstall/lib/global_menu.py

@@ -6,9 +6,9 @@
 from archinstall.lib.bootloader.bootloader_menu import BootloaderMenu
 from archinstall.lib.configuration import save_config
 from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
+from archinstall.lib.general.general_menu import add_number_of_parallel_downloads, select_hostname, select_ntp, select_timezone
+from archinstall.lib.general.system_menu import select_kernel, select_swap
 from archinstall.lib.hardware import SysInfo
-from archinstall.lib.interactions.general_conf import add_number_of_parallel_downloads, select_hostname, select_ntp, select_timezone
-from archinstall.lib.interactions.system_conf import select_kernel, select_swap
 from archinstall.lib.locale.locale_menu import LocaleMenu
 from archinstall.lib.menu.abstract_menu import AbstractMenu, SpecialMenuKey
 from archinstall.lib.mirror.mirror_handler import MirrorListHandler
@@ -232,7 +232,7 @@ def is_config_valid(self) -> bool:
 		return self._validate_bootloader() is None
 
 	async def _select_archinstall_language(self, preset: Language) -> Language:
-		from archinstall.lib.interactions.general_conf import select_archinstall_language
+		from archinstall.lib.general.general_menu import select_archinstall_language
 
 		language = await select_archinstall_language(translation_handler.translated_languages, preset)
 		translation_handler.activate(language)