light-locker (lockscreen for lightdm)#11338
Merged
ocharles merged 2 commits intoNixOS:masterfrom Dec 16, 2015
Merged
Conversation
|
By analyzing the blame information on this pull request, we identified @edolstra, @ocharles and @wkennington to be potential reviewers |
Contributor
Author
|
the-cavalry/light-locker#66 (comment) explains a bit how light-locker works and why it's essential that we're able to run multiple X servers simultaneously. |
Contributor
Author
|
Tip for those who want system-wide default to displayManager = {
lightdm.enable = true;
sessionCommands = ''
${pkgs.xorg.xrdb}/bin/xrdb -merge <(echo xscreensaver\*newLoginCommand: ${pkgs.lightdm}/bin/dm-tool switch-to-greeter)
${pkgs.xscreensaver}/bin/xscreensaver -no-splash &
${pkgs.xss-lock}/bin/xss-lock -- ${pkgs.xscreensaver}/bin/xscreensaver-command -lock &
'';
}; |
Contributor
|
It all looks good to me, I can't see anything that would break existing set ups. 👍 |
Contributor
Author
|
Rebased to fix merge conflicts |
Contributor
Author
Contributor
Author
Contributor
|
Looks good to me. Could you please reformat the commit subject lines properly (see Nixpkgs manual)? Especially the latter is without much information. |
added 2 commits
December 15, 2015 08:49
- if xserver.tty and/or display are set to null, then don't specify them, or the -logfile argument in the xserverArgs - For lightdm, we set default tty and display to null and we determine those at runtime based on arguments passed. This is necessary because we run multiple X servers so they can't all be on the same display
Contributor
Author
|
@spacefrogg: is that better? |
Contributor
|
Fine! Now you just have to catch the attention of somebody who has commit rights.
|
ocharles
added a commit
that referenced
this pull request
Dec 16, 2015
light-locker (lockscreen for lightdm)
Contributor
|
Thanks! |
Contributor
Author
|
Thanks Ollie! |
This file contains hidden or 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
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.
cc @wkennington
cc @lethalman (I suspect something like that might also fixed the "Switch user" button in gnome-screensaver)