Move choice into guided installation instead of DEs

Arch wiki says packages should enable the user services automatically

10 files changed, 20 insertions, 46 deletions

diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 58f88bd2..3c5115ea 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -89,6 +89,14 @@ def ask_for_a_timezone():
 			level=LOG_LEVELS.Warning,
 			fg='red'
 		)
+		
+def ask_for_audio_selection():
+	audio = "pulseaudio" # Default for most desktop environments
+	pipewire_choice = input("Would you like to install the pipewire audio server? [Y/n] ").lower()
+	if pipewire_choice == "y":
+		audio = "pipewire"
+
+	return audio
 
 def ask_to_configure_network():
 	# Optionally configure one network interface.
diff --git a/examples/guided.py b/examples/guided.py
index 81cc2991..cd45bef5 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -182,6 +182,10 @@ def ask_user_questions():
 				)
 				exit(1)
 
+	# Ask about audio server selection (this right now just asks for pipewire and defaults to pulseaudio otherwise)
+	if not archinstall.arguments.get('audio', None):
+		archinstall.arguments['audio'] = archinstall.ask_for_audio_selection()
+
 	# Additional packages (with some light weight error handling for invalid package names)
 	if not archinstall.arguments.get('packages', None):
 		archinstall.arguments['packages'] = [package for package in input('Write additional packages to install (space separated, leave blank to skip): ').split(' ') if len(package)]
@@ -329,7 +333,11 @@ def perform_installation(device, boot_partition, language, mirrors):
 				installation.enable_service('systemd-networkd')
 				installation.enable_service('systemd-resolved')
 
-
+			print('This audio server will be used: ' + archinstall.arguments.get('audio', None))
+			if archinstall.arguments.get('audio', None) == 'pipewire':
+				print('Installing pipewire ...')
+				installation.install_profile('pipewire')
+			
 			if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
 				installation.add_additional_packages(archinstall.arguments.get('packages', None))
 
diff --git a/profiles/applications/pipewire.py b/profiles/applications/pipewire.py
index 2d9f6a6c..aea5b50d 100644
--- a/profiles/applications/pipewire.py
+++ b/profiles/applications/pipewire.py
@@ -1,5 +1,5 @@
 import archinstall
 
-__packages__ = ["pipewire", "pipewire-alsa", "pipewire-docs", "pipewire-jack", "pipewire-media-session", "pipewire-pulse", "gst-plugin-pipewire", "libpulse"]
+packages = ["pipewire", "pipewire-alsa", "pipewire-docs", "pipewire-jack", "pipewire-media-session", "pipewire-pulse", "gst-plugin-pipewire", "libpulse"]
 
-installation.add_additional_packages(__packages__)
+installation.add_additional_packages(packages)
diff --git a/profiles/awesome.py b/profiles/awesome.py
index fcad1839..8004fc62 100644
--- a/profiles/awesome.py
+++ b/profiles/awesome.py
@@ -25,12 +25,6 @@ def _prep_function(*args, **kwargs):
 # through importlib.util.spec_from_file_location("awesome", "/somewhere/awesome.py")
 # or through conventional import awesome
 if __name__ == 'awesome':
-	# Install the pipewire audio server if the user wants to use it
-	pipewire_choice = input("Would you like to install the pipewire audio server? [Y/n] ").lower()
-	if choice == "y":
-		pipewire = archinstall.Application(installation, 'pipewire')
-		pipewire.install()
-
 	# Install the application awesome from the template under /applications/
 	awesome = archinstall.Application(installation, 'awesome')
 	awesome.install()
diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py
index a3225c30..dac38bd3 100644
--- a/profiles/cinnamon.py
+++ b/profiles/cinnamon.py
@@ -22,12 +22,6 @@ def _prep_function(*args, **kwargs):
 # through importlib.util.spec_from_file_location("cinnamon", "/somewhere/cinnamon.py")
 # or through conventional import cinnamon
 if __name__ == 'cinnamon':
-	# Install the pipewire audio server if the user wants to use it
-	pipewire_choice = input("Would you like to install the pipewire audio server? [Y/n] ").lower()
-	if choice == "y":
-		pipewire = archinstall.Application(installation, 'pipewire')
-		pipewire.install()
-
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
diff --git a/profiles/gnome.py b/profiles/gnome.py
index d13e6eee..63fcd57d 100644
--- a/profiles/gnome.py
+++ b/profiles/gnome.py
@@ -23,12 +23,6 @@ def _prep_function(*args, **kwargs):
 # through importlib.util.spec_from_file_location("gnome", "/somewhere/gnome.py")
 # or through conventional import gnome
 if __name__ == 'gnome':
-	# Install the pipewire audio server if the user wants to use it
-	pipewire_choice = input("Would you like to install the pipewire audio server? [Y/n] ").lower()
-	if choice == "y":
-		pipewire = archinstall.Application(installation, 'pipewire')
-		pipewire.install()
-
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
diff --git a/profiles/i3-gaps.py b/profiles/i3-gaps.py
index f75dfb11..50511dce 100644
--- a/profiles/i3-gaps.py
+++ b/profiles/i3-gaps.py
@@ -29,13 +29,7 @@ def _post_install(*args, **kwargs):
 	
 	return True
 
-if __name__ == 'i3-wm':	
-	# Install the pipewire audio server if the user wants to use it
-	pipewire_choice = input("Would you like to install the pipewire audio server? [Y/n] ").lower()
-	if choice == "y":
-		pipewire = archinstall.Application(installation, 'pipewire')
-		pipewire.install()
-
+if __name__ == 'i3-wm':
 	# Install dependency profiles
     installation.install_profile('xorg')
     # gaps is installed by deafult so we are overriding it here
diff --git a/profiles/i3-wm.py b/profiles/i3-wm.py
index 6d40065c..cd6cbc81 100644
--- a/profiles/i3-wm.py
+++ b/profiles/i3-wm.py
@@ -29,12 +29,6 @@ def _post_install(*args, **kwargs):
 	return True
 
 if __name__ == 'i3-wm':
-	# Install the pipewire audio server if the user wants to use it
-	pipewire_choice = input("Would you like to install the pipewire audio server? [Y/n] ").lower()
-	if choice == "y":
-		pipewire = archinstall.Application(installation, 'pipewire')
-		pipewire.install()
-
     # Install dependency profiles
     installation.install_profile('xorg')
     # we are installing lightdm to auto start i3
diff --git a/profiles/kde.py b/profiles/kde.py
index dabba57b..0207ed22 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -32,12 +32,6 @@ def _post_install(*args, **kwargs):
 # through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
 # or through conventional import kde
 if __name__ == 'kde':
-	# Install the pipewire audio server if the user wants to use it
-	pipewire_choice = input("Would you like to install the pipewire audio server? [Y/n] ").lower()
-	if choice == "y":
-		pipewire = archinstall.Application(installation, 'pipewire')
-		pipewire.install()
-	
 	# Install dependency profiles
 	installation.install_profile('xorg')
 
diff --git a/profiles/xfce4.py b/profiles/xfce4.py
index 8e418578..36c9958a 100644
--- a/profiles/xfce4.py
+++ b/profiles/xfce4.py
@@ -23,12 +23,6 @@ def _prep_function(*args, **kwargs):
 # through importlib.util.spec_from_file_location("xfce4", "/somewhere/xfce4.py")
 # or through conventional import xfce4
 if __name__ == 'xfce4':
-	# Install the pipewire audio server if the user wants to use it
-	pipewire_choice = input("Would you like to install the pipewire audio server? [Y/n] ").lower()
-	if choice == "y":
-		pipewire = archinstall.Application(installation, 'pipewire')
-		pipewire.install()
-
 	# Install dependency profiles
 	installation.install_profile('xorg')