diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-03-29 12:58:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 12:58:08 -0400 |
| commit | bedf13071b82873a5481d8bdadd1308ad9872e62 (patch) | |
| tree | 8f552e8671f31e85acd92a73bffcc7b80ef31743 /nixos/modules/services | |
| parent | 22ada10aed0c15dcf406e08ea821ea5094817ed5 (diff) | |
| parent | e9d707cf8e74539af1bd24e554addc96517315c5 (diff) | |
Merge pull request #83637 from romildo/desktopManager.desktopNames
nixos.display-manager: set DesktopNames from a new attribute
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xfce.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index a08b1947f65b..4ff7b05ae9a6 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -129,6 +129,7 @@ in services.xserver.desktopManager.session = [{ name = "xfce"; + desktopNames = [ "XFCE" ]; bgSupport = true; start = '' ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} & diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 5d49ca943872..428ca191fd8f 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -412,6 +412,9 @@ in (dm: wm: let sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}"; script = xsession dm wm; + desktopNames = if dm ? desktopNames + then concatStringsSep ";" dm.desktopNames + else sessionName; in optional (dm.name != "none" || wm.name != "none") (pkgs.writeTextFile { @@ -427,7 +430,7 @@ in TryExec=${script} Exec=${script} Name=${sessionName} - DesktopNames=${sessionName} + DesktopNames=${desktopNames} ''; } // { providedSessions = [ sessionName ]; |