Move locales and cleanup menu (#1814)

* Cleanup imports and unused code

* Cleanup imports and unused code

* Update build check

* Keep deprecation exception

* Simplify logging

* Move locale into new sub-menu

---------

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>

4 files changed, 10 insertions, 54 deletions

diff --git a/archinstall/lib/interactions/__init__.py b/archinstall/lib/interactions/__init__.py
index 158750cc..466cfa0b 100644
--- a/archinstall/lib/interactions/__init__.py
+++ b/archinstall/lib/interactions/__init__.py
@@ -1,4 +1,3 @@
-from .locale_conf import select_locale_lang, select_locale_enc
 from .manage_users_conf import UserList, ask_for_additional_users
 from .network_conf import ManualNetworkConfig, ask_to_configure_network
 from .utils import get_password
@@ -10,7 +9,7 @@ from .disk_conf import (
 )
 
 from .general_conf import (
-	ask_ntp, ask_hostname, ask_for_a_timezone, ask_for_audio_selection, select_language,
+	ask_ntp, ask_hostname, ask_for_a_timezone, ask_for_audio_selection,
 	select_archinstall_language, ask_additional_packages_to_install,
 	add_number_of_parrallel_downloads, select_additional_repositories
 )
diff --git a/archinstall/lib/interactions/general_conf.py b/archinstall/lib/interactions/general_conf.py
index 0338c61e..3b78847b 100644
--- a/archinstall/lib/interactions/general_conf.py
+++ b/archinstall/lib/interactions/general_conf.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import pathlib
 from typing import List, Any, Optional, TYPE_CHECKING
 
-from ..locale import list_keyboard_languages, list_timezones
+from ..locale import list_timezones, list_keyboard_languages
 from ..menu import MenuSelectionType, Menu, TextInput
 from ..output import warn
 from ..packages.packages import validate_package_list
@@ -119,18 +119,18 @@ def select_archinstall_language(languages: List[Language], preset: Language) ->
 	raise ValueError('Language selection not handled')
 
 
-def ask_additional_packages_to_install(pre_set_packages: List[str] = []) -> List[str]:
+def ask_additional_packages_to_install(preset: List[str] = []) -> List[str]:
 	# Additional packages (with some light weight error handling for invalid package names)
 	print(_('Only packages such as base, base-devel, linux, linux-firmware, efibootmgr and optional profile packages are installed.'))
 	print(_('If you desire a web browser, such as firefox or chromium, you may specify it in the following prompt.'))
 
-	def read_packages(already_defined: list = []) -> list:
-		display = ' '.join(already_defined)
+	def read_packages(p: List = []) -> list:
+		display = ' '.join(p)
 		input_packages = TextInput(_('Write additional packages to install (space separated, leave blank to skip): '), display).run().strip()
 		return input_packages.split() if input_packages else []
 
-	pre_set_packages = pre_set_packages if pre_set_packages else []
-	packages = read_packages(pre_set_packages)
+	preset = preset if preset else []
+	packages = read_packages(preset)
 
 	if not storage['arguments']['offline'] and not storage['arguments']['no_pkg_lookups']:
 		while True:
diff --git a/archinstall/lib/interactions/locale_conf.py b/archinstall/lib/interactions/locale_conf.py
deleted file mode 100644
index de115202..00000000
--- a/archinstall/lib/interactions/locale_conf.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from typing import Any, TYPE_CHECKING, Optional
-
-from ..locale import list_locales
-from ..menu import Menu, MenuSelectionType
-
-if TYPE_CHECKING:
-	_: Any
-
-
-def select_locale_lang(preset: Optional[str] = None) -> Optional[str]:
-	locales = list_locales()
-	locale_lang = set([locale.split()[0] for locale in locales])
-
-	choice = Menu(
-		_('Choose which locale language to use'),
-		list(locale_lang),
-		sort=True,
-		preset_values=preset
-	).run()
-
-	match choice.type_:
-		case MenuSelectionType.Selection: return choice.single_value
-		case MenuSelectionType.Skip: return preset
-
-	return None
-
-
-def select_locale_enc(preset: Optional[str] = None) -> Optional[str]:
-	locales = list_locales()
-	locale_enc = set([locale.split()[1] for locale in locales])
-
-	choice = Menu(
-		_('Choose which locale encoding to use'),
-		list(locale_enc),
-		sort=True,
-		preset_values=preset
-	).run()
-
-	match choice.type_:
-		case MenuSelectionType.Selection: return choice.single_value
-		case MenuSelectionType.Skip: return preset
-
-	return None
diff --git a/archinstall/lib/interactions/system_conf.py b/archinstall/lib/interactions/system_conf.py
index bbcb5b23..ea7e5989 100644
--- a/archinstall/lib/interactions/system_conf.py
+++ b/archinstall/lib/interactions/system_conf.py
@@ -29,14 +29,14 @@ def select_kernel(preset: List[str] = []) -> List[str]:
 		sort=True,
 		multi=True,
 		preset_values=preset,
-		allow_reset=True,
 		allow_reset_warning_msg=warning
 	).run()
 
 	match choice.type_:
 		case MenuSelectionType.Skip: return preset
-		case MenuSelectionType.Reset: return []
-		case MenuSelectionType.Selection: return choice.value  # type: ignore
+		case MenuSelectionType.Selection: return choice.single_value
+
+	return []
 
 
 def ask_for_bootloader(preset: Bootloader) -> Bootloader: