Skip to content

Commit fc035da

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 678695f commit fc035da

File tree

10 files changed

+27
-10
lines changed

10 files changed

+27
-10
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,13 @@ inherit (pkgs.nixos {
521521
all user units for each authenticated user.
522522
</para>
523523
</listitem>
524+
<listitem>
525+
<para>
526+
The default display manager is now LightDM.
527+
To use SLiM set <literal>services.xserver.displayManager.slim.enable</literal>
528+
to <literal>true</literal>.
529+
</para>
530+
</listitem>
524531
</itemizedlist>
525532
</section>
526533
</section>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ in {
132132

133133
fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ];
134134

135+
services.xserver.displayManager.gdm.enable = mkDefault true;
135136
services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ];
136137

137138
services.xserver.displayManager.sessionCommands = ''
@@ -161,6 +162,8 @@ in {
161162
# TODO: Create nautilus-with-extensions package
162163
environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
163164

165+
services.xserver.updateDbusEnvironment = true;
166+
164167
environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
165168
"${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
166169
"${pkgs.gnome3.gvfs}/lib/gio/modules" ];

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ in
8787
}
8888
];
8989

90-
services.xserver.displayManager.slim.enable = false;
90+
services.xserver.displayManager.lightdm.enable = false;
9191

9292
users.users.gdm =
9393
{ name = "gdm";

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ in
191191
}
192192
];
193193

194-
services.xserver.displayManager.slim.enable = false;
195-
196194
services.xserver.displayManager.job = {
197195
logToFile = true;
198196

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ in
206206
}
207207
];
208208

209-
services.xserver.displayManager.slim.enable = false;
210-
211209
services.xserver.displayManager.job = {
212210
logToFile = true;
213211

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
@@ -535,6 +535,15 @@ in
535535

536536
config = mkIf cfg.enable {
537537

538+
services.xserver.displayManager.lightdm.enable =
539+
let dmconf = cfg.displayManager;
540+
default = !( dmconf.auto.enable
541+
|| dmconf.gdm.enable
542+
|| dmconf.sddm.enable
543+
|| dmconf.slim.enable
544+
|| dmconf.xpra.enable );
545+
in mkIf (default) true;
546+
538547
hardware.opengl.enable = mkDefault true;
539548

540549
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 = {

nixos/tests/gnome3.nix

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

1212
services.xserver.enable = true;
1313

14+
services.xserver.displayManager.gdm.enable = false;
1415
services.xserver.displayManager.lightdm.enable = true;
1516
services.xserver.displayManager.lightdm.autoLogin.enable = true;
1617
services.xserver.displayManager.lightdm.autoLogin.user = "alice";

0 commit comments

Comments
 (0)