Skip to content

Commit c5c0ea3

Browse files
committed
xserver.displayManager: change default
Switch from slim to lightdm as the display-manager. If plasma5 is used as desktop-manager use sdddm. If gnome3 is used as desktop-manager use gdm. Based on #12516
1 parent 0d6822b commit c5c0ea3

File tree

10 files changed

+25
-12
lines changed

10 files changed

+25
-12
lines changed

nixos/doc/manual/release-notes/rl-1803.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@ following incompatible changes:</para>
7474

7575
<title>Other Notable Changes</title>
7676

77-
<itemizedlist>
77+
<itemizedlist>
78+
<listitem>
79+
<para>The default display manager is now LightDM.
80+
To use SLiM set <literal>services.xserver.displayManager.slim.enable</literal>
81+
to <literal>true</literal>.
82+
</listitem>
83+
7884
<listitem>
7985
<para>
8086
ZNC option <option>services.znc.mutable</option> now defaults to <literal>true</literal>.

nixos/modules/services/x11/desktop-managers/gnome3.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ in {
166166
'';
167167
};
168168

169+
services.xserver.displayManager.gdm.enable = mkDefault true;
170+
169171
services.xserver.updateDbusEnvironment = true;
170172

171173
environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"

nixos/modules/services/x11/desktop-managers/plasma5.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ in
190190
];
191191

192192
services.xserver.displayManager.sddm = {
193+
enable = mkDefault true;
193194
theme = mkDefault "breeze";
194195
};
195196

nixos/modules/services/x11/display-managers/auto.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ in
4141

4242
config = mkIf cfg.enable {
4343

44-
services.xserver.displayManager.slim = {
44+
services.xserver.displayManager.lightdm = {
4545
enable = true;
46-
autoLogin = true;
47-
defaultUser = cfg.user;
46+
autoLogin = {
47+
enable = true;
48+
user = cfg.user;
49+
};
4850
};
4951

5052
};

nixos/modules/services/x11/display-managers/gdm.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ in
8787
}
8888
];
8989

90-
services.xserver.displayManager.slim.enable = false;
91-
9290
users.extraUsers.gdm =
9391
{ name = "gdm";
9492
uid = config.ids.uids.gdm;

nixos/modules/services/x11/display-managers/lightdm.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,6 @@ in
187187
}
188188
];
189189

190-
services.xserver.displayManager.slim.enable = false;
191-
192190
services.xserver.displayManager.job = {
193191
logsXsession = true;
194192

nixos/modules/services/x11/display-managers/sddm.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,6 @@ in
202202
}
203203
];
204204

205-
services.xserver.displayManager.slim.enable = false;
206-
207205
services.xserver.displayManager.job = {
208206
logsXsession = true;
209207

nixos/modules/services/x11/display-managers/slim.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ in
4949

5050
enable = mkOption {
5151
type = types.bool;
52-
default = config.services.xserver.enable;
52+
default = false;
5353
description = ''
5454
Whether to enable SLiM as the display manager.
5555
'';

nixos/modules/services/x11/xserver.nix

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,15 @@ in
525525

526526
config = mkIf cfg.enable {
527527

528+
services.xserver.displayManager.lightdm.enable =
529+
let dmconf = cfg.displayManager;
530+
default = !( dmconf.auto.enable
531+
|| dmconf.gdm.enable
532+
|| dmconf.sddm.enable
533+
|| dmconf.slim.enable
534+
|| dmconf.xpra.enable );
535+
in mkIf (default) true;
536+
528537
hardware.opengl.enable = mkDefault true;
529538

530539
services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];

nixos/tests/gnome3-gdm.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import ./make-test.nix ({ pkgs, ...} : {
1111

1212
services.xserver.enable = true;
1313

14-
services.xserver.displayManager.slim.enable = false;
1514
services.xserver.displayManager.gdm = {
1615
enable = true;
1716
autoLogin = {

0 commit comments

Comments
 (0)