Update

Author: svartkanin

archinstall/lib/disk/disk_menu.py

@@ -124,12 +124,12 @@ def _select_lvm_config(self, preset: LvmConfiguration | None) -> LvmConfiguratio
 		return preset
 
 	def _select_btrfs_snapshots(self, preset: SnapshotConfig | None) -> SnapshotConfig | None:
-		snapshot_type = preset.snapshot_type if preset else None
+		preset_type = preset.snapshot_type if preset else None
 
 		group = MenuItemGroup.from_enum(
 			SnapshotType,
 			sort_items=True,
-			preset=snapshot_type,
+			preset=preset_type,
 		)
 
 		result = SelectMenu[SnapshotType](

archinstall/lib/models/device_model.py

@@ -40,6 +40,7 @@ class _DiskLayoutConfigurationSerialization(TypedDict):
 	device_modifications: NotRequired[list[_DeviceModificationSerialization]]
 	lvm_config: NotRequired[_LvmConfigurationSerialization]
 	mountpoint: NotRequired[str]
+	btrfs_options: NotRequired[_BtrfsOptionsSerialization]
 
 
 @dataclass
@@ -1328,11 +1329,11 @@ def get_root_volume(self) -> LvmVolume | None:
 
 
 class _BtrfsOptionsSerialization(TypedDict):
-	snapshot_config: _SnapshotConfigSerialization
+	snapshot_config: _SnapshotConfigSerialization | None
 
 
 class _SnapshotConfigSerialization(TypedDict):
-	enabled: bool
+	type: str
 
 
 class SnapshotType(Enum):

archinstall/tui/menu_item.py

@@ -4,14 +4,12 @@
 from dataclasses import dataclass, field
 from enum import Enum
 from functools import cached_property
-from typing import Any, ClassVar, TypeVar
+from typing import Any, ClassVar
 
 from archinstall.lib.translationhandler import tr
 
 from ..lib.utils.unicode import unicode_ljust
 
-E = TypeVar("E", bound=Enum)
-
 
 @dataclass
 class MenuItem:
@@ -124,14 +122,14 @@ def yes_no() -> "MenuItemGroup":
 
 	@staticmethod
 	def from_enum(
-		enum_cls: E,
+		enum_cls: type[Enum],
 		sort_items: bool = False,
-		preset: E | None = None,
+		preset: Enum | None = None,
 	) -> "MenuItemGroup":
 		items = [MenuItem(elem.value, value=elem) for elem in enum_cls]
 		group = MenuItemGroup(items, sort_items=False)
 
-		if E is not None:
+		if preset is not None:
 			group.set_selected_by_value(preset)
 
 		return group