Skip to content

Commit 0ea6dbb

Browse files
authored
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
1 parent f7913f4 commit 0ea6dbb

7 files changed

Lines changed: 14 additions & 11 deletions

File tree

archinstall/default_profiles/desktop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def __init__(self, current_selection: List[Profile] = []):
1515
super().__init__(
1616
'Desktop',
1717
ProfileType.Desktop,
18-
description=str(_('Provides a selection of desktop environments and tiling window managers, e.g. gnome, kde, sway')),
18+
description=str(_('Provides a selection of desktop environments and tiling window managers, e.g. GNOME, KDE Plasma, Sway')),
1919
current_selection=current_selection,
2020
support_greeter=True
2121
)

archinstall/default_profiles/desktops/kde.py renamed to archinstall/default_profiles/desktops/plasma.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
if TYPE_CHECKING:
77
_: Any
88

9-
10-
class KdeProfile(XorgProfile):
9+
class PlasmaProfile(XorgProfile):
1110
def __init__(self):
12-
super().__init__('Kde', ProfileType.DesktopEnv, description='')
11+
super().__init__('KDE Plasma', ProfileType.DesktopEnv, description='')
1312

1413
@property
1514
def packages(self) -> List[str]:

archinstall/lib/models/network_configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def display_msg(self) -> str:
2020
case NicType.ISO:
2121
return str(_('Copy ISO network configuration to installation'))
2222
case NicType.NM:
23-
return str(_('Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)'))
23+
return str(_('Use NetworkManager (necessary to configure internet graphically in GNOME and KDE Plasma)'))
2424
case NicType.MANUAL:
2525
return str(_('Manual configuration'))
2626

archinstall/lib/profile/profiles_handler.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ def parse_profile_config(self, profile_config: Dict[str, Any]) -> Optional[Profi
107107

108108
if details:
109109
for detail in filter(None, details):
110+
# [2024-04-19] TODO: Backwards compatibility after naming change: https://github.com/archlinux/archinstall/pull/2421
111+
# 'Kde' is deprecated, remove this block in a future version
112+
if detail == 'Kde':
113+
detail = 'KDE Plasma'
114+
110115
if sub_profile := self.get_profile_by_name(detail):
111116
valid_sub_profiles.append(sub_profile)
112117
else:

examples/config-sample.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"greeter": "sddm",
107107
"profile": {
108108
"details": [
109-
"Kde"
109+
"KDE Plasma"
110110
],
111111
"main": "Desktop"
112112
}

mypy-strict.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ exclude = (?x)(
6666
| ^archinstall/profiles/enlightenment\.py$
6767
| ^archinstall/profiles/gnome\.py$
6868
| ^archinstall/profiles/i3\.py$
69-
| ^archinstall/profiles/kde\.py$
7069
| ^archinstall/profiles/lxqt\.py$
7170
| ^archinstall/profiles/mate\.py$
7271
| ^archinstall/profiles/minimal\.py$
72+
| ^archinstall/profiles/plasma\.py$
7373
| ^archinstall/profiles/qtile\.py$
7474
| ^archinstall/profiles/server\.py$
7575
| ^archinstall/profiles/sway\.py$
@@ -86,10 +86,10 @@ exclude = (?x)(
8686
| ^profiles/enlightenment\.py$
8787
| ^profiles/gnome\.py$
8888
| ^profiles/i3\.py$
89-
| ^profiles/kde\.py$
9089
| ^profiles/lxqt\.py$
9190
| ^profiles/mate\.py$
9291
| ^profiles/minimal\.py$
92+
| ^profiles/plasma\.py$
9393
| ^profiles/qtile\.py$
9494
| ^profiles/server\.py$
9595
| ^profiles/sway\.py$

schema.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
]
130130
},
131131
"details": {
132-
"description": "Specific profile to be installed based on the 'main' selection; these profiles are present in profiles_v2/, use the name of a profile to install it (case insensitive)",
132+
"description": "Specific profile to be installed based on the 'main' selection; these profiles are present in default_profiles/, use the file name of a profile without the extension to install it (case insensitive)",
133133
"type": "string",
134134
"enum": [
135135
"awesome",
@@ -142,8 +142,7 @@
142142
"enlightenment",
143143
"gnome",
144144
"i3-wm",
145-
"i3-gasp",
146-
"kde",
145+
"plasma",
147146
"lxqt",
148147
"mate",
149148
"sway",

0 commit comments

Comments
 (0)