Merge pull request #22642 from grahamc/kde4-deprecate

kde4, kdm: mark services as deprecated
This commit is contained in:
Graham Christensen 2017-02-11 10:17:15 -05:00 committed by GitHub
commit c09004fba0
2 changed files with 7 additions and 1 deletions

@ -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).

@ -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;