Merge branch 'upstreamMaster'

2 files changed, 81 insertions, 1 deletions

diff --git a/archinstall/lib/models/network_configuration.py b/archinstall/lib/models/network_configuration.py
index 16136177..4f135da5 100644
--- a/archinstall/lib/models/network_configuration.py
+++ b/archinstall/lib/models/network_configuration.py
@@ -5,6 +5,7 @@ from enum import Enum
 from typing import List, Optional, Dict, Union, Any, TYPE_CHECKING
 
 from ..output import log
+from ..storage import storage
 
 if TYPE_CHECKING:
 	_: Any
@@ -77,7 +78,9 @@ class NetworkConfigurationHandler:
 				installation.copy_iso_network_config(
 					enable_services=True)  # Sources the ISO network configuration to the install medium.
 			elif self._configuration.is_network_manager():
-				installation.add_additional_packages("networkmanager")
+				installation.add_additional_packages(["networkmanager"])
+				if (profile := storage['arguments'].get('profile')) and profile.is_desktop_profile:
+					installation.add_additional_packages(["network-manager-applet"])
 				installation.enable_service('NetworkManager.service')
 
 	def _backwards_compability_config(self, config: Union[str,Dict[str, str]]) -> Union[List[NetworkConfiguration], NetworkConfiguration, None]:
diff --git a/archinstall/lib/models/users.py b/archinstall/lib/models/users.py
new file mode 100644
index 00000000..6052b73a
--- /dev/null
+++ b/archinstall/lib/models/users.py
@@ -0,0 +1,77 @@
+from dataclasses import dataclass
+from typing import Dict, List, Union, Any, TYPE_CHECKING
+
+if TYPE_CHECKING:
+	_: Any
+
+
+@dataclass
+class User:
+	username: str
+	password: str
+	sudo: bool
+
+	@property
+	def groups(self) -> List[str]:
+		# this property should be transferred into a class attr instead
+		# if it's every going to be used
+		return []
+
+	def json(self) -> Dict[str, Any]:
+		return {
+			'username': self.username,
+			'!password': self.password,
+			'sudo': self.sudo
+		}
+
+	def display(self) -> str:
+		password = '*' * len(self.password)
+		return f'{_("Username")}: {self.username:16} {_("Password")}: {password:16} sudo: {str(self.sudo)}'
+
+	@classmethod
+	def _parse(cls, config_users: List[Dict[str, Any]]) -> List['User']:
+		users = []
+
+		for entry in config_users:
+			username = entry.get('username', None)
+			password = entry.get('!password', '')
+			sudo = entry.get('sudo', False)
+
+			if username is None:
+				continue
+
+			user = User(username, password, sudo)
+			users.append(user)
+
+		return users
+
+	@classmethod
+	def _parse_backwards_compatible(cls, config_users: Dict, sudo: bool) -> List['User']:
+		if len(config_users.keys()) > 0:
+			username = list(config_users.keys())[0]
+			password = config_users[username]['!password']
+
+			if password:
+				return [User(username, password, sudo)]
+
+		return []
+
+	@classmethod
+	def parse_arguments(
+		cls,
+		config_users: Union[List[Dict[str, str]], Dict[str, str]],
+		config_superusers: Union[List[Dict[str, str]], Dict[str, str]]
+	) -> List['User']:
+		users = []
+
+		# backwards compability
+		if isinstance(config_users, dict):
+			users += cls._parse_backwards_compatible(config_users, False)
+		else:
+			users += cls._parse(config_users)
+
+		# backwards compability
+		if isinstance(config_superusers, dict):
+			users += cls._parse_backwards_compatible(config_superusers, True)
+
+		return users