nixos/plasma5: Rename Plasma 5 desktop

- There is no such thing as KDE 5

3 files changed, 11 insertions, 8 deletions

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index ee68f8bff81..ff3654737af 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -178,6 +178,9 @@ with lib;
     (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])
     (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])
 
+    # KDE Plasma 5
+    (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
     (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 1f7a925ed05..af01f6acad1 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -16,9 +16,9 @@ in
 {
   # Note: the order in which desktop manager modules are imported here
   # determines the default: later modules (if enabled) are preferred.
-  # E.g., if KDE is enabled, it supersedes xterm.
+  # E.g., if Plasma 5 is enabled, it supersedes xterm.
   imports = [
-    ./none.nix ./xterm.nix ./xfce.nix ./kde5.nix ./lumina.nix
+    ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
     ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
   ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 57924a73949..4dbd8d7a2c0 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -5,16 +5,16 @@ with lib;
 let
 
   xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.kde5;
+  cfg = xcfg.desktopManager.plasma5;
 
-  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
+  inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg;
 
 in
 
 {
   options = {
 
-    services.xserver.desktopManager.kde5 = {
+    services.xserver.desktopManager.plasma5 = {
       enable = mkOption {
         type = types.bool;
         default = false;
@@ -45,12 +45,12 @@ in
 
   config = mkMerge [
     (mkIf (cfg.extraPackages != []) {
-      environment.systemPackages = [ (libsForQt5.kdeWrapper cfg.extraPackages) ];
+      environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ];
     })
 
     (mkIf (xcfg.enable && cfg.enable) {
       services.xserver.desktopManager.session = singleton {
-        name = "Plasma 5";
+        name = "plasma5";
         bgSupport = true;
         start = ''
           # Load PulseAudio module for routing support.
@@ -163,7 +163,7 @@ in
         ++ lib.optional config.services.colord.enable colord-kde
         ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
 
-      services.xserver.desktopManager.kde5.extraPackages =
+      services.xserver.desktopManager.plasma5.extraPackages =
         with kdeApplications; with plasma5;
         [
           khelpcenter