public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/x11: Source .xprofile earlier in xsession-wrapper

Browse Source 
This allows users to set e.g. XCOMPOSECACHE before it's used.
This commit is contained in:
Stefan Frijters 2020-08-09 23:16:37 +02:00
parent 17f2d43f42
commit 37460768e2
No known key found for this signature in database
GPG Key ID: 7619A6BC6E7DFA6F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/x11/display-managers/default.nix
View File

@ -37,6 +37,11 @@ let
. /etc/profile . /etc/profile
cd "$HOME" cd "$HOME"
# Allow the user to execute commands at the beginning of the X session.
if test -f ~/.xprofile; then
source ~/.xprofile
fi
${optionalString cfg.displayManager.job.logToJournal '' ${optionalString cfg.displayManager.job.logToJournal ''
if [ -z "$_DID_SYSTEMD_CAT" ]; then if [ -z "$_DID_SYSTEMD_CAT" ]; then
export _DID_SYSTEMD_CAT=1 export _DID_SYSTEMD_CAT=1
@ -75,11 +80,6 @@ let
${cfg.displayManager.sessionCommands} ${cfg.displayManager.sessionCommands}
# Allow the user to execute commands at the beginning of the X session.
if test -f ~/.xprofile; then
source ~/.xprofile
fi
# Start systemd user services for graphical sessions # Start systemd user services for graphical sessions
/run/current-system/systemd/bin/systemctl --user start graphical-session.target /run/current-system/systemd/bin/systemctl --user start graphical-session.target