movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 19:55:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/xfce: Use upstream name for X11 session

Browse source 
This allows keeping the name consistent with the wayland
session we are introducing later.
This commit is contained in:
Bobby Rong 2024-10-19 09:59:02 +08:00
parent 270c3f1058
commit 3c20ab171f
No known key found for this signature in database
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/xfce.nix
View file

@ -144,6 +144,7 @@ in
services.xserver.desktopManager.session = [{ services.xserver.desktopManager.session = [{
name = "xfce"; name = "xfce";
prettyName = "Xfce Session";
desktopNames = [ "XFCE" ]; desktopNames = [ "XFCE" ];
bgSupport = !cfg.noDesktop; bgSupport = !cfg.noDesktop;
start = '' start = ''

7
nixos/modules/services/x11/display-managers/default.nix
View file

@ -279,6 +279,11 @@ in
lib.mapCartesianProduct lib.mapCartesianProduct
({dm, wm}: let ({dm, wm}: let
sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}"; sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
prettyName =
if dm.name != "none" then
"${dm.prettyName or dm.name}${optionalString (wm.name != "none") (" (" + (wm.prettyName or wm.name) + ")")}"
else
(wm.prettyName or wm.name);
script = xsession dm wm; script = xsession dm wm;
desktopNames = if dm ? desktopNames desktopNames = if dm ? desktopNames
then lib.concatStringsSep ";" dm.desktopNames then lib.concatStringsSep ";" dm.desktopNames
@ -297,7 +302,7 @@ in
Type=XSession Type=XSession
TryExec=${script} TryExec=${script}
Exec=${script} Exec=${script}
Name=${sessionName} Name=${prettyName}
DesktopNames=${desktopNames} DesktopNames=${desktopNames}
''; '';
} // { } // {