nixos/x11: provide selected session to custom session #67260
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Note: this change is most useful with a corresponding change in |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/46 |
matthewbauer
approved these changes
Aug 27, 2019
The custom session script is always executed (when it exists). This change passes the selected session script and select session name to the custom session script, so that it can defer to the selected session script based on the value of the selected session name.
pstch
force-pushed
the
fix/xsession-allow-session-choice
branch
from
d85fd01
to
a23798e
Compare
|
Note: there was a mistake in the commit message ("based on the current value of xterm"), I force-pushed an amended commit. Sorry for the useless bot run, I will be more careful next time. |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/opening-i3-from-home-manager-automatically/4849/4 |
ncfavier
reviewed
Dec 16, 2021
| @@ -109,7 +109,7 @@ let | |||
|
|
|||
| # Allow the user to setup a custom session type. | |||
| if test -x ~/.xsession; then | |||
| exec ~/.xsession | |||
| eval exec ~/.xsession "$@" | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The custom session script is always executed (when it exists). This provides the selected session script to the custom session script so that it can defer to it based on the value of xterm.
Motivation for this change
Currently, if the
.Xsessionfile exists, it is always used, by calling it without arguments. It is normal behaviour, but it means that any session choice made by the user in the display manager will be ignored. By providing the selected session script and session name to the user's custom session script, we allows this script to make its own choice (for example, based on the session name) and either launch the user-configured (for example, in home-manager) session or the user selected session (for example, in LightDM).Things done
Made the
xsessionWrapperscript forward its argument to the.Xsessionscript.I tested this change with other DMs and home-manager.
Notes
I had a quick look at existing custom
.Xsessionscripts to see if any would break when passed arguments, but didn't find anything, since most of these scripts don't expect any arguments (and so they never use them).I've also read existing discussions on this repository about the rationale for
xsessionWrapperalways calling.Xsessionwhatever the user choosed in the DM (which is sound, as it allows more control). It was suggested that the script and session name should be available in the environment, but it doesn't seem to be the case (as it is never exported), and so made this change so that the.Xsessionscript can decide what to do (using the forwarded arguments).If it's better to handle this with the environment, I can submit another PR that uses the environment instead of arguments.
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/) (no binary file change)nix path-info -Sbefore and after)Notify maintainers
cc @edolstra