From 5fe42bd2f599d900d3a953b2e8074bad33538b5b Mon Sep 17 00:00:00 2001
From: Daniel Girtler <girtler.daniel@gmail.com>
Date: Tue, 27 Jan 2026 18:50:09 +1100
Subject: [PATCH] Refactor user menu (#4141)

---
 archinstall/lib/authentication/authentication_menu.py          | 2 +-
 archinstall/lib/interactions/__init__.py                       | 3 ---
 archinstall/lib/user/__init__.py                               | 0
 .../{interactions/manage_users_conf.py => user/user_menu.py}   | 0
 4 files changed, 1 insertion(+), 4 deletions(-)
 create mode 100644 archinstall/lib/user/__init__.py
 rename archinstall/lib/{interactions/manage_users_conf.py => user/user_menu.py} (100%)

diff --git a/archinstall/lib/authentication/authentication_menu.py b/archinstall/lib/authentication/authentication_menu.py
index 6940bb13..2eaec82b 100644
--- a/archinstall/lib/authentication/authentication_menu.py
+++ b/archinstall/lib/authentication/authentication_menu.py
@@ -1,13 +1,13 @@
 from typing import override
 
 from archinstall.lib.disk.fido import Fido2
-from archinstall.lib.interactions.manage_users_conf import ask_for_additional_users
 from archinstall.lib.menu.abstract_menu import AbstractSubMenu
 from archinstall.lib.menu.helpers import Confirmation, Selection
 from archinstall.lib.models.authentication import AuthenticationConfiguration, U2FLoginConfiguration, U2FLoginMethod
 from archinstall.lib.models.users import Password, User
 from archinstall.lib.output import FormattedOutput
 from archinstall.lib.translationhandler import tr
+from archinstall.lib.user.user_menu import ask_for_additional_users
 from archinstall.lib.utils.util import get_password
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
diff --git a/archinstall/lib/interactions/__init__.py b/archinstall/lib/interactions/__init__.py
index 987a1f8d..dd04ea98 100644
--- a/archinstall/lib/interactions/__init__.py
+++ b/archinstall/lib/interactions/__init__.py
@@ -14,17 +14,14 @@ from .general_conf import (
 	ask_ntp,
 	select_archinstall_language,
 )
-from .manage_users_conf import UserList, ask_for_additional_users
 from .network_menu import ManualNetworkConfig, ask_to_configure_network
 from .system_conf import ask_for_swap, select_driver, select_kernel
 
 __all__ = [
 	'ManualNetworkConfig',
-	'UserList',
 	'add_number_of_parallel_downloads',
 	'ask_additional_packages_to_install',
 	'ask_for_a_timezone',
-	'ask_for_additional_users',
 	'ask_for_swap',
 	'ask_hostname',
 	'ask_ntp',
diff --git a/archinstall/lib/user/__init__.py b/archinstall/lib/user/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/archinstall/lib/interactions/manage_users_conf.py b/archinstall/lib/user/user_menu.py
similarity index 100%
rename from archinstall/lib/interactions/manage_users_conf.py
rename to archinstall/lib/user/user_menu.py