mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-02-07 12:19:07 +00:00
nixos/programs/gnome-session: remove script wrapper
This commit is contained in:
parent
7419810c2b
commit
8134ff798f
@ -337,24 +337,10 @@ rec {
|
|||||||
unitConfig.CollectMode = lib.mkForce "inactive-or-failed";
|
unitConfig.CollectMode = lib.mkForce "inactive-or-failed";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Luckily, this script can be flexible both for built-in and
|
|
||||||
# systemd-managed sessions by checking `DESKTOP_AUTOSTART_ID` envvar
|
|
||||||
# that is initialized with the built-in-managed session.
|
|
||||||
scriptPackage = pkgs.writeShellApplication {
|
scriptPackage = pkgs.writeShellApplication {
|
||||||
name = scriptName;
|
name = scriptName;
|
||||||
runtimeInputs = [ cfg.package pkgs.dbus ];
|
runtimeInputs = [ cfg.package pkgs.dbus ];
|
||||||
text = ''
|
text = config.script;
|
||||||
DESKTOP_AUTOSTART_ID="''${DESKTOP_AUTOSTART_ID:-}"
|
|
||||||
echo "$DESKTOP_AUTOSTART_ID"
|
|
||||||
test -n "$DESKTOP_AUTOSTART_ID" && {
|
|
||||||
dbus-send --print-reply --session \
|
|
||||||
--dest=org.gnome.SessionManager "/org/gnome/SessionManager" \
|
|
||||||
org.gnome.SessionManager.RegisterClient \
|
|
||||||
"string:${name}" "string:$DESKTOP_AUTOSTART_ID"
|
|
||||||
}
|
|
||||||
|
|
||||||
${config.script}
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
desktopPackage = pkgs.makeDesktopItem config.desktopConfig;
|
desktopPackage = pkgs.makeDesktopItem config.desktopConfig;
|
||||||
|
Loading…
Reference in New Issue
Block a user