From 0ea6dbbd7677b94e863b2ab333431716886b5f84 Mon Sep 17 00:00:00 2001
From: Martin <martin@rys.pw>
Date: Fri, 19 Apr 2024 14:47:18 +0200
Subject: Rename "Kde" profile to the correct "KDE Plasma" / "Plasma" (#2421)

* schema.json: Remove dead misspelled i3-gasp profile

* schema.json: Rename KDE Plasma profile to the correct "Plasma" shorthand

* Rename to KDE Plasma in user facing parts and keep the old "Kde" profile for now

* Add back an accidental deleted character

* Backwards compat v2
---
 archinstall/default_profiles/desktop.py         |  2 +-
 archinstall/default_profiles/desktops/kde.py    | 28 -------------------------
 archinstall/default_profiles/desktops/plasma.py | 27 ++++++++++++++++++++++++
 archinstall/lib/models/network_configuration.py |  2 +-
 archinstall/lib/profile/profiles_handler.py     |  5 +++++
 5 files changed, 34 insertions(+), 30 deletions(-)
 delete mode 100644 archinstall/default_profiles/desktops/kde.py
 create mode 100644 archinstall/default_profiles/desktops/plasma.py

(limited to 'archinstall')

diff --git a/archinstall/default_profiles/desktop.py b/archinstall/default_profiles/desktop.py
index 9d92f822..417d86d6 100644
--- a/archinstall/default_profiles/desktop.py
+++ b/archinstall/default_profiles/desktop.py
@@ -15,7 +15,7 @@ class DesktopProfile(Profile):
 		super().__init__(
 			'Desktop',
 			ProfileType.Desktop,
-			description=str(_('Provides a selection of desktop environments and tiling window managers, e.g. gnome, kde, sway')),
+			description=str(_('Provides a selection of desktop environments and tiling window managers, e.g. GNOME, KDE Plasma, Sway')),
 			current_selection=current_selection,
 			support_greeter=True
 		)
diff --git a/archinstall/default_profiles/desktops/kde.py b/archinstall/default_profiles/desktops/kde.py
deleted file mode 100644
index 62274d51..00000000
--- a/archinstall/default_profiles/desktops/kde.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from typing import List, Optional, Any, TYPE_CHECKING
-
-from archinstall.default_profiles.profile import ProfileType, GreeterType
-from archinstall.default_profiles.xorg import XorgProfile
-
-if TYPE_CHECKING:
-	_: Any
-
-
-class KdeProfile(XorgProfile):
-	def __init__(self):
-		super().__init__('Kde', ProfileType.DesktopEnv, description='')
-
-	@property
-	def packages(self) -> List[str]:
-		return [
-			"plasma-meta",
-			"konsole",
-			"kwrite",
-			"dolphin",
-			"ark",
-			"plasma-workspace",
-			"egl-wayland"
-		]
-
-	@property
-	def default_greeter_type(self) -> Optional[GreeterType]:
-		return GreeterType.Sddm
diff --git a/archinstall/default_profiles/desktops/plasma.py b/archinstall/default_profiles/desktops/plasma.py
new file mode 100644
index 00000000..bcc1ea1b
--- /dev/null
+++ b/archinstall/default_profiles/desktops/plasma.py
@@ -0,0 +1,27 @@
+from typing import List, Optional, Any, TYPE_CHECKING
+
+from archinstall.default_profiles.profile import ProfileType, GreeterType
+from archinstall.default_profiles.xorg import XorgProfile
+
+if TYPE_CHECKING:
+	_: Any
+
+class PlasmaProfile(XorgProfile):
+	def __init__(self):
+		super().__init__('KDE Plasma', ProfileType.DesktopEnv, description='')
+
+	@property
+	def packages(self) -> List[str]:
+		return [
+			"plasma-meta",
+			"konsole",
+			"kwrite",
+			"dolphin",
+			"ark",
+			"plasma-workspace",
+			"egl-wayland"
+		]
+
+	@property
+	def default_greeter_type(self) -> Optional[GreeterType]:
+		return GreeterType.Sddm
diff --git a/archinstall/lib/models/network_configuration.py b/archinstall/lib/models/network_configuration.py
index b726bb73..dfd8b8cb 100644
--- a/archinstall/lib/models/network_configuration.py
+++ b/archinstall/lib/models/network_configuration.py
@@ -20,7 +20,7 @@ class NicType(Enum):
 			case NicType.ISO:
 				return str(_('Copy ISO network configuration to installation'))
 			case NicType.NM:
-				return str(_('Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)'))
+				return str(_('Use NetworkManager (necessary to configure internet graphically in GNOME and KDE Plasma)'))
 			case NicType.MANUAL:
 				return str(_('Manual configuration'))
 
diff --git a/archinstall/lib/profile/profiles_handler.py b/archinstall/lib/profile/profiles_handler.py
index 12dcee3f..b9acb4fe 100644
--- a/archinstall/lib/profile/profiles_handler.py
+++ b/archinstall/lib/profile/profiles_handler.py
@@ -107,6 +107,11 @@ class ProfileHandler:
 
 		if details:
 			for detail in filter(None, details):
+				# [2024-04-19] TODO: Backwards compatibility after naming change: https://github.com/archlinux/archinstall/pull/2421
+				#                    'Kde' is deprecated, remove this block in a future version
+				if detail == 'Kde':
+					detail = 'KDE Plasma'
+
 				if sub_profile := self.get_profile_by_name(detail):
 					valid_sub_profiles.append(sub_profile)
 				else:
-- 
cgit v1.2.3-70-g09d2