Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

xsession: cleanup systemd variables (#3636)

Browse source
This commit is contained in:
arcnmx 2023-05-07 14:59:56 -07:00 committed by GitHub
parent e34fbe1801
commit 78ceec68f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/xsession.nix
View file

@ -78,6 +78,7 @@ in {
importedVariables = mkOption { importedVariables = mkOption {
type = types.listOf (types.strMatching "[a-zA-Z_][a-zA-Z0-9_]*"); type = types.listOf (types.strMatching "[a-zA-Z_][a-zA-Z0-9_]*");
apply = unique;
example = [ "GDK_PIXBUF_ICON_LOADER" ]; example = [ "GDK_PIXBUF_ICON_LOADER" ];
visible = false; visible = false;
description = '' description = ''
@ -184,7 +185,7 @@ in {
${optionalString (cfg.importedVariables != [ ]) ${optionalString (cfg.importedVariables != [ ])
("systemctl --user import-environment " ("systemctl --user import-environment "
+ toString (unique cfg.importedVariables))} + escapeShellArgs cfg.importedVariables)}
${cfg.profileExtra} ${cfg.profileExtra}
@ -212,6 +213,10 @@ in {
while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do
sleep 0.5 sleep 0.5
done done
${optionalString (cfg.importedVariables != [ ])
("systemctl --user unset-environment "
+ escapeShellArgs cfg.importedVariables)}
''; '';
}; };
}; };

2
tests/modules/misc/xsession/basic-xprofile-expected.txt
View file

@ -9,7 +9,7 @@ fi
# script starts up graphical-session.target. # script starts up graphical-session.target.
systemctl --user stop graphical-session.target graphical-session-pre.target systemctl --user stop graphical-session.target graphical-session-pre.target
systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS DISPLAY SSH_AUTH_SOCK XAUTHORITY XDG_DATA_DIRS XDG_RUNTIME_DIR XDG_SESSION_ID EXTRA_IMPORTED_VARIABLE systemctl --user import-environment 'DBUS_SESSION_BUS_ADDRESS' 'DISPLAY' 'SSH_AUTH_SOCK' 'XAUTHORITY' 'XDG_DATA_DIRS' 'XDG_RUNTIME_DIR' 'XDG_SESSION_ID' 'EXTRA_IMPORTED_VARIABLE'
profile extra commands profile extra commands

2
tests/modules/misc/xsession/basic-xsession-expected.txt
View file

@ -16,3 +16,5 @@ systemctl --user stop graphical-session-pre.target
while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do
sleep 0.5 sleep 0.5
done done
systemctl --user unset-environment 'DBUS_SESSION_BUS_ADDRESS' 'DISPLAY' 'SSH_AUTH_SOCK' 'XAUTHORITY' 'XDG_DATA_DIRS' 'XDG_RUNTIME_DIR' 'XDG_SESSION_ID' 'EXTRA_IMPORTED_VARIABLE'