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

programs/gnome-session: support multiple display protocols

Browse Source 
Not every setup exclusively support either Wayland or X11. This should also
make customized GNOME sessions (like a minimal version of GNOME) easier.
This commit is contained in:
Gabriel Arazas 2024-01-06 12:40:17 +08:00
parent 2d7e8147e1
commit 0db8bd090b
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,12 +343,13 @@ let
}; };
display = lib.mkOption { display = lib.mkOption {
type = lib.types.enum [ "wayland" "xorg" ]; type = with lib.types; listOf (enum [ "wayland" "xorg" ]);
description = '' description = ''
The display server protocol of the desktop environment. A list of display server protocols supported by the desktop
environment.
''; '';
default = "wayland"; default = [ "wayland" ];
example = "xorg"; example = [ "wayland" "xorg" ];
}; };
description = lib.mkOption { description = lib.mkOption {
@ -513,7 +514,7 @@ let
displaySession = '' displaySession = ''
[Desktop Entry] [Desktop Entry]
Name=${config.fullName} Name=@fullName@
Comment=${config.description} Comment=${config.description}
Exec=@out@/libexec/${name}-session Exec=@out@/libexec/${name}-session
Type=Application Type=Application
@ -532,6 +533,30 @@ let
${lib.getExe' cfg.package "gnome-session"} ${lib.escapeShellArgs config.extraArgs} ${lib.getExe' cfg.package "gnome-session"} ${lib.escapeShellArgs config.extraArgs}
''; '';
displayScripts =
let
hasMoreDisplays = protocol: lib.optionalString (lib.length config.display > 1) "fullName='${config.fullName} (${protocol})'";
in
{
wayland = ''
(
DISPLAY_SESSION_FILE="$out/share/wayland-sessions/${name}.desktop"
install -Dm0644 "$displaySessionPath" "$DISPLAY_SESSION_FILE"
${hasMoreDisplays "Wayland"} substituteAllInPlace "$DISPLAY_SESSION_FILE"
)
'';
xorg = ''
(
DISPLAY_SESSION_FILE="$out/share/xsessions/${name}.desktop"
install -Dm0644 "$displaySessionPath" "$DISPLAY_SESSION_FILE"
${hasMoreDisplays "X11"} substituteAllInPlace "$DISPLAY_SESSION_FILE"
)
'';
};
installDesktopSessions = builtins.map (display:
displayScripts.${display}) config.display;
installSystemdUserUnits = lib.mapAttrsToList (n: v: installSystemdUserUnits = lib.mapAttrsToList (n: v:
if (v ? overrideStrategy && v.overrideStrategy == "asDropin") then '' if (v ? overrideStrategy && v.overrideStrategy == "asDropin") then ''
( (
@ -551,27 +576,23 @@ let
in in
pkgs.runCommandLocal "${name}-desktop-session-files" pkgs.runCommandLocal "${name}-desktop-session-files"
{ {
env = {
inherit (config) fullName;
};
inherit displaySession gnomeSession sessionScript; inherit displaySession gnomeSession sessionScript;
passAsFile = [ "displaySession" "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"
${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"
GNOME_SESSION_FILE="$out/share/gnome-session/sessions/${name}.session"
install -Dm0644 "$gnomeSessionPath" "$GNOME_SESSION_FILE" install -Dm0644 "$gnomeSessionPath" "$GNOME_SESSION_FILE"
substituteAllInPlace "$GNOME_SESSION_FILE" substituteAllInPlace "$GNOME_SESSION_FILE"
install -Dm0644 "$displaySessionPath" "$DISPLAY_SESSION_FILE" ${lib.concatStringsSep "\n" installDesktopSessions}
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"