summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-01-13 11:48:11 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-02-03 14:47:14 +0100
commit4fede53c0996938979d2966a69f108782a8c1c12 (patch)
tree6f15d992897ef0ef0b26636c6cb769e4868d86d5 /nixos/modules/services/x11/display-managers
parente0feace5cde328a8f7478b2cf762991316d4c07c (diff)
downloadnixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar
nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.gz
nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.bz2
nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.lz
nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.xz
nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.zst
nixlib-4fede53c0996938979d2966a69f108782a8c1c12.zip
nixos manuals: bring back package references
This reverts most of 89e983786a, as those references are sanitized now.
Fixes #10039, at least most of it.

The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 3949bf01a316..ac7db3d9adc4 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -87,6 +87,7 @@ in
 
       background = mkOption {
         type = types.str;
+        default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
         description = ''
           The background image or color to use.
         '';
@@ -152,9 +153,6 @@ in
     };
 
     users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
-
-    services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
-
     services.xserver.tty     = null; # We might start multiple X servers so let the tty increment themselves..
     services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
   };