foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-12 06:19:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

programs/gnome-session: add display session option

Browse Source 
Although gnome-session is on its way to fully drop X11 support, we'll have
that option for now at least until the next NixOS release.
This commit is contained in:
Gabriel Arazas 2024-01-04 17:33:31 +08:00
parent 51d123f667
commit 645edd1428
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/nixos/programs/gnome-session/default.nix
View File

@ -332,6 +332,15 @@ let
example = "Mosey Branch"; example = "Mosey Branch";
}; };
display = lib.mkOption {
type = lib.types.enum [ "wayland" "xorg" ];
description = ''
The display server protocol of the desktop environment.
'';
default = "wayland";
example = "xorg";
};
description = lib.mkOption { description = lib.mkOption {
type = lib.types.nonEmptyStr; type = lib.types.nonEmptyStr;
description = '' description = ''
@ -492,7 +501,7 @@ let
RequiredComponents=${lib.concatStringsSep ";" requiredComponents}; RequiredComponents=${lib.concatStringsSep ";" requiredComponents};
''; '';
waylandSession = '' displaySession = ''
[Desktop Entry] [Desktop Entry]
Name=${config.fullName} Name=${config.fullName}
Comment=${config.description} Comment=${config.description}
@ -532,14 +541,18 @@ let
in in
pkgs.runCommandLocal "${name}-desktop-session-files" pkgs.runCommandLocal "${name}-desktop-session-files"
{ {
inherit waylandSession gnomeSession sessionScript; inherit displaySession gnomeSession sessionScript;
passAsFile = [ "waylandSession" "gnomeSession" "sessionScript" ]; passAsFile = [ "displaySession" "gnomeSession" "sessionScript" ];
passthru.providedSessions = [ name ]; passthru.providedSessions = [ name ];
} }
'' ''
SESSION_SCRIPT="$out/libexec/${name}-session" SESSION_SCRIPT="$out/libexec/${name}-session"
GNOME_SESSION_FILE="$out/share/gnome-session/sessions/${name}.session" GNOME_SESSION_FILE="$out/share/gnome-session/sessions/${name}.session"
WAYLAND_SESSION_FILE="$out/share/wayland-sessions/${name}.desktop" ${if config.display == "xorg" then ''
DISPLAY_SESSION_FILE="$out/share/xsessions/${name}.desktop"
'' else ''
DISPLAY_SESSION_FILE="$out/share/wayland-sessions/${name}.desktop"
''}
install -Dm0755 "$sessionScriptPath" "$SESSION_SCRIPT" install -Dm0755 "$sessionScriptPath" "$SESSION_SCRIPT"
substituteAllInPlace "$SESSION_SCRIPT" substituteAllInPlace "$SESSION_SCRIPT"
@ -547,8 +560,8 @@ let
install -Dm0644 "$gnomeSessionPath" "$GNOME_SESSION_FILE" install -Dm0644 "$gnomeSessionPath" "$GNOME_SESSION_FILE"
substituteAllInPlace "$GNOME_SESSION_FILE" substituteAllInPlace "$GNOME_SESSION_FILE"
install -Dm0644 "$waylandSessionPath" "$WAYLAND_SESSION_FILE" install -Dm0644 "$displaySessionPath" "$DISPLAY_SESSION_FILE"
substituteAllInPlace "$WAYLAND_SESSION_FILE" substituteAllInPlace "$DISPLAY_SESSION_FILE"
${lib.concatStringsSep "\n" installSystemdUserUnits} ${lib.concatStringsSep "\n" installSystemdUserUnits}
mkdir -p "$out/lib/systemd" && ln -sfn "$out/share/systemd/user" "$out/lib/systemd/user" mkdir -p "$out/lib/systemd" && ln -sfn "$out/share/systemd/user" "$out/lib/systemd/user"