Skip to content

display-managers: make lightdm the default #30890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2018
Merged

display-managers: make lightdm the default #30890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions nixos/doc/manual/release-notes/rl-1809.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,13 @@ inherit (pkgs.nixos {
all user units for each authenticated user.
</para>
</listitem>
<listitem>
<para>
The default display manager is now LightDM.
To use SLiM set <literal>services.xserver.displayManager.slim.enable</literal>
to <literal>true</literal>.
</para>
</listitem>
</itemizedlist>
</section>
</section>
3 changes: 3 additions & 0 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ in {

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

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

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

services.xserver.updateDbusEnvironment = true;

environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
"${pkgs.gnome3.glib-networking.out}/lib/gio/modules"
"${pkgs.gnome3.gvfs}/lib/gio/modules" ];
Expand Down
8 changes: 5 additions & 3 deletions nixos/modules/services/x11/display-managers/auto.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,12 @@ in

config = mkIf cfg.enable {

services.xserver.displayManager.slim = {
services.xserver.displayManager.lightdm = {
enable = true;
autoLogin = true;
defaultUser = cfg.user;
autoLogin = {
enable = true;
user = cfg.user;
};
};

};
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/display-managers/gdm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ in
}
];

services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.lightdm.enable = false;

users.users.gdm =
{ name = "gdm";
Expand Down
2 changes: 0 additions & 2 deletions nixos/modules/services/x11/display-managers/lightdm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,6 @@ in
}
];

services.xserver.displayManager.slim.enable = false;

services.xserver.displayManager.job = {
logToFile = true;

Expand Down
2 changes: 0 additions & 2 deletions nixos/modules/services/x11/display-managers/sddm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ in
}
];

services.xserver.displayManager.slim.enable = false;

services.xserver.displayManager.job = {
logToFile = true;

Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/display-managers/slim.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ in

enable = mkOption {
type = types.bool;
default = config.services.xserver.enable;
default = false;
description = ''
Whether to enable SLiM as the display manager.
'';
Expand Down
9 changes: 9 additions & 0 deletions nixos/modules/services/x11/xserver.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,15 @@ in

config = mkIf cfg.enable {

services.xserver.displayManager.lightdm.enable =
let dmconf = cfg.displayManager;
default = !( dmconf.auto.enable
|| dmconf.gdm.enable
|| dmconf.sddm.enable
|| dmconf.slim.enable
|| dmconf.xpra.enable );
in mkIf (default) true;

hardware.opengl.enable = mkDefault true;

services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
Expand Down
1 change: 0 additions & 1 deletion nixos/tests/gnome3-gdm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import ./make-test.nix ({ pkgs, ...} : {

services.xserver.enable = true;

services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.gdm = {
enable = true;
autoLogin = {
Expand Down
1 change: 1 addition & 0 deletions nixos/tests/gnome3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {

services.xserver.enable = true;

services.xserver.displayManager.gdm.enable = false;
services.xserver.displayManager.lightdm.enable = true;
services.xserver.displayManager.lightdm.autoLogin.enable = true;
services.xserver.displayManager.lightdm.autoLogin.user = "alice";
Expand Down