Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
7c491d6
ci: drop codeowners/labeler config for Plasma 5
K900 Aug 2, 2025
68a3a07
aliases.nix: convert Plasma 5 aliases to hard throws
K900 Aug 12, 2025
d4fbd4b
aliases.nix: drop the rest of Maui
K900 Aug 12, 2025
801d522
aliases.nix: drop tokodon
K900 Aug 12, 2025
0e1071b
all-packages.nix: drop Cantor alias
K900 Aug 12, 2025
35d0baf
nixos/treewide: clean up Plasma 5 references
K900 Aug 2, 2025
15a586f
nixos: remove Plasma 5
K900 Aug 12, 2025
314fe5f
nixos: remove Deepin
K900 Aug 12, 2025
66dc5c8
kgeotag: switch to Qt6
K900 Aug 12, 2025
bf4dc80
kio-extras-kf5: disable libkexiv2
K900 Aug 12, 2025
77e544e
kmymoney, alkimia: switch to Qt6
K900 Aug 12, 2025
4c82b08
krita: disable libkdcraw
K900 Aug 12, 2025
bfc8e3c
labplot: disable Cantor
K900 Aug 12, 2025
aef268e
libsForQt5.purpose: remove kaccounts-integration dependency
K900 Aug 12, 2025
5b6c0c0
nordic: use Qt6 packages for SDDM theme
K900 Aug 12, 2025
80bbc0f
sddm: allow building without layer-shell-qt
K900 Aug 12, 2025
8d9a708
tellico: switch to Qt6
K900 Aug 12, 2025
5dc2dbd
ludusavi: use Qt6 kdialog
K900 Aug 12, 2025
6dd718b
plasticity: remove unused dependency
K900 Aug 12, 2025
c1d8487
poptracker: use Qt6 kdialog
K900 Aug 12, 2025
5e3ed25
stereotool: use Qt6 kdialog
K900 Aug 12, 2025
c32c678
wemeet: remove unused dependency
K900 Aug 12, 2025
23850b9
zoom-us: remove Plasma 5 code paths
K900 Aug 12, 2025
9798713
applet-window-appmenu: drop
K900 Aug 12, 2025
f1bdbd2
breath-theme: drop
K900 Aug 12, 2025
659ab6b
colloid-kde: drop
K900 Aug 12, 2025
20b8635
graphite-kde-theme: drop
K900 Aug 12, 2025
12f2b21
kde2-decoration: drop
K900 Aug 12, 2025
2a2fd79
kexi: drop
K900 Aug 12, 2025
70628c4
kreport: drop
K900 Aug 12, 2025
926cc0b
latte-dock: drop
K900 Aug 12, 2025
ac817e2
layan-kde: drop
K900 Aug 12, 2025
f164d09
lightly-boehs: drop
K900 Aug 12, 2025
d9cdfc5
lightly-qt: drop
K900 Aug 12, 2025
94c0b93
littlenavmap: drop
K900 Aug 12, 2025
9344fa4
material-kwin-decoration: drop
K900 Aug 12, 2025
92641e2
peruse: drop
K900 Aug 12, 2025
980598e
plasma-applet-volumewin7mixer: drop
K900 Aug 12, 2025
1bcecd9
plasma-pass: drop
K900 Aug 12, 2025
97bcfc3
plasma-theme-switcher: drop
K900 Aug 12, 2025
051cea0
qcachegrind: drop
K900 Aug 12, 2025
9b30732
qt-video-wlr: drop
K900 Aug 12, 2025
cc6479b
sierra-breeze-enhanced: drop Qt5 build
K900 Aug 12, 2025
c469aa1
soundkonverter: drop
K900 Aug 12, 2025
5e1e648
trojita: drop
K900 Aug 12, 2025
55f6142
virt-manager-qt: drop
K900 Aug 12, 2025
97b63ce
wacomtablet: drop
K900 Aug 12, 2025
270bd9c
libsForQt5.xwaylandvideobridge: drop
K900 Aug 12, 2025
04da94c
zombietrackergps: drop
K900 Aug 12, 2025
ecc7580
aliases.nix: prepare for KDE 5 drops
K900 Aug 21, 2025
bb4ebb7
mauiPackages: drop
K900 Aug 12, 2025
dd94d15
applet-window-buttons: drop
K900 Aug 12, 2025
96e751a
linuxPackages.deepin-anything-module: drop
K900 Aug 12, 2025
2530323
deepin: drop
K900 Aug 12, 2025
efce08a
plasmaMobileGear: drop
K900 Aug 12, 2025
ee897e6
plasma5: drop
K900 Aug 12, 2025
9d94c56
kdeGear: drop
K900 Aug 12, 2025
e103989
aliases.nix: be smarter about throw messages
K900 Aug 21, 2025
9913dd1
nixos/doc/rl-2511: relnote Plasma/Gear 5 removal
K900 Aug 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 3 additions & 6 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -431,12 +431,9 @@
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/qt.section.md
- nixos/modules/services/x11/desktop-managers/plasma5.nix
- nixos/tests/plasma5.nix
- pkgs/applications/kde/**/*
- pkgs/desktops/plasma-5/**/*
- pkgs/development/libraries/kde-frameworks/**/*
- pkgs/development/libraries/qt-5/**/*
- nixos/modules/services/desktop-managers/plasma6.nix
- nixos/tests/plasma6.nix
- pkgs/kde/**/*

"6.topic: R":
- any:
Expand Down
4 changes: 1 addition & 3 deletions ci/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel

# KDE / Plasma 5
/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel
/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel
# KDE Frameworks 5
/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel

# KDE / Plasma 6
Expand Down
2 changes: 1 addition & 1 deletion nixos/doc/manual/configuration/modularity.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
}
```
Expand Down
4 changes: 2 additions & 2 deletions nixos/doc/manual/configuration/profiles/graphical.section.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion nixos/doc/manual/configuration/x-windows.chapter.md
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2511.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

- The NetworkManager module does not ship with a default set of VPN plugins anymore. All required VPN plugins must now be explicitly configured in [`networking.networkmanager.plugins`](#opt-networking.networkmanager.plugins).

- The Qt 5-based versions of KDE Gear, Plasma, Maui and Deepin have been removed. Users are advised to migrate to Plasma 6 and Gear 25.08, available under `kdePackages`.

## New Modules {#sec-release-25.11-new-modules}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/i18n/input-method/ibus.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
};
};
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,6 @@
./services/desktops/blueman.nix
./services/desktops/bonsaid.nix
./services/desktops/cpupower-gui.nix
./services/desktops/deepin/app-services.nix
./services/desktops/deepin/dde-api.nix
./services/desktops/deepin/dde-daemon.nix
./services/desktops/deepin/deepin-anything.nix
./services/desktops/dleyna.nix
./services/desktops/espanso.nix
./services/desktops/flatpak.nix
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/profiles/graphical.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# 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 = {
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/programs/chromium.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ in
enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration";

plasmaBrowserIntegrationPackage = lib.mkPackageOption pkgs [
"plasma5Packages"
"kdePackages"
"plasma-browser-integration"
] { };

Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/programs/gnupg.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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).
'';
};
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/programs/kdeconnect.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};
Expand Down
4 changes: 0 additions & 4 deletions nixos/modules/programs/zoom-us.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 16 additions & 0 deletions nixos/modules/rename.nix
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ in
"services"
"dd-agent"
] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
(mkRemovedOptionModule [
"services"
"deepin"
] "the Deepin desktop environment has been removed from nixpkgs due to lack of maintenance.")
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
(mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] ''
The dnscrypt-wrapper module was removed since the project has been effectively unmaintained since 2018;
Expand Down Expand Up @@ -265,6 +269,18 @@ in
LightDM. Please use the services.displayManager.autoLogin options
instead, or any other display manager in NixOS as they all support auto-login.
'')
(mkRemovedOptionModule [
"services"
"xserver"
"desktopManager"
"plasma5"
] "the Plasma 5 desktop environment has been removed from nixpkgs, as it has reached EOL upstream.")
(mkRemovedOptionModule [
"services"
"xserver"
"desktopManager"
"deepin"
] "the Deepin desktop environment has been removed from nixpkgs due to lack of maintenance.")
(mkRemovedOptionModule [ "services" "xserver" "multitouch" ] ''
services.xserver.multitouch (which uses xf86_input_mtrack) has been removed
as the underlying package isn't being maintained. Working alternatives are
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/security/pam.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 // {
Expand Down
7 changes: 0 additions & 7 deletions nixos/modules/services/desktop-managers/plasma6.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
46 changes: 0 additions & 46 deletions nixos/modules/services/desktops/deepin/app-services.nix

This file was deleted.

Loading
Loading