nixos/treewide: clean up Plasma 5 references

Preparing to drop.

nixos/doc/manual/configuration/modularity.section.md

@@ -33,7 +33,7 @@ Here, we include two modules from the same directory, `vpn.nix` and
 {
   services.xserver.enable = true;
   services.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
   environment.systemPackages = [ pkgs.vim ];
 }
 ```

nixos/doc/manual/configuration/profiles/graphical.section.md

@@ -1,10 +1,10 @@
 # Graphical {#sec-profile-graphical}
 
-Defines a NixOS configuration with the Plasma 5 desktop. It's used by the
+Defines a NixOS configuration with the Plasma 6 desktop. It's used by the
 graphical installation CD.
 
 It sets [](#opt-services.xserver.enable),
 [](#opt-services.displayManager.sddm.enable),
-[](#opt-services.xserver.desktopManager.plasma5.enable),
+[](#opt-services.desktopManager.plasma6.enable),
 and [](#opt-services.libinput.enable) to true. It also
 includes glxinfo and firefox in the system packages list.

nixos/doc/manual/configuration/x-windows.chapter.md

@@ -23,7 +23,7 @@ Thus you should pick one or more of the following lines:
 
 ```nix
 {
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
   services.xserver.desktopManager.xfce.enable = true;
   services.desktopManager.gnome.enable = true;
   services.xserver.desktopManager.mate.enable = true;

nixos/modules/i18n/input-method/ibus.nix

@@ -53,7 +53,7 @@ in
       panel = lib.mkOption {
         type = with lib.types; nullOr path;
         default = null;
-        example = lib.literalExpression ''"''${pkgs.plasma5Packages.plasma-desktop}/libexec/kimpanel-ibus-panel"'';
+        example = lib.literalExpression ''"''${pkgs.kdePackages.plasma-desktop}/libexec/kimpanel-ibus-panel"'';
         description = "Replace the IBus panel with another panel.";
       };
     };

nixos/modules/profiles/graphical.nix

@@ -1,4 +1,4 @@
-# This module defines a NixOS configuration with the Plasma 5 desktop.
+# This module defines a NixOS configuration with the Plasma 6 desktop.
 # It's used by the graphical installation CD.
 
 { pkgs, ... }:
@@ -6,7 +6,7 @@
 {
   services.xserver = {
     enable = true;
-    desktopManager.plasma5.enable = true;
+    desktopManager.plasma6.enable = true;
   };
 
   services = {

nixos/modules/programs/chromium.nix

@@ -27,7 +27,7 @@ in
       enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration";
 
       plasmaBrowserIntegrationPackage = lib.mkPackageOption pkgs [
-        "plasma5Packages"
+        "kdePackages"
         "plasma-browser-integration"
       ] { };
 

nixos/modules/programs/gnupg.nix

@@ -77,7 +77,7 @@ in
         Which pinentry package to use. The path to the mainProgram as defined in
         the package's meta attributes will be set in /etc/gnupg/gpg-agent.conf.
         If not set by the user, it'll pick an appropriate flavor depending on the
-        system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce,
+        system configuration (qt flavor for lxqt and plasma, gtk2 for xfce,
         gnome3 on all other systems with X enabled, curses otherwise).
       '';
     };

nixos/modules/programs/kdeconnect.nix

@@ -15,7 +15,7 @@
       `gnomeExtensions.gsconnect` as an alternative
       implementation if you use Gnome
     '';
-    package = lib.mkPackageOption pkgs [ "plasma5Packages" "kdeconnect-kde" ] {
+    package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] {
       example = "gnomeExtensions.gsconnect";
     };
   };

nixos/modules/programs/zoom-us.nix

@@ -23,10 +23,6 @@
         plasma6XdgDesktopPortalSupport =
           prev.plasma6XdgDesktopPortalSupport or config.services.desktopManager.plasma6.enable;
 
-        # Support Plasma 5 desktop environment if it's enabled on the system.
-        plasma5XdgDesktopPortalSupport =
-          prev.plasma5XdgDesktopPortalSupport or config.services.xserver.desktopManager.plasma5.enable;
-
         # Support LXQT desktop environment if it's enabled on the system.
         # There's also `config.services.xserver.desktopManager.lxqt.enable`
         lxqtXdgDesktopPortalSupport = prev.lxqtXdgDesktopPortalSupport or config.xdg.portal.lxqt.enable;

nixos/modules/security/pam.nix

@@ -549,8 +549,8 @@ let
             '';
           };
 
-          package = lib.mkPackageOption pkgs.plasma5Packages "kwallet-pam" {
+          package = lib.mkPackageOption pkgs.kdePackages "kwallet-pam" {
-            pkgsText = "pkgs.plasma5Packages";
+            pkgsText = "pkgs.kdePackages";
           };
 
           forceRun = lib.mkEnableOption null // {

nixos/modules/services/desktop-managers/plasma6.nix

@@ -68,13 +68,6 @@ in
   ];
 
   config = mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = cfg.enable -> !config.services.xserver.desktopManager.plasma5.enable;
-        message = "Cannot enable plasma5 and plasma6 at the same time!";
-      }
-    ];
-
     qt.enable = true;
     programs.xwayland.enable = true;
     environment.systemPackages =

nixos/modules/services/display-managers/sddm.nix

@@ -228,7 +228,7 @@ in
         '';
       };
 
-      package = mkPackageOption pkgs [ "plasma5Packages" "sddm" ] { };
+      package = mkPackageOption pkgs [ "libsForQt5" "sddm" ] { };
 
       enableHidpi = mkOption {
         type = types.bool;

nixos/modules/system/boot/plymouth.nix

@@ -17,13 +17,6 @@ let
   cfg = config.boot.plymouth;
   opt = options.boot.plymouth;
 
-  nixosBreezePlymouth = pkgs.plasma5Packages.breeze-plymouth.override {
-    logoFile = cfg.logo;
-    logoName = "nixos";
-    osName = "NixOS";
-    osVersion = config.system.nixos.release;
-  };
-
   plymouthLogos = pkgs.runCommand "plymouth-logos" { inherit (cfg) logo; } ''
     mkdir -p $out
 
@@ -87,12 +80,7 @@ in
       };
 
       themePackages = mkOption {
-        default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;
+        default = [ ];
-        defaultText = literalMD ''
-          A NixOS branded variant of the breeze theme when
-          `config.${opt.theme} == "breeze"`, otherwise
-          `[ ]`.
-        '';
         type = types.listOf types.package;
         description = ''
           Extra theme packages for plymouth.

nixos/release-combined.nix

@@ -171,7 +171,7 @@ rec {
         (onFullSupported "nixos.tests.php.fpm")
         (onFullSupported "nixos.tests.php.httpd")
         (onFullSupported "nixos.tests.php.pcre")
-        (onFullSupported "nixos.tests.plasma5")
+        (onFullSupported "nixos.tests.plasma6")
         (onSystems [ "x86_64-linux" ] "nixos.tests.podman")
         (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd")
         (onFullSupported "nixos.tests.predictable-interface-names.predictable")

nixos/release.nix

@@ -594,7 +594,7 @@ rec {
       {
         services.xserver.enable = true;
         services.displayManager.sddm.enable = true;
-        services.xserver.desktopManager.plasma5.enable = true;
+        services.desktopManager.plasma6.enable = true;
       }
     );
 

nixos/tests/maestral.nix

@@ -31,11 +31,8 @@
       gui =
         { ... }:
         common {
-          services.xserver = {
+          services.xserver.enable = true;
-            enable = true;
+          services.desktopManager.plasma6.enable = true;
-            desktopManager.plasma5.enable = true;
-            desktopManager.plasma5.runUsingSystemd = true;
-          };
 
           services.displayManager = {
             sddm.enable = true;

nixos/tests/terminal-emulators.nix

@@ -63,7 +63,7 @@ let
     kitty.pkg = p: p.kitty;
     kitty.cmd = "kitty $command";
 
-    konsole.pkg = p: p.plasma5Packages.konsole;
+    konsole.pkg = p: p.kdePackages.konsole;
 
     lxterminal.pkg = p: p.lxterminal;