From c09acaa9056975a9a5b52be1703e543151283a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 18 Jun 2023 22:55:24 +0200 Subject: [PATCH 1/3] nixos/pcscd: cleanup code --- nixos/modules/services/hardware/pcscd.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index a9e4998efe37..0935f966110a 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -16,9 +16,6 @@ let in { - - ###### interface - options.services.pcscd = { enable = mkEnableOption (lib.mdDoc "PCSC-Lite daemon"); @@ -46,10 +43,7 @@ in }; }; - ###### implementation - config = mkIf config.services.pcscd.enable { - environment.etc."reader.conf".source = cfgFile; environment.systemPackages = [ package ]; From 6ecb73df1b45a5195167512e57b6bd915208b87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 18 Jun 2023 22:55:44 +0200 Subject: [PATCH 2/3] nixos/pcscd: suggest yubikey-personalization for additional udev rules --- nixos/modules/services/hardware/pcscd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 0935f966110a..0d4cfc4879c8 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -22,7 +22,7 @@ in plugins = mkOption { type = types.listOf types.package; defaultText = literalExpression "[ pkgs.ccid ]"; - example = literalExpression "[ pkgs.pcsc-cyberjack ]"; + example = literalExpression "with pkgs; [ pcsc-cyberjack yubikey-personalization ]"; description = lib.mdDoc "Plugin packages to be used for PCSC-Lite."; }; From 74808f169cf137a632593524672f68dd834251ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 18 Jun 2023 22:56:07 +0200 Subject: [PATCH 3/3] nixos/pcscd: remove noop restartTriggers --- nixos/modules/services/hardware/pcscd.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 0d4cfc4879c8..58b94dae5734 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -55,7 +55,6 @@ in systemd.services.pcscd = { environment.PCSCLITE_HP_DROPDIR = pluginEnv; - restartTriggers = [ "/etc/reader.conf" ]; # If the cfgFile is empty and not specified (in which case the default # /etc/reader.conf is assumed), pcscd will happily start going through the