From dd0da34ed9b61053b7bb67c106507541f382071c Mon Sep 17 00:00:00 2001
From: Daniel Girtler <girtler.daniel@gmail.com>
Date: Sat, 21 Mar 2026 18:36:00 +1100
Subject: [PATCH] Move luks into disk module (#4296)

---
 archinstall/lib/disk/device_handler.py | 6 +++---
 archinstall/lib/disk/filesystem.py     | 2 +-
 archinstall/lib/{ => disk}/luks.py     | 0
 archinstall/lib/installer.py           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename archinstall/lib/{ => disk}/luks.py (100%)

diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py
index 936cb8be..2cf91bf8 100644
--- a/archinstall/lib/disk/device_handler.py
+++ b/archinstall/lib/disk/device_handler.py
@@ -5,6 +5,7 @@ from pathlib import Path
 from parted import Device, Disk, DiskException, FileSystem, Geometry, IOException, Partition, PartitionException, freshDisk, getAllDevices, getDevice, newDisk
 
 from archinstall.lib.command import SysCommand
+from archinstall.lib.disk.luks import Luks2, unlock_luks2_dev
 from archinstall.lib.disk.utils import (
 	find_lsblk_info,
 	get_all_lsblk_info,
@@ -14,7 +15,6 @@ from archinstall.lib.disk.utils import (
 	umount,
 )
 from archinstall.lib.exceptions import DiskError, SysCallError, UnknownFilesystemFormat
-from archinstall.lib.luks import Luks2, unlock_luks2_dev
 from archinstall.lib.models.device import (
 	DEFAULT_ITER_TIME,
 	BDevice,
@@ -601,8 +601,8 @@ class DeviceHandler:
 	def _wipe(self, dev_path: Path) -> None:
 		"""
 		Wipe a device (partition or otherwise) of meta-data, be it file system, LVM, etc.
-		@param dev_path:    Device path of the partition to be wiped.
-		@type dev_path:     str
+		@param dev_path:	Device path of the partition to be wiped.
+		@type dev_path:		str
 		"""
 		with open(dev_path, 'wb') as p:
 			p.write(bytearray(1024))
diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py
index f15ac52a..28786530 100644
--- a/archinstall/lib/disk/filesystem.py
+++ b/archinstall/lib/disk/filesystem.py
@@ -3,6 +3,7 @@ import time
 from pathlib import Path
 
 from archinstall.lib.disk.device_handler import device_handler
+from archinstall.lib.disk.luks import Luks2
 from archinstall.lib.disk.lvm import (
 	lvm_group_info,
 	lvm_pv_create,
@@ -12,7 +13,6 @@ from archinstall.lib.disk.lvm import (
 	lvm_vol_reduce,
 )
 from archinstall.lib.disk.utils import udev_sync
-from archinstall.lib.luks import Luks2
 from archinstall.lib.models.device import (
 	DiskEncryption,
 	DiskLayoutConfiguration,
diff --git a/archinstall/lib/luks.py b/archinstall/lib/disk/luks.py
similarity index 100%
rename from archinstall/lib/luks.py
rename to archinstall/lib/disk/luks.py
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 2311fdef..814eb48a 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -17,6 +17,7 @@ from typing import Any, Self
 from archinstall.lib.boot import Boot
 from archinstall.lib.command import SysCommand, run
 from archinstall.lib.disk.fido import Fido2
+from archinstall.lib.disk.luks import Luks2, unlock_luks2_dev
 from archinstall.lib.disk.lvm import lvm_import_vg, lvm_pvseg_info, lvm_vol_change
 from archinstall.lib.disk.utils import (
 	get_lsblk_by_mountpoint,
@@ -29,7 +30,6 @@ from archinstall.lib.disk.utils import (
 from archinstall.lib.exceptions import DiskError, HardwareIncompatibilityError, RequirementError, ServiceException, SysCallError
 from archinstall.lib.hardware import SysInfo
 from archinstall.lib.locale.utils import verify_keyboard_layout, verify_x11_keyboard_layout
-from archinstall.lib.luks import Luks2, unlock_luks2_dev
 from archinstall.lib.mirror.mirror_handler import MirrorListHandler
 from archinstall.lib.models.application import ZramAlgorithm
 from archinstall.lib.models.bootloader import Bootloader