Merge remote-tracking branch 'origin/master' into refactor-mirrors

Author: svartkanin

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 default_stages: ['pre-commit']
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.4
+    rev: v0.15.6
     hooks:
         # fix unused imports and sort them
       - id: ruff

PKGBUILD

@@ -36,7 +36,6 @@ depends=(
   'xfsprogs'
   'lvm2'
   'f2fs-tools'
-  'ntfs-3g'
   'libfido2'
 )
 makedepends=(

archinstall/default_profiles/desktop.py

@@ -51,12 +51,12 @@ def default_greeter_type(self) -> GreeterType | None:
 
 		return None
 
-	def _do_on_select_profiles(self) -> None:
+	async def _do_on_select_profiles(self) -> None:
 		for profile in self.current_selection:
-			profile.do_on_select()
+			await profile.do_on_select()
 
 	@override
-	def do_on_select(self) -> SelectResult:
+	async def do_on_select(self) -> SelectResult:
 		items = [
 			MenuItem(
 				p.name,
@@ -69,7 +69,7 @@ def do_on_select(self) -> SelectResult:
 		group = MenuItemGroup(items, sort_items=True, sort_case_sensitive=False)
 		group.set_selected_by_value(self.current_selection)
 
-		result = Selection[Self](
+		result = await Selection[Self](
 			group,
 			multi=True,
 			allow_reset=True,
@@ -80,7 +80,7 @@ def do_on_select(self) -> SelectResult:
 		match result.type_:
 			case ResultType.Selection:
 				self.current_selection = result.get_values()
-				self._do_on_select_profiles()
+				await self._do_on_select_profiles()
 				return SelectResult.NewSelection
 			case ResultType.Skip:
 				return SelectResult.SameSelection

archinstall/default_profiles/desktops/hyprland.py

@@ -45,7 +45,7 @@ def services(self) -> list[str]:
 			return [pref]
 		return []
 
-	def _select_seat_access(self) -> None:
+	async def _select_seat_access(self) -> None:
 		# need to activate seat service and add to seat group
 		header = tr('Hyprland needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)')
 		header += '\n' + tr('Choose an option to give Hyprland access to your hardware') + '\n'
@@ -56,7 +56,7 @@ def _select_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = Selection[SeatAccess](
+		result = await Selection[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,
@@ -66,5 +66,5 @@ def _select_seat_access(self) -> None:
 			self.custom_settings['seat_access'] = result.get_value().value
 
 	@override
-	def do_on_select(self) -> None:
-		self._select_seat_access()
+	async def do_on_select(self) -> None:
+		await self._select_seat_access()

archinstall/default_profiles/desktops/labwc.py

@@ -42,7 +42,7 @@ def services(self) -> list[str]:
 			return [pref]
 		return []
 
-	def _select_seat_access(self) -> None:
+	async def _select_seat_access(self) -> None:
 		# need to activate seat service and add to seat group
 		header = tr('labwc needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)')
 		header += '\n' + tr('Choose an option to give labwc access to your hardware') + '\n'
@@ -53,7 +53,7 @@ def _select_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = Selection[SeatAccess](
+		result = await Selection[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,
@@ -63,5 +63,5 @@ def _select_seat_access(self) -> None:
 			self.custom_settings['seat_access'] = result.get_value().value
 
 	@override
-	def do_on_select(self) -> None:
-		self._select_seat_access()
+	async def do_on_select(self) -> None:
+		await self._select_seat_access()

archinstall/default_profiles/desktops/niri.py

@@ -50,7 +50,7 @@ def services(self) -> list[str]:
 			return [pref]
 		return []
 
-	def _select_seat_access(self) -> None:
+	async def _select_seat_access(self) -> None:
 		# need to activate seat service and add to seat group
 		header = tr('niri needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)')
 		header += '\n' + tr('Choose an option to give niri access to your hardware') + '\n'
@@ -61,7 +61,7 @@ def _select_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = Selection[SeatAccess](
+		result = await Selection[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,
@@ -71,5 +71,5 @@ def _select_seat_access(self) -> None:
 			self.custom_settings['seat_access'] = result.get_value().value
 
 	@override
-	def do_on_select(self) -> None:
-		self._select_seat_access()
+	async def do_on_select(self) -> None:
+		await self._select_seat_access()

archinstall/default_profiles/desktops/sway.py

@@ -52,7 +52,7 @@ def services(self) -> list[str]:
 			return [pref]
 		return []
 
-	def _select_seat_access(self) -> None:
+	async def _select_seat_access(self) -> None:
 		# need to activate seat service and add to seat group
 		header = tr('Sway needs access to your seat (collection of hardware devices i.e. keyboard, mouse, etc)')
 		header += '\n' + tr('Choose an option to give Sway access to your hardware') + '\n'
@@ -63,7 +63,7 @@ def _select_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = Selection[SeatAccess](
+		result = await Selection[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,
@@ -73,5 +73,5 @@ def _select_seat_access(self) -> None:
 			self.custom_settings['seat_access'] = result.get_value().value
 
 	@override
-	def do_on_select(self) -> None:
-		self._select_seat_access()
+	async def do_on_select(self) -> None:
+		await self._select_seat_access()

archinstall/default_profiles/profile.py

@@ -117,7 +117,7 @@ def json(self) -> dict[str, str]:
 		"""
 		return {}
 
-	def do_on_select(self) -> SelectResult | None:
+	async def do_on_select(self) -> SelectResult | None:
 		"""
 		Hook that will be called when a profile is selected
 		"""

archinstall/default_profiles/server.py

@@ -23,7 +23,7 @@ def __init__(self, current_value: list[Self] = []):
 		)
 
 	@override
-	def do_on_select(self) -> SelectResult:
+	async def do_on_select(self) -> SelectResult:
 		items = [
 			MenuItem(
 				p.name,
@@ -36,7 +36,7 @@ def do_on_select(self) -> SelectResult:
 		group = MenuItemGroup(items, sort_items=True)
 		group.set_selected_by_value(self.current_selection)
 
-		result = Selection[Self](
+		result = await Selection[Self](
 			group,
 			allow_reset=True,
 			allow_skip=True,

archinstall/lib/applications/application_menu.py

@@ -39,8 +39,8 @@ def __init__(
 		)
 
 	@override
-	def run(self) -> ApplicationConfiguration:
-		super().run()
+	async def show(self) -> ApplicationConfiguration | None:
+		_ = await super().show()
 		return self._app_config
 
 	def _define_menu_options(self) -> list[MenuItem]:
@@ -116,13 +116,13 @@ def _prev_firewall(self, item: MenuItem) -> str | None:
 		return None
 
 
-def select_power_management(preset: PowerManagementConfiguration | None = None) -> PowerManagementConfiguration | None:
+async def select_power_management(preset: PowerManagementConfiguration | None = None) -> PowerManagementConfiguration | None:
 	group = MenuItemGroup.from_enum(PowerManagement)
 
 	if preset:
 		group.set_focus_by_value(preset.power_management)
 
-	result = Selection[PowerManagement](
+	result = await Selection[PowerManagement](
 		group,
 		allow_skip=True,
 		allow_reset=True,
@@ -137,11 +137,11 @@ def select_power_management(preset: PowerManagementConfiguration | None = None)
 			return None
 
 
-def select_bluetooth(preset: BluetoothConfiguration | None) -> BluetoothConfiguration | None:
+async def select_bluetooth(preset: BluetoothConfiguration | None) -> BluetoothConfiguration | None:
 	header = tr('Would you like to configure Bluetooth?') + '\n'
 	preset_val = preset.enabled if preset else False
 
-	result = Confirmation(
+	result = await Confirmation(
 		header=header,
 		allow_skip=True,
 		preset=preset_val,
@@ -156,11 +156,11 @@ def select_bluetooth(preset: BluetoothConfiguration | None) -> BluetoothConfigur
 			raise ValueError('Unhandled result type')
 
 
-def select_print_service(preset: PrintServiceConfiguration | None) -> PrintServiceConfiguration | None:
+async def select_print_service(preset: PrintServiceConfiguration | None) -> PrintServiceConfiguration | None:
 	header = tr('Would you like to configure the print service?') + '\n'
 	preset_val = preset.enabled if preset else False
 
-	result = Confirmation(
+	result = await Confirmation(
 		header=header,
 		allow_skip=True,
 		preset=preset_val,
@@ -176,14 +176,14 @@ def select_print_service(preset: PrintServiceConfiguration | None) -> PrintServi
 			raise ValueError('Unhandled result type')
 
 
-def select_audio(preset: AudioConfiguration | None = None) -> AudioConfiguration | None:
+async def select_audio(preset: AudioConfiguration | None = None) -> AudioConfiguration | None:
 	items = [MenuItem(a.value, value=a) for a in Audio]
 	group = MenuItemGroup(items)
 
 	if preset:
 		group.set_focus_by_value(preset.audio)
 
-	result = Selection[Audio](
+	result = await Selection[Audio](
 		group,
 		header=tr('Select audio configuration'),
 		allow_skip=True,
@@ -198,13 +198,13 @@ def select_audio(preset: AudioConfiguration | None = None) -> AudioConfiguration
 			raise ValueError('Unhandled result type')
 
 
-def select_firewall(preset: FirewallConfiguration | None = None) -> FirewallConfiguration | None:
+async def select_firewall(preset: FirewallConfiguration | None = None) -> FirewallConfiguration | None:
 	group = MenuItemGroup.from_enum(Firewall)
 
 	if preset:
 		group.set_focus_by_value(preset.firewall)
 
-	result = Selection[Firewall](
+	result = await Selection[Firewall](
 		group,
 		allow_skip=True,
 		allow_reset=True,