diff --git a/nixos/doc/manual/configuration/modularity.section.md b/nixos/doc/manual/configuration/modularity.section.md index 5ae4f5b56331..ee495bb4bc60 100644 --- a/nixos/doc/manual/configuration/modularity.section.md +++ b/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 ]; } ``` diff --git a/nixos/doc/manual/configuration/profiles/graphical.section.md b/nixos/doc/manual/configuration/profiles/graphical.section.md index 84fad5c0a612..f67763811df1 100644 --- a/nixos/doc/manual/configuration/profiles/graphical.section.md +++ b/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. diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index 4d779b2ffa42..bf0f541e9688 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/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; diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index f8a9249b042a..aec11b2362fc 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/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."; }; }; diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index 82ddc50e423c..d9065d20fe51 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/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 = { diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 9b07c19ff8c0..9659a186f304 100644 --- a/nixos/modules/programs/chromium.nix +++ b/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" ] { }; diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index a6fbd081f44a..b8e88aa64023 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/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). ''; }; diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix index 17bb384a9fea..f51eeb9c6ced 100644 --- a/nixos/modules/programs/kdeconnect.nix +++ b/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"; }; }; diff --git a/nixos/modules/programs/zoom-us.nix b/nixos/modules/programs/zoom-us.nix index b5b6c8acf7b6..9d31c8e3086a 100644 --- a/nixos/modules/programs/zoom-us.nix +++ b/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; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 53e67873d200..198251bf34e3 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -549,8 +549,8 @@ let ''; }; - package = lib.mkPackageOption pkgs.plasma5Packages "kwallet-pam" { - pkgsText = "pkgs.plasma5Packages"; + package = lib.mkPackageOption pkgs.kdePackages "kwallet-pam" { + pkgsText = "pkgs.kdePackages"; }; forceRun = lib.mkEnableOption null // { diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index c553da347d79..12bdb2a6db69 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/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 = diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index 06516fb76b7a..b9df863d12f9 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/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; diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 24861b678769..8636ec7957d2 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/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; - 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. diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 98519bcab4f7..b9b59e4ab37a 100644 --- a/nixos/release-combined.nix +++ b/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") diff --git a/nixos/release.nix b/nixos/release.nix index 3bcacf1e471c..1000bf9c6bc7 100644 --- a/nixos/release.nix +++ b/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; } ); diff --git a/nixos/tests/maestral.nix b/nixos/tests/maestral.nix index 9b42b2d59e28..30491a496b93 100644 --- a/nixos/tests/maestral.nix +++ b/nixos/tests/maestral.nix @@ -31,11 +31,8 @@ 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; diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 6b209b8b3368..dfa5d9150ba5 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/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;