sadorowo/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify fingerprint module

Browse Source
This commit is contained in:
Franek 2025-02-22 08:59:27 +01:00
parent 3c0832158f
commit 61090d1439
7 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/hulk/modules.nix
View File

@ -4,7 +4,6 @@
imports = [
../../modules/greetd.nix
../../modules/nvidia-support.nix
../../modules/open-fprint-suspend-fix.nix
inputs.fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
../../modules/fingerprint.nix
];
}

51
modules/fingerprint.nix Normal file
View File

@ -0,0 +1,51 @@
{ config, lib, pkgs, inputs, ... }:
{
options.services.fingerprint-fix.enable = lib.mkEnableOption "Enable support for fingerprint for P51S-like ThinkPads.";
options.services.fingerprint-fix.calibDataFile = lib.mkOption {
description = "Path to calibration data file.";
};
imports = lib.mkIf config.services.fingerprint-fix.enable [
inputs.fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
];
config = lib.mkIf config.services.fingerprint-fix.enable {
# Needed because we're getting TLS error with open-fprintd-resume
systemd.services.validity-restart = let
targets = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ];
in {
description = "Restart services to fix fingerprint integration";
wantedBy = targets;
after = targets;
serviceConfig = {
type = "simple";
ExecStart = "systemctl --no-block restart python3-validity.service open-fprintd.service";
};
};
services."06cb-009a-fingerprint-sensor" = {
enable = true;
backend = "python-validity";
calib-data-file = config.services.fingerprint-fix.calibDataFile;
};
services.open-fprintd.enable = true;
security.pam.services.login.fprintAuth = true;
security.pam.services.greetd.fprintAuth = true;
security.pam.services.sudo.fprintAuth = true;
security.pam.services.su.fprintAuth = true;
services.udev.extraRules = ''
ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="138a", ATTRS{idProduct}=="0097", ATTR{power/persist}="1"
'';
security.pam.services.hyprlock.text = ''
# PAM configuration file for hyprlock
# the 'login' configuration file (see /etc/pam.d/login)
auth include login
'';
};
}

31
modules/open-fprint-suspend-fix.nix
View File

@ -1,31 +0,0 @@
{ config, lib, pkgs, ... }:
{
options.services.fingerprint-fix.enable = lib.mkEnableOption "Enable systemd service to restart fingerprint services after suspend.";
options.services.fingerprint-fix.calibDataFile = lib.mkOption {
description = "Path to calibration data file.";
};
config = lib.mkIf config.services.fingerprint-fix.enable {
# Needed because we're getting TLS error with open-fprintd-resume
systemd.services.validity-restart = let
targets = [ "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ];
in {
description = "Restart services to fix fingerprint integration";
wantedBy = targets;
after = targets;
serviceConfig = {
type = "oneshot";
ExecStart = "systemctl restart python3-validity.service";
};
};
services."06cb-009a-fingerprint-sensor" = {
enable = true;
backend = "python-validity";
calib-data-file = config.services.fingerprint-fix.calibDataFile;
};
services.fprintd.enable = lib.mkForce true; # Fprintd is not working with P51s
};
}

1
profiles/hulk/packages.nix
View File

@ -56,7 +56,6 @@ in {
greetd.greetd greetd.tuigreet
playerctl
adwaita-icon-theme
darkman
android-tools
filezilla
bitwarden-desktop

6
profiles/hulk/programs.nix
View File

@ -16,7 +16,8 @@
services.darkman = {
enable = true;
darkModeScripts = {
gtk-theme = ''
theme = ''
${pkgs.pywalfox-native}/bin/pywalfox dark
${pkgs.dconf}/bin/dconf write\
/org/gnome/desktop/interface/color-scheme "'prefer-dark'"
'';
@ -27,7 +28,8 @@
};
lightModeScripts = {
gtk-theme = ''
theme = ''
${pkgs.pywalfox-native}/bin/pywalfox light
${pkgs.dconf}/bin/dconf write\
/org/gnome/desktop/interface/color-scheme "'prefer-light'"
'';