Fix 1934 - audio server regression (#1946)

* Audio configuration

* Update

* Update schema

---------

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

1 files changed, 5 insertions, 14 deletions

diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
index c8df590d..605d2b0e 100644
--- a/archinstall/scripts/guided.py
+++ b/archinstall/scripts/guided.py
@@ -8,11 +8,11 @@ from archinstall import SysInfo
 from archinstall.lib import locale
 from archinstall.lib import disk
 from archinstall.lib.global_menu import GlobalMenu
-from archinstall.default_profiles.applications.pipewire import PipewireProfile
 from archinstall.lib.configuration import ConfigurationOutput
 from archinstall.lib.installer import Installer
 from archinstall.lib.menu import Menu
 from archinstall.lib.mirrors import use_mirrors, add_custom_mirrors
+from archinstall.lib.models import AudioConfiguration
 from archinstall.lib.models.bootloader import Bootloader
 from archinstall.lib.models.network_configuration import NetworkConfiguration
 from archinstall.lib.networking import check_mirror_reachable
@@ -70,7 +70,7 @@ def ask_user_questions():
 	global_menu.enable('profile_config')
 
 	# Ask about audio server selection if one is not already set
-	global_menu.enable('audio')
+	global_menu.enable('audio_config')
 
 	# Ask for preferred kernel:
 	global_menu.enable('kernels', mandatory=True)
@@ -172,18 +172,9 @@ def perform_installation(mountpoint: Path):
 		if users := archinstall.arguments.get('!users', None):
 			installation.create_users(users)
 
-		if audio := archinstall.arguments.get('audio', None):
-			info(f'Installing audio server: {audio}')
-			if audio == 'pipewire':
-				PipewireProfile().install(installation)
-			elif audio == 'pulseaudio':
-				installation.add_additional_packages("pulseaudio")
-
-			if SysInfo.requires_sof_fw():
-				installation.add_additional_packages('sof-firmware')
-
-			if SysInfo.requires_alsa_fw():
-				installation.add_additional_packages('alsa-firmware')
+		audio_config: Optional[AudioConfiguration] = archinstall.arguments.get('audio_config', None)
+		if audio_config:
+			audio_config.install_audio_config(installation)
 		else:
 			info("No audio server will be installed")