diff options
author | Graham Christensen <graham@grahamc.com> | 2017-02-11 10:17:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-11 10:17:15 -0500 |
commit | c09004fba0732abc31130879d142870899977ad0 (patch) | |
tree | 77c8faef3e838a16bd43b69ac74add856d2d745f /nixos/modules/services | |
parent | bbbd3c09701500c0d322f24c840e453a2973bf5f (diff) | |
parent | 564e0c120be9f317a7c43eb246882065b1909c67 (diff) | |
download | nixlib-c09004fba0732abc31130879d142870899977ad0.tar nixlib-c09004fba0732abc31130879d142870899977ad0.tar.gz nixlib-c09004fba0732abc31130879d142870899977ad0.tar.bz2 nixlib-c09004fba0732abc31130879d142870899977ad0.tar.lz nixlib-c09004fba0732abc31130879d142870899977ad0.tar.xz nixlib-c09004fba0732abc31130879d142870899977ad0.tar.zst nixlib-c09004fba0732abc31130879d142870899977ad0.zip |
Merge pull request #22642 from grahamc/kde4-deprecate
kde4, kdm: mark services as deprecated
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde4.nix | 3 | ||||
-rw-r--r-- | nixos/modules/services/x11/display-managers/kdm.nix | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 3aa4821a0521..f0de9120c695 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -87,6 +87,9 @@ in config = mkIf (xcfg.enable && cfg.enable) { + warnings = [ + "KDE4 is long unmaintained and will be removed. Please update to KDE5." + ]; # If KDE 4 is enabled, make it the default desktop manager (unless # overridden by the user's configuration). diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index 04701a1640cc..bfb763f2858d 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -35,7 +35,7 @@ let ${optionalString (cfg.setupScript != "") '' Setup=${cfg.setupScript} - ''} + ''} [X-*-Greeter] HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers} @@ -128,6 +128,9 @@ in ###### implementation config = mkIf cfg.enable { + warnings = [ + "KDM is long unmaintained and will be removed. Please update to SDDM." + ]; services.xserver.displayManager.slim.enable = false; |