Merge remote-tracking branch 'origin/master' into refactor-json-config

Author: svartkanin

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [archlinux]
+custom: ['https://archlinux.org/donate/']

.github/workflows/ruff-format.yaml

@@ -5,5 +5,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
-      - uses: astral-sh/ruff-action@57714a7c8a2e59f32539362ba31877a1957dded1  # v3.5.1
+      - uses: astral-sh/ruff-action@4919ec5cf1f49eff0871dbcea0da843445b837e6  # v3.6.1
       - run: ruff format --diff

.github/workflows/ruff-lint.yaml

@@ -5,4 +5,4 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
-            - uses: astral-sh/ruff-action@57714a7c8a2e59f32539362ba31877a1957dded1  # v3.5.1
+            - uses: astral-sh/ruff-action@4919ec5cf1f49eff0871dbcea0da843445b837e6  # v3.6.1

archinstall/default_profiles/desktops/hyprland.py

@@ -45,7 +45,7 @@ def services(self) -> list[str]:
 			return [pref]
 		return []
 
-	def _ask_seat_access(self) -> None:
+	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'
@@ -67,4 +67,4 @@ def _ask_seat_access(self) -> None:
 
 	@override
 	def do_on_select(self) -> None:
-		self._ask_seat_access()
+		self._select_seat_access()

archinstall/default_profiles/desktops/labwc.py

@@ -42,7 +42,7 @@ def services(self) -> list[str]:
 			return [pref]
 		return []
 
-	def _ask_seat_access(self) -> None:
+	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'
@@ -64,4 +64,4 @@ def _ask_seat_access(self) -> None:
 
 	@override
 	def do_on_select(self) -> None:
-		self._ask_seat_access()
+		self._select_seat_access()

archinstall/default_profiles/desktops/niri.py

@@ -50,7 +50,7 @@ def services(self) -> list[str]:
 			return [pref]
 		return []
 
-	def _ask_seat_access(self) -> None:
+	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'
@@ -72,4 +72,4 @@ def _ask_seat_access(self) -> None:
 
 	@override
 	def do_on_select(self) -> None:
-		self._ask_seat_access()
+		self._select_seat_access()

archinstall/default_profiles/desktops/sway.py

@@ -52,7 +52,7 @@ def services(self) -> list[str]:
 			return [pref]
 		return []
 
-	def _ask_seat_access(self) -> None:
+	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'
@@ -74,4 +74,4 @@ def _ask_seat_access(self) -> None:
 
 	@override
 	def do_on_select(self) -> None:
-		self._ask_seat_access()
+		self._select_seat_access()

archinstall/lib/authentication/authentication_menu.py

@@ -7,7 +7,7 @@
 from archinstall.lib.models.users import Password, User
 from archinstall.lib.output import FormattedOutput
 from archinstall.lib.translationhandler import tr
-from archinstall.lib.user.user_menu import ask_for_additional_users
+from archinstall.lib.user.user_menu import select_users
 from archinstall.lib.utils.util import get_password
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
@@ -58,7 +58,7 @@ def _define_menu_options(self) -> list[MenuItem]:
 
 	def _create_user_account(self, preset: list[User] | None = None) -> list[User]:
 		preset = [] if preset is None else preset
-		users = ask_for_additional_users(preset=preset)
+		users = select_users(preset=preset)
 		return users
 
 	def _prev_users(self, item: MenuItem) -> str | None:

archinstall/lib/boot.py

@@ -5,9 +5,8 @@
 from types import TracebackType
 from typing import TYPE_CHECKING, ClassVar, Self
 
-from .command import SysCommand, SysCommandWorker
+from .command import SysCommand, SysCommandWorker, locate_binary
 from .exceptions import SysCallError
-from .general import locate_binary
 from .output import error
 
 if TYPE_CHECKING:

archinstall/lib/bootloader/bootloader_menu.py

@@ -6,7 +6,6 @@
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
 
-from ..args import arch_config_handler
 from ..hardware import SysInfo
 from ..menu.abstract_menu import AbstractSubMenu
 from ..models.bootloader import Bootloader, BootloaderConfiguration
@@ -16,8 +15,10 @@ class BootloaderMenu(AbstractSubMenu[BootloaderConfiguration]):
 	def __init__(
 		self,
 		bootloader_conf: BootloaderConfiguration,
+		skip_boot: bool = False,
 	):
 		self._bootloader_conf = bootloader_conf
+		self._skip_boot = skip_boot
 		menu_options = self._define_menu_options()
 
 		self._item_group = MenuItemGroup(menu_options, sort_items=False, checkmarks=True)
@@ -91,7 +92,7 @@ def run(self) -> BootloaderConfiguration:
 		return self._bootloader_conf
 
 	def _select_bootloader(self, preset: Bootloader | None) -> Bootloader | None:
-		bootloader = ask_for_bootloader(preset)
+		bootloader = select_bootloader(preset, self._skip_boot)
 
 		if bootloader:
 			# Update UKI option based on bootloader
@@ -177,13 +178,16 @@ def _select_removable(self, preset: bool) -> bool:
 				raise ValueError('Unhandled result type')
 
 
-def ask_for_bootloader(preset: Bootloader | None) -> Bootloader | None:
+def select_bootloader(
+	preset: Bootloader | None,
+	skip_boot: bool = False,
+) -> Bootloader | None:
 	options = []
 	hidden_options = []
 	default = None
 	header = tr('Select bootloader to install')
 
-	if arch_config_handler.args.skip_boot:
+	if skip_boot:
 		default = Bootloader.NO_BOOTLOADER
 	else:
 		hidden_options += [Bootloader.NO_BOOTLOADER]