PyParted and a large rewrite of the underlying partitioning (#1604)

* Invert mypy files

* Add optional pre-commit hooks

* New profile structure

* Serialize profiles

* Use profile instead of classmethod

* Custom profile setup

* Separator between back

* Support profile import via url

* Move profiles module

* Refactor files

* Remove symlink

* Add user to docker group

* Update schema description

* Handle list services

* mypy fixes

* mypy fixes

* Rename profilesv2 to profiles

* flake8

* mypy again

* Support selecting DM

* Fix mypy

* Cleanup

* Update greeter setting

* Update schema

* Revert toml changes

* Poc external dependencies

* Dependency support

* New encryption menu

* flake8

* Mypy and flake8

* Unify lsblk command

* Update bootloader configuration

* Git hooks

* Fix import

* Pyparted

* Remove custom font setting

* flake8

* Remove default preview

* Manual partitioning menu

* Update structure

* Disk configuration

* Update filesystem

* luks2 encryption

* Everything works until installation

* Btrfsutil

* Btrfs handling

* Update btrfs

* Save encryption config

* Fix pipewire issue

* Update mypy version

* Update all pre-commit

* Update package versions

* Revert audio/pipewire

* Merge master PRs

* Add master changes

* Merge master changes

* Small renaming

* Pull master changes

* Reset disk enc after disk config change

* Generate locals

* Update naming

* Fix imports

* Fix broken sync

* Fix pre selection on table menu

* Profile menu

* Update profile

* Fix post_install

* Added python-pyparted to PKGBUILD, this requires [testing] to be enabled in order to run makepkg. Package still works via python -m build etc.

* Swaped around some setuptools logic in pyproject

Since we define `package-data` and `packages` there should be no need for:
```
[tool.setuptools.packages.find]
where = ["archinstall", "archinstall.*"]
```

* Removed pyproject collisions. Duplicate definitions.

* Made sure pyproject.toml includes languages

* Add example and update README

* Fix pyproject issues

* Generate locale

* Refactor imports

* Simplify imports

* Add profile description and package examples

* Align code

* Fix mypy

* Simplify imports

* Fix saving config

* Fix wrong luks merge

* Refactor installation

* Fix cdrom device loading

* Fix wrongly merged code

* Fix imports and greeter

* Don't terminate on partprobe error

* Use specific path on partprobe from luks

* Update archinstall/lib/disk/device_model.py

Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com>

* Update archinstall/lib/disk/device_model.py

Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com>

* Update github workflow to test archinstall installation

* Update sway merge

* Generate locales

* Update workflow

---------

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
Co-authored-by: Anton Hvornum <anton@hvornum.se>
Co-authored-by: Anton Hvornum <anton.feeds+github@gmail.com>
Co-authored-by: codefiles <11915375+codefiles@users.noreply.github.com>

1 files changed, 15 insertions, 54 deletions

diff --git a/archinstall/lib/configuration.py b/archinstall/lib/configuration.py
index c036783f..77fed755 100644
--- a/archinstall/lib/configuration.py
+++ b/archinstall/lib/configuration.py
@@ -2,27 +2,15 @@ import os
 import json
 import stat
 import logging
-import pathlib
-from typing import Optional, Dict
+from pathlib import Path
+from typing import Optional, Dict, Any, TYPE_CHECKING
 
-from .hsm.fido import Fido2
-from .models.disk_encryption import DiskEncryption
 from .storage import storage
 from .general import JSON, UNSAFE_JSON
 from .output import log
-from .exceptions import RequirementError
-
-
-def configuration_sanity_check():
-	disk_encryption: DiskEncryption = storage['arguments'].get('disk_encryption')
-	if disk_encryption is not None and disk_encryption.hsm_device:
-		if not Fido2.get_fido2_devices():
-			raise RequirementError(
-				f"In order to use HSM to pair with the disk encryption,"
-				+ f" one needs to be accessible through /dev/hidraw* and support"
-				+ f" the FIDO2 protocol. You can check this by running"
-				+ f" 'systemd-cryptenroll --fido2-device=list'."
-			)
+
+if TYPE_CHECKING:
+	_: Any
 
 
 class ConfigurationOutput:
@@ -35,13 +23,11 @@ class ConfigurationOutput:
 		:type config: Dict
 		"""
 		self._config = config
-		self._user_credentials = {}
-		self._disk_layout = None
-		self._user_config = {}
-		self._default_save_path = pathlib.Path(storage.get('LOG_PATH', '.'))
+		self._user_credentials: Dict[str, Any] = {}
+		self._user_config: Dict[str, Any] = {}
+		self._default_save_path = Path(storage.get('LOG_PATH', '.'))
 		self._user_config_file = 'user_configuration.json'
 		self._user_creds_file = "user_credentials.json"
-		self._disk_layout_file = "user_disk_layout.json"
 
 		self._sensitive = ['!users']
 		self._ignore = ['abort', 'install', 'config', 'creds', 'dry_run']
@@ -56,23 +42,18 @@ class ConfigurationOutput:
 	def user_configuration_file(self):
 		return self._user_config_file
 
-	@property
-	def disk_layout_file(self):
-		return self._disk_layout_file
-
 	def _process_config(self):
 		for key in self._config:
 			if key in self._sensitive:
 				self._user_credentials[key] = self._config[key]
-			elif key == 'disk_layouts':
-				self._disk_layout = self._config[key]
 			elif key in self._ignore:
 				pass
 			else:
 				self._user_config[key] = self._config[key]
 
-				if key == 'disk_encryption' and self._config[key]:  # special handling for encryption password
-					self._user_credentials['encryption_password'] = self._config[key].encryption_password
+			# special handling for encryption password
+			if key == 'disk_encryption' and self._config[key] is not None:
+				self._user_credentials['encryption_password'] = self._config[key].encryption_password
 
 	def user_config_to_json(self) -> str:
 		return json.dumps({
@@ -81,11 +62,6 @@ class ConfigurationOutput:
 			'version': storage['__version__']
 		}, indent=4, sort_keys=True, cls=JSON)
 
-	def disk_layout_to_json(self) -> Optional[str]:
-		if self._disk_layout:
-			return json.dumps(self._disk_layout, indent=4, sort_keys=True, cls=JSON)
-		return None
-
 	def user_credentials_to_json(self) -> Optional[str]:
 		if self._user_credentials:
 			return json.dumps(self._user_credentials, indent=4, sort_keys=True, cls=UNSAFE_JSON)
@@ -96,15 +72,11 @@ class ConfigurationOutput:
 		log(" -- Chosen configuration --", level=logging.DEBUG)
 
 		user_conig = self.user_config_to_json()
-		disk_layout = self.disk_layout_to_json()
 		log(user_conig, level=logging.INFO)
 
-		if disk_layout:
-			log(disk_layout, level=logging.INFO)
-
 		print()
 
-	def _is_valid_path(self, dest_path :pathlib.Path) -> bool:
+	def _is_valid_path(self, dest_path: Path) -> bool:
 		if (not dest_path.exists()) or not (dest_path.is_dir()):
 			log(
 				'Destination directory {} does not exist or is not a directory,\n Configuration files can not be saved'.format(dest_path.resolve()),
@@ -113,7 +85,7 @@ class ConfigurationOutput:
 			return False
 		return True
 
-	def save_user_config(self, dest_path :pathlib.Path = None):
+	def save_user_config(self, dest_path: Path):
 		if self._is_valid_path(dest_path):
 			target = dest_path / self._user_config_file
 
@@ -122,7 +94,7 @@ class ConfigurationOutput:
 
 			os.chmod(str(dest_path / self._user_config_file), stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP)
 
-	def save_user_creds(self, dest_path :pathlib.Path = None):
+	def save_user_creds(self, dest_path: Path):
 		if self._is_valid_path(dest_path):
 			if user_creds := self.user_credentials_to_json():
 				target = dest_path / self._user_creds_file
@@ -132,21 +104,10 @@ class ConfigurationOutput:
 
 				os.chmod(str(target), stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP)
 
-	def save_disk_layout(self, dest_path :pathlib.Path = None):
-		if self._is_valid_path(dest_path):
-			if disk_layout := self.disk_layout_to_json():
-				target = dest_path / self._disk_layout_file
-
-				with target.open('w') as config_file:
-					config_file.write(disk_layout)
-
-				os.chmod(str(target), stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP)
-
-	def save(self, dest_path :pathlib.Path = None):
+	def save(self, dest_path: Optional[Path] = None):
 		if not dest_path:
 			dest_path = self._default_save_path
 
 		if self._is_valid_path(dest_path):
 			self.save_user_config(dest_path)
 			self.save_user_creds(dest_path)
-			self.save_disk_layout(dest_path)