diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-07-24 16:52:49 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-01 19:14:32 +0200 |
| commit | 9fad9fb8698fd13f52004b73788ba462906b6c85 (patch) | |
| tree | 75d35e6459cb3580b3bef874b82eb598499a189e /nixos/modules/services/x11/display-managers/slim.nix | |
| parent | adbe4e1c68e6e8c8a37326cb41f8a03c1c7697e1 (diff) | |
| download | nixpkgs-9fad9fb8698fd13f52004b73788ba462906b6c85.tar nixpkgs-9fad9fb8698fd13f52004b73788ba462906b6c85.tar.gz nixpkgs-9fad9fb8698fd13f52004b73788ba462906b6c85.tar.bz2 nixpkgs-9fad9fb8698fd13f52004b73788ba462906b6c85.tar.lz nixpkgs-9fad9fb8698fd13f52004b73788ba462906b6c85.tar.xz nixpkgs-9fad9fb8698fd13f52004b73788ba462906b6c85.tar.zst nixpkgs-9fad9fb8698fd13f52004b73788ba462906b6c85.zip | |
nixos/displayManager: Create a common environment wrapper for all dms
This makes it easier to support a wider variety of .desktop session files. In particular this makes it possible to use both the «legacy» sessions and upstream session files. We separate `xsession` into two parts, `xsessionWrapper` and `xsession`. `xsessionWrapper` sets up the correct environment and then lauches the session's Exec command (from the .desktop file), falling back to launching the default window/desktopManager through the `xsession` script (required by at least some nixos tests). `xsession` then _only_ handles launching desktop-managers/window-managers defined through `services.xserver.desktopManager.session`.
Diffstat (limited to 'nixos/modules/services/x11/display-managers/slim.nix')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/slim.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 395b5165fe4..51ce5f4e243 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -14,7 +14,7 @@ let default_xserver ${dmcfg.xserverBin} xserver_arguments ${toString dmcfg.xserverArgs} sessiondir ${dmcfg.session.desktops}/share/xsessions - login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.script} "%session" + login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.wrapper} "%session" halt_cmd ${config.systemd.package}/sbin/shutdown -h now reboot_cmd ${config.systemd.package}/sbin/shutdown -r now logfile /dev/stderr |