Skip to content

Commit 7b8b062

Browse files
committed
Update
1 parent a08187e commit 7b8b062

35 files changed

Lines changed: 366 additions & 182 deletions

archinstall/default_profiles/desktops/hyprland.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ def _ask_seat_access(self) -> None:
6464
group.set_default_by_value(default)
6565

6666
result = SelectMenu[SeatAccess](
67-
group, header=header, allow_skip=False, frame=FrameProperties.min(str(_('Seat access'))), alignment=Alignment.CENTER
67+
group,
68+
header=header,
69+
allow_skip=False,
70+
frame=FrameProperties.min(str(_('Seat access'))),
71+
alignment=Alignment.CENTER,
6872
).run()
6973

7074
if result.type_ == ResultType.Selection:

archinstall/default_profiles/desktops/labwc.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ def _ask_seat_access(self) -> None:
6161
group.set_default_by_value(default)
6262

6363
result = SelectMenu[SeatAccess](
64-
group, header=header, allow_skip=False, frame=FrameProperties.min(str(_('Seat access'))), alignment=Alignment.CENTER
64+
group,
65+
header=header,
66+
allow_skip=False,
67+
frame=FrameProperties.min(str(_('Seat access'))),
68+
alignment=Alignment.CENTER,
6569
).run()
6670

6771
if result.type_ == ResultType.Selection:

archinstall/default_profiles/desktops/niri.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ def _ask_seat_access(self) -> None:
5858
group.set_default_by_value(default)
5959

6060
result = SelectMenu[SeatAccess](
61-
group, header=header, allow_skip=False, frame=FrameProperties.min(str(_('Seat access'))), alignment=Alignment.CENTER
61+
group,
62+
header=header,
63+
allow_skip=False,
64+
frame=FrameProperties.min(str(_('Seat access'))),
65+
alignment=Alignment.CENTER,
6266
).run()
6367

6468
if result.type_ == ResultType.Selection:

archinstall/default_profiles/desktops/sway.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ def _ask_seat_access(self) -> None:
7171
group.set_default_by_value(default)
7272

7373
result = SelectMenu[SeatAccess](
74-
group, header=header, allow_skip=False, frame=FrameProperties.min(str(_('Seat access'))), alignment=Alignment.CENTER
74+
group,
75+
header=header,
76+
allow_skip=False,
77+
frame=FrameProperties.min(str(_('Seat access'))),
78+
alignment=Alignment.CENTER,
7579
).run()
7680

7781
if result.type_ == ResultType.Selection:

archinstall/lib/args.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ def from_config(cls, args_config: dict[str, Any]) -> 'ArchConfig':
176176

177177
if args_config.get('disk_encryption', None) is not None and arch_config.disk_config is not None:
178178
arch_config.disk_encryption = DiskEncryption.parse_arg(
179-
arch_config.disk_config, args_config['disk_encryption'], Password(plaintext=args_config.get('encryption_password', ''))
179+
arch_config.disk_config,
180+
args_config['disk_encryption'],
181+
Password(plaintext=args_config.get('encryption_password', '')),
180182
)
181183

182184
if hostname := args_config.get('hostname', ''):
@@ -267,15 +269,26 @@ def _define_arguments(self) -> ArgumentParser:
267269
)
268270
parser.add_argument('--script', default='guided', nargs='?', help='Script to run for installation', type=str)
269271
parser.add_argument(
270-
'--mount-point', '--mount_point', type=Path, nargs='?', default=Path('/mnt'), help='Define an alternate mount point for installation'
272+
'--mount-point',
273+
'--mount_point',
274+
type=Path,
275+
nargs='?',
276+
default=Path('/mnt'),
277+
help='Define an alternate mount point for installation',
271278
)
272279
parser.add_argument('--skip-ntp', action='store_true', help='Disables NTP checks during installation', default=False)
273280
parser.add_argument('--debug', action='store_true', default=False, help='Adds debug info into the log')
274281
parser.add_argument(
275-
'--offline', action='store_true', default=False, help='Disabled online upstream services such as package search and key-ring auto update.'
282+
'--offline',
283+
action='store_true',
284+
default=False,
285+
help='Disabled online upstream services such as package search and key-ring auto update.',
276286
)
277287
parser.add_argument(
278-
'--no-pkg-lookups', action='store_true', default=False, help='Disabled package validation specifically prior to starting installation.'
288+
'--no-pkg-lookups',
289+
action='store_true',
290+
default=False,
291+
help='Disabled package validation specifically prior to starting installation.',
279292
)
280293
parser.add_argument('--plugin', nargs='?', type=str, default=None, help='File path to a plugin to load')
281294
parser.add_argument('--skip-version-check', action='store_true', default=False, help='Skip the version check when running archinstall')
@@ -354,7 +367,10 @@ def _process_creds_data(self, creds_data: str) -> dict[str, Any] | None:
354367
header = str(_('Incorrect password')) if incorrect_password else None
355368

356369
decryption_pwd = get_password(
357-
text=str(_('Credentials file decryption password')), header=header, allow_skip=False, skip_confirmation=True
370+
text=str(_('Credentials file decryption password')),
371+
header=header,
372+
allow_skip=False,
373+
skip_confirmation=True,
358374
)
359375

360376
if not decryption_pwd:

archinstall/lib/boot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __enter__(self) -> 'Boot':
2626
# '-P' or --console=pipe could help us not having to do a bunch
2727
# of os.write() calls, but instead use pipes (stdin, stdout and stderr) as usual.
2828
self.session = SysCommandWorker(
29-
['systemd-nspawn', '-D', str(self.instance.target), '--timezone=off', '-b', '--no-pager', '--machine', self.container_name]
29+
['systemd-nspawn', '-D', str(self.instance.target), '--timezone=off', '-b', '--no-pager', '--machine', self.container_name],
3030
)
3131

3232
if not self.ready and self.session:

archinstall/lib/configuration.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,11 @@ def preview(item: MenuItem) -> str | None:
145145

146146
group = MenuItemGroup(items)
147147
result = SelectMenu[str](
148-
group, allow_skip=True, preview_frame=FrameProperties.max(str(_('Configuration'))), preview_size='auto', preview_style=PreviewStyle.RIGHT
148+
group,
149+
allow_skip=True,
150+
preview_frame=FrameProperties.max(str(_('Configuration'))),
151+
preview_size='auto',
152+
preview_style=PreviewStyle.RIGHT,
149153
).run()
150154

151155
match result.type_:
@@ -160,7 +164,9 @@ def preview(item: MenuItem) -> str | None:
160164
readline.parse_and_bind('tab: complete')
161165

162166
dest_path = prompt_dir(
163-
str(_('Directory')), str(_('Enter a directory for the configuration(s) to be saved (tab completion enabled)')) + '\n', allow_skip=True
167+
str(_('Directory')),
168+
str(_('Enter a directory for the configuration(s) to be saved (tab completion enabled)')) + '\n',
169+
allow_skip=True,
164170
)
165171

166172
if not dest_path:

archinstall/lib/disk/device_handler.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ def _lvm_info(self, cmd: str, info_type: Literal['lv', 'vg', 'pvseg']) -> LvmVol
347347
)
348348
case 'lv':
349349
return LvmVolumeInfo(
350-
lv_name=entry['lv_name'], vg_name=entry['vg_name'], lv_size=Size(int(entry['lv_size'][:-1]), Unit.B, SectorSize.default())
350+
lv_name=entry['lv_name'],
351+
vg_name=entry['vg_name'],
352+
lv_size=Size(int(entry['lv_size'][:-1]), Unit.B, SectorSize.default()),
351353
)
352354
case 'vg':
353355
return LvmGroupInfo(vg_uuid=entry['vg_uuid'], vg_size=Size(int(entry['vg_size'][:-1]), Unit.B, SectorSize.default()))
@@ -634,7 +636,12 @@ def swapon(path: Path) -> None:
634636
raise DiskError(f'Could not enable swap {path}:\n{err.message}')
635637

636638
def mount(
637-
self, dev_path: Path, target_mountpoint: Path, mount_fs: str | None = None, create_target_mountpoint: bool = True, options: list[str] = []
639+
self,
640+
dev_path: Path,
641+
target_mountpoint: Path,
642+
mount_fs: str | None = None,
643+
create_target_mountpoint: bool = True,
644+
options: list[str] = [],
638645
) -> None:
639646
if create_target_mountpoint and not target_mountpoint.exists():
640647
target_mountpoint.mkdir(parents=True, exist_ok=True)

archinstall/lib/disk/encryption_menu.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,11 @@ def select_encryption_type(disk_config: DiskLayoutConfiguration, preset: Encrypt
226226
group.set_focus_by_value(preset_value)
227227

228228
result = SelectMenu[EncryptionType](
229-
group, allow_skip=True, allow_reset=True, alignment=Alignment.CENTER, frame=FrameProperties.min(str(_('Encryption type')))
229+
group,
230+
allow_skip=True,
231+
allow_reset=True,
232+
alignment=Alignment.CENTER,
233+
frame=FrameProperties.min(str(_('Encryption type'))),
230234
).run()
231235

232236
match result.type_:

archinstall/lib/disk/filesystem.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,10 @@ def _encrypt_partitions(self, enc_config: DiskEncryption, lock_after_create: boo
270270
for part_mod in filtered_part:
271271
if part_mod in enc_config.partitions:
272272
luks_handler = device_handler.encrypt(
273-
part_mod.safe_dev_path, part_mod.mapper_name, enc_config.encryption_password, lock_after_create=lock_after_create
273+
part_mod.safe_dev_path,
274+
part_mod.mapper_name,
275+
enc_config.encryption_password,
276+
lock_after_create=lock_after_create,
274277
)
275278

276279
enc_mods[part_mod] = luks_handler

0 commit comments

Comments
 (0)