Skip to content

light-locker (lockscreen for lightdm)#11338

Merged
ocharles merged 2 commits intoNixOS:masterfrom
obadz:light-locker
Dec 16, 2015
Merged

light-locker (lockscreen for lightdm)#11338
ocharles merged 2 commits intoNixOS:masterfrom
obadz:light-locker

Conversation

@obadz
Copy link
Contributor

@obadz obadz commented Nov 29, 2015

cc @wkennington
cc @lethalman (I suspect something like that might also fixed the "Switch user" button in gnome-screensaver)

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @edolstra, @ocharles and @wkennington to be potential reviewers

@obadz
Copy link
Contributor Author

obadz commented Nov 29, 2015

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.

@vcunat vcunat added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: package (new) This PR adds a new package labels Nov 29, 2015
@obadz
Copy link
Contributor Author

obadz commented Nov 30, 2015

Tip for those who want system-wide default to xscreensaver with ability to "switch user" without logging off:

      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 &
        '';
      };

@ocharles
Copy link
Contributor

It all looks good to me, I can't see anything that would break existing set ups. 👍

@jagajaga jagajaga added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 1, 2015
@obadz
Copy link
Contributor Author

obadz commented Dec 10, 2015

Rebased to fix merge conflicts

@obadz
Copy link
Contributor Author

obadz commented Dec 10, 2015

@obadz
Copy link
Contributor Author

obadz commented Dec 15, 2015

@ocharles has reviewed this change (thanks @ocharles).
Unless there are any further concerns, could we merge this change?

@spacefrogg
Copy link
Contributor

Looks good to me.

Could you please reformat the commit subject lines properly (see Nixpkgs manual)? Especially the latter is without much information.

obadz 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
@obadz
Copy link
Contributor Author

obadz commented Dec 15, 2015

@spacefrogg: is that better?

@spacefrogg
Copy link
Contributor

spacefrogg commented Dec 16, 2015 via email

ocharles added a commit that referenced this pull request Dec 16, 2015
light-locker (lockscreen for lightdm)
@ocharles ocharles merged commit 35f8952 into NixOS:master Dec 16, 2015
@ocharles
Copy link
Contributor

Thanks!

@obadz
Copy link
Contributor Author

obadz commented Dec 17, 2015

Thanks Ollie!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: package (new) This PR adds a new package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants