Skip to content

Commit 5c75b70

Browse files
committed
me: wl: swaylock: enable new fingerprint support
Requires PR #49. <jirutka/swaylock-effects#49>
1 parent 8126934 commit 5c75b70

2 files changed

Lines changed: 6 additions & 14 deletions

File tree

hosts/common/amd-thinkpad/user-desktop.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@
108108
### DESKTOP ENVIRONMENT: WAYLAND ###
109109
####################################
110110
{
111-
# <https://github.com/swaywm/swaylock/issues/61>
111+
# Fingerprint support is provided by #49.
112+
# `login` should include an `auth` line for fprintd if it is installed.
112113
security.pam.services.swaylock.text = ''
113-
auth sufficient pam_unix.so try_first_pass nullok
114-
auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so
114+
auth include login
115115
'';
116116

117117
# <https://github.com/swaywm/swaylock/issues/61>
118118
# security.pam.services.swaylock.text = ''
119-
# auth sufficient ${pkgs.fprintd-grosshack}/lib/security/pam_fprintd_grosshack.so
119+
# auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so
120120
# auth sufficient pam_unix.so try_first_pass nullok
121121
# '';
122122
}

users/jacob/wayland/swaylock.nix

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
{ config, pkgs, lib, ... }:
22
let
3-
# package = pkgs.swaylock-effects.overrideAttrs (self: super: {
4-
# version = "1.6.11";
5-
# src = pkgs.fetchFromGitHub {
6-
# owner = "jirutka";
7-
# repo = "swaylock-effects";
8-
# rev = "v${self.version}";
9-
# sha256 = "sha256-MKmWVYssO9HAcP5uqwpy9kDa6/kfZyV2NI7ibozt7Ug=";
10-
# };
11-
# });
123
package = let super = pkgs.swaylock-effects;
134
in pkgs.symlinkJoin {
145
inherit (super) name pname version meta;
@@ -85,7 +76,8 @@ in {
8576
in {
8677
### Behavior ###
8778

88-
# ignore-empty-password = true;
79+
fingerprint = true;
80+
ignore-empty-password = true;
8981
# daemonize = true;
9082
# grace = 5; # Specify when auto-lock
9183
# grace-no-mouse = true;

0 commit comments

Comments
 (0)