Ruff formatting

Author: svartkanin

archinstall/__init__.py

@@ -31,31 +31,31 @@ def plugin(f, *args, **kwargs) -> None:  # type: ignore[no-untyped-def]
 
 def _log_sys_info() -> None:
 	# Log various information about hardware before starting the installation. This might assist in troubleshooting
-	debug(f"Hardware model detected: {SysInfo.sys_vendor()} {SysInfo.product_name()}; UEFI mode: {SysInfo.has_uefi()}")
-	debug(f"Processor model detected: {SysInfo.cpu_model()}")
-	debug(f"Memory statistics: {SysInfo.mem_available()} available out of {SysInfo.mem_total()} total installed")
-	debug(f"Virtualization detected: {SysInfo.virtualization()}; is VM: {SysInfo.is_vm()}")
-	debug(f"Graphics devices detected: {SysInfo._graphics_devices().keys()}")
+	debug(f'Hardware model detected: {SysInfo.sys_vendor()} {SysInfo.product_name()}; UEFI mode: {SysInfo.has_uefi()}')
+	debug(f'Processor model detected: {SysInfo.cpu_model()}')
+	debug(f'Memory statistics: {SysInfo.mem_available()} available out of {SysInfo.mem_total()} total installed')
+	debug(f'Virtualization detected: {SysInfo.virtualization()}; is VM: {SysInfo.is_vm()}')
+	debug(f'Graphics devices detected: {SysInfo._graphics_devices().keys()}')
 
 	# For support reasons, we'll log the disk layout pre installation to match against post-installation layout
-	debug(f"Disk states before installing:\n{disk_layouts()}")
+	debug(f'Disk states before installing:\n{disk_layouts()}')
 
 
 def _fetch_arch_db() -> None:
-	info("Fetching Arch Linux package database...")
+	info('Fetching Arch Linux package database...')
 	try:
-		Pacman.run("-Sy")
+		Pacman.run('-Sy')
 	except Exception as e:
 		debug(f'Failed to sync Arch Linux package database: {e}')
 		exit(1)
 
 
 def _check_new_version() -> None:
-	info("Checking version...")
+	info('Checking version...')
 	upgrade = None
 
 	try:
-		upgrade = Pacman.run("-Qu archinstall").decode()
+		upgrade = Pacman.run('-Qu archinstall').decode()
 	except Exception as e:
 		debug(f'Failed determine pacman version: {e}')
 
@@ -76,7 +76,7 @@ def main() -> int:
 		return 0
 
 	if os.getuid() != 0:
-		print(_("Archinstall requires root privileges to run. See --help for more."))
+		print(_('Archinstall requires root privileges to run. See --help for more.'))
 		return 1
 
 	_log_sys_info()
@@ -115,7 +115,7 @@ def run_as_a_module() -> None:
 			text = (
 				'Archinstall experienced the above error. If you think this is a bug, please report it to\n'
 				'https://github.com/archlinux/archinstall and include the log file "/var/log/archinstall/install.log".\n\n'
-				'Hint: To extract the log from a live ISO \ncurl -F\'file=@/var/log/archinstall/install.log\' https://0x0.st\n'
+				"Hint: To extract the log from a live ISO \ncurl -F'file=@/var/log/archinstall/install.log' https://0x0.st\n"
 			)
 
 			warn(text)

archinstall/default_profiles/applications/pipewire.py

@@ -14,26 +14,19 @@ def __init__(self) -> None:
 	@property
 	@override
 	def packages(self) -> list[str]:
-		return [
-			'pipewire',
-			'pipewire-alsa',
-			'pipewire-jack',
-			'pipewire-pulse',
-			'gst-plugin-pipewire',
-			'libpulse',
-			'wireplumber'
-		]
+		return ['pipewire', 'pipewire-alsa', 'pipewire-jack', 'pipewire-pulse', 'gst-plugin-pipewire', 'libpulse', 'wireplumber']
 
 	def _enable_pipewire_for_all(self, install_session: 'Installer') -> None:
 		from archinstall.lib.args import arch_config_handler
+
 		users: list[User] | None = arch_config_handler.config.users
 
 		if users is None:
 			return
 
 		for user in users:
 			# Create the full path for enabling the pipewire systemd items
-			service_dir = install_session.target / "home" / user.username / ".config" / "systemd" / "user" / "default.target.wants"
+			service_dir = install_session.target / 'home' / user.username / '.config' / 'systemd' / 'user' / 'default.target.wants'
 			service_dir.mkdir(parents=True, exist_ok=True)
 
 			# Set ownership of the entire user catalogue
@@ -42,11 +35,11 @@ def _enable_pipewire_for_all(self, install_session: 'Installer') -> None:
 			# symlink in the correct pipewire systemd items
 			install_session.arch_chroot(
 				f'ln -sf /usr/lib/systemd/user/pipewire-pulse.service /home/{user.username}/.config/systemd/user/default.target.wants/pipewire-pulse.service',
-				run_as=user.username
+				run_as=user.username,
 			)
 			install_session.arch_chroot(
 				f'ln -sf /usr/lib/systemd/user/pipewire-pulse.socket /home/{user.username}/.config/systemd/user/default.target.wants/pipewire-pulse.socket',
-				run_as=user.username
+				run_as=user.username,
 			)
 
 	@override

archinstall/default_profiles/desktop.py

@@ -14,28 +14,12 @@
 
 class DesktopProfile(Profile):
 	def __init__(self, current_selection: list[Profile] = []) -> None:
-		super().__init__(
-			'Desktop',
-			ProfileType.Desktop,
-			current_selection=current_selection,
-			support_greeter=True
-		)
+		super().__init__('Desktop', ProfileType.Desktop, current_selection=current_selection, support_greeter=True)
 
 	@property
 	@override
 	def packages(self) -> list[str]:
-		return [
-			'nano',
-			'vim',
-			'openssh',
-			'htop',
-			'wget',
-			'iwd',
-			'wireless_tools',
-			'wpa_supplicant',
-			'smartmontools',
-			'xdg-utils'
-		]
+		return ['nano', 'vim', 'openssh', 'htop', 'wget', 'iwd', 'wireless_tools', 'wpa_supplicant', 'smartmontools', 'xdg-utils']
 
 	@property
 	@override
@@ -57,13 +41,7 @@ def _do_on_select_profiles(self) -> None:
 
 	@override
 	def do_on_select(self) -> SelectResult:
-		items = [
-			MenuItem(
-				p.name,
-				value=p,
-				preview_action=lambda x: x.value.preview_text()
-			) for p in profile_handler.get_desktop_profiles()
-		]
+		items = [MenuItem(p.name, value=p, preview_action=lambda x: x.value.preview_text()) for p in profile_handler.get_desktop_profiles()]
 
 		group = MenuItemGroup(items, sort_items=True, sort_case_sensitive=False)
 		group.set_selected_by_value(self.current_selection)
@@ -75,7 +53,7 @@ def do_on_select(self) -> SelectResult:
 			allow_skip=True,
 			preview_style=PreviewStyle.RIGHT,
 			preview_size='auto',
-			preview_frame=FrameProperties.max('Info')
+			preview_frame=FrameProperties.max('Info'),
 		).run()
 
 		match result.type_:

archinstall/default_profiles/desktops/awesome.py

@@ -33,32 +33,32 @@ def install(self, install_session: 'Installer') -> None:
 		super().install(install_session)
 
 		# TODO: Copy a full configuration to ~/.config/awesome/rc.lua instead.
-		with open(f"{install_session.target}/etc/xdg/awesome/rc.lua") as fh:
+		with open(f'{install_session.target}/etc/xdg/awesome/rc.lua') as fh:
 			awesome_lua = fh.read()
 
 		# Replace xterm with alacritty for a smoother experience.
 		awesome_lua = awesome_lua.replace('"xterm"', '"alacritty"')
 
-		with open(f"{install_session.target}/etc/xdg/awesome/rc.lua", 'w') as fh:
+		with open(f'{install_session.target}/etc/xdg/awesome/rc.lua', 'w') as fh:
 			fh.write(awesome_lua)
 
 		# TODO: Configure the right-click-menu to contain the above packages that were installed. (as a user config)
 
 		# TODO: check if we selected a greeter,
 		# but for now, awesome is intended to run without one.
-		with open(f"{install_session.target}/etc/X11/xinit/xinitrc") as xinitrc:
+		with open(f'{install_session.target}/etc/X11/xinit/xinitrc') as xinitrc:
 			xinitrc_data = xinitrc.read()
 
 		for line in xinitrc_data.split('\n'):
-			if "twm &" in line:
-				xinitrc_data = xinitrc_data.replace(line, f"# {line}")
-			if "xclock" in line:
-				xinitrc_data = xinitrc_data.replace(line, f"# {line}")
-			if "xterm" in line:
-				xinitrc_data = xinitrc_data.replace(line, f"# {line}")
+			if 'twm &' in line:
+				xinitrc_data = xinitrc_data.replace(line, f'# {line}')
+			if 'xclock' in line:
+				xinitrc_data = xinitrc_data.replace(line, f'# {line}')
+			if 'xterm' in line:
+				xinitrc_data = xinitrc_data.replace(line, f'# {line}')
 
 		xinitrc_data += '\n'
 		xinitrc_data += 'exec awesome\n'
 
-		with open(f"{install_session.target}/etc/X11/xinit/xinitrc", 'w') as xinitrc:
+		with open(f'{install_session.target}/etc/X11/xinit/xinitrc', 'w') as xinitrc:
 			xinitrc.write(xinitrc_data)

archinstall/default_profiles/desktops/bspwm.py

@@ -12,13 +12,7 @@ def __init__(self) -> None:
 	@override
 	def packages(self) -> list[str]:
 		# return super().packages + [
-		return [
-			'bspwm',
-			'sxhkd',
-			'dmenu',
-			'xdo',
-			'rxvt-unicode'
-		]
+		return ['bspwm', 'sxhkd', 'dmenu', 'xdo', 'rxvt-unicode']
 
 	@property
 	@override

archinstall/default_profiles/desktops/budgie.py

@@ -11,13 +11,7 @@ def __init__(self) -> None:
 	@property
 	@override
 	def packages(self) -> list[str]:
-		return [
-			"materia-gtk-theme",
-			"budgie",
-			"mate-terminal",
-			"nemo",
-			"papirus-icon-theme"
-		]
+		return ['materia-gtk-theme', 'budgie', 'mate-terminal', 'nemo', 'papirus-icon-theme']
 
 	@property
 	@override

archinstall/default_profiles/desktops/cinnamon.py

@@ -12,17 +12,17 @@ def __init__(self) -> None:
 	@override
 	def packages(self) -> list[str]:
 		return [
-			"cinnamon",
-			"system-config-printer",
-			"gnome-keyring",
-			"gnome-terminal",
-			"blueman",
-			"bluez-utils",
-			"engrampa",
-			"gnome-screenshot",
-			"gvfs-smb",
-			"xed",
-			"xdg-user-dirs-gtk"
+			'cinnamon',
+			'system-config-printer',
+			'gnome-keyring',
+			'gnome-terminal',
+			'blueman',
+			'bluez-utils',
+			'engrampa',
+			'gnome-screenshot',
+			'gvfs-smb',
+			'xed',
+			'xdg-user-dirs-gtk',
 		]
 
 	@property

archinstall/default_profiles/desktops/cosmic.py

@@ -12,7 +12,7 @@ def __init__(self) -> None:
 	@override
 	def packages(self) -> list[str]:
 		return [
-			"cosmic",
+			'cosmic',
 		]
 
 	@property

archinstall/default_profiles/desktops/cutefish.py

@@ -11,10 +11,7 @@ def __init__(self) -> None:
 	@property
 	@override
 	def packages(self) -> list[str]:
-		return [
-			"cutefish",
-			"noto-fonts"
-		]
+		return ['cutefish', 'noto-fonts']
 
 	@property
 	@override

archinstall/default_profiles/desktops/deepin.py

@@ -11,11 +11,7 @@ def __init__(self) -> None:
 	@property
 	@override
 	def packages(self) -> list[str]:
-		return [
-			"deepin",
-			"deepin-terminal",
-			"deepin-editor"
-		]
+		return ['deepin', 'deepin-terminal', 'deepin-editor']
 
 	@property
 	@override