nixos/treewide: clean up Plasma 5 references

Preparing to drop.

K900 35d0bafa 0e1071b8

Changed files
+19 -45
nixos
doc
modules
i18n
input-method
profiles
programs
security
services
desktop-managers
display-managers
system
tests
+1 -1
nixos/doc/manual/configuration/modularity.section.md
···
{
services.xserver.enable = true;
services.displayManager.sddm.enable = true;
-
services.xserver.desktopManager.plasma5.enable = true;
+
services.desktopManager.plasma6.enable = true;
environment.systemPackages = [ pkgs.vim ];
}
```
+2 -2
nixos/doc/manual/configuration/profiles/graphical.section.md
···
# 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.
+1 -1
nixos/doc/manual/configuration/x-windows.chapter.md
···
```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;
+1 -1
nixos/modules/i18n/input-method/ibus.nix
···
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.";
};
};
+2 -2
nixos/modules/profiles/graphical.nix
···
-
# 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, ... }:
···
{
services.xserver = {
enable = true;
-
desktopManager.plasma5.enable = true;
+
desktopManager.plasma6.enable = true;
};
services = {
+1 -1
nixos/modules/programs/chromium.nix
···
enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration";
plasmaBrowserIntegrationPackage = lib.mkPackageOption pkgs [
-
"plasma5Packages"
+
"kdePackages"
"plasma-browser-integration"
] { };
+1 -1
nixos/modules/programs/gnupg.nix
···
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).
'';
};
+1 -1
nixos/modules/programs/kdeconnect.nix
···
`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";
};
};
-4
nixos/modules/programs/zoom-us.nix
···
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;
+2 -2
nixos/modules/security/pam.nix
···
'';
};
-
package = lib.mkPackageOption pkgs.plasma5Packages "kwallet-pam" {
-
pkgsText = "pkgs.plasma5Packages";
+
package = lib.mkPackageOption pkgs.kdePackages "kwallet-pam" {
+
pkgsText = "pkgs.kdePackages";
};
forceRun = lib.mkEnableOption null // {
-7
nixos/modules/services/desktop-managers/plasma6.nix
···
];
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 =
+1 -1
nixos/modules/services/display-managers/sddm.nix
···
'';
};
-
package = mkPackageOption pkgs [ "plasma5Packages" "sddm" ] { };
+
package = mkPackageOption pkgs [ "libsForQt5" "sddm" ] { };
enableHidpi = mkOption {
type = types.bool;
+1 -13
nixos/modules/system/boot/plymouth.nix
···
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
···
};
themePackages = mkOption {
-
default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;
-
defaultText = literalMD ''
-
A NixOS branded variant of the breeze theme when
-
`config.${opt.theme} == "breeze"`, otherwise
-
`[ ]`.
-
'';
+
default = [ ];
type = types.listOf types.package;
description = ''
Extra theme packages for plymouth.
+1 -1
nixos/release-combined.nix
···
(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")
+1 -1
nixos/release.nix
···
{
services.xserver.enable = true;
services.displayManager.sddm.enable = true;
-
services.xserver.desktopManager.plasma5.enable = true;
+
services.desktopManager.plasma6.enable = true;
}
);
+2 -5
nixos/tests/maestral.nix
···
gui =
{ ... }:
common {
-
services.xserver = {
-
enable = true;
-
desktopManager.plasma5.enable = true;
-
desktopManager.plasma5.runUsingSystemd = true;
-
};
+
services.xserver.enable = true;
+
services.desktopManager.plasma6.enable = true;
services.displayManager = {
sddm.enable = true;
+1 -1
nixos/tests/terminal-emulators.nix
···
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;