index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Martin <martin@rys.pw> | 2024-04-19 14:47:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-19 22:47:18 +1000 |
commit | 0ea6dbbd7677b94e863b2ab333431716886b5f84 (patch) | |
tree | a9497f996189edb66790f609acf5efd54f2b2da6 | |
parent | f7913f46eede7a2aad7d60faf5cd50a1acf92c03 (diff) |
-rw-r--r-- | archinstall/default_profiles/desktop.py | 2 | ||||
-rw-r--r-- | archinstall/default_profiles/desktops/plasma.py (renamed from archinstall/default_profiles/desktops/kde.py) | 5 | ||||
-rw-r--r-- | archinstall/lib/models/network_configuration.py | 2 | ||||
-rw-r--r-- | archinstall/lib/profile/profiles_handler.py | 5 | ||||
-rw-r--r-- | examples/config-sample.json | 2 | ||||
-rw-r--r-- | mypy-strict.ini | 4 | ||||
-rw-r--r-- | schema.json | 5 |
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/plasma.py index 62274d51..bcc1ea1b 100644 --- a/archinstall/default_profiles/desktops/kde.py +++ b/archinstall/default_profiles/desktops/plasma.py @@ -6,10 +6,9 @@ from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: _: Any - -class KdeProfile(XorgProfile): +class PlasmaProfile(XorgProfile): def __init__(self): - super().__init__('Kde', ProfileType.DesktopEnv, description='') + super().__init__('KDE Plasma', ProfileType.DesktopEnv, description='') @property def packages(self) -> List[str]: 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: diff --git a/examples/config-sample.json b/examples/config-sample.json index d43f7ea6..47a4e2e0 100644 --- a/examples/config-sample.json +++ b/examples/config-sample.json @@ -106,7 +106,7 @@ "greeter": "sddm", "profile": { "details": [ - "Kde" + "KDE Plasma" ], "main": "Desktop" } diff --git a/mypy-strict.ini b/mypy-strict.ini index be7ddf57..c670bbaa 100644 --- a/mypy-strict.ini +++ b/mypy-strict.ini @@ -66,10 +66,10 @@ exclude = (?x)( | ^archinstall/profiles/enlightenment\.py$ | ^archinstall/profiles/gnome\.py$ | ^archinstall/profiles/i3\.py$ - | ^archinstall/profiles/kde\.py$ | ^archinstall/profiles/lxqt\.py$ | ^archinstall/profiles/mate\.py$ | ^archinstall/profiles/minimal\.py$ + | ^archinstall/profiles/plasma\.py$ | ^archinstall/profiles/qtile\.py$ | ^archinstall/profiles/server\.py$ | ^archinstall/profiles/sway\.py$ @@ -86,10 +86,10 @@ exclude = (?x)( | ^profiles/enlightenment\.py$ | ^profiles/gnome\.py$ | ^profiles/i3\.py$ - | ^profiles/kde\.py$ | ^profiles/lxqt\.py$ | ^profiles/mate\.py$ | ^profiles/minimal\.py$ + | ^profiles/plasma\.py$ | ^profiles/qtile\.py$ | ^profiles/server\.py$ | ^profiles/sway\.py$ diff --git a/schema.json b/schema.json index 74ecc4d3..97cb42e1 100644 --- a/schema.json +++ b/schema.json @@ -129,7 +129,7 @@ ] }, "details": { - "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)", + "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)", "type": "string", "enum": [ "awesome", @@ -142,8 +142,7 @@ "enlightenment", "gnome", "i3-wm", - "i3-gasp", - "kde", + "plasma", "lxqt", "mate", "sway", |