From b215e8280d0f2a137fa3269501191f8f0c12f869 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 21 Dec 2020 16:47:00 +0100
Subject: [PATCH] graphical-systems: disable pcscd

Also add udev rule to allow users device access. This is required for
users accessing the Yubikey directly which is the case when using gpg
without pcscd
---
 nix/home-manager/profiles/qtile-desktop.nix | 3 ++-
 nix/os/devices/steveej-t14/system.nix       | 1 +
 nix/os/profiles/graphical/system.nix        | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nix/home-manager/profiles/qtile-desktop.nix b/nix/home-manager/profiles/qtile-desktop.nix
index 004f821..382bfaa 100644
--- a/nix/home-manager/profiles/qtile-desktop.nix
+++ b/nix/home-manager/profiles/qtile-desktop.nix
@@ -316,7 +316,8 @@ in {
       enableScDaemon = true;
       enableSshSupport = true;
       grabKeyboardAndMouse = true;
-      extraConfig = "pinentry-program ${pkgs.pinentry-gtk2}/bin/pinentry";
+      pinentryFlavor = "gtk2";
+      extraConfig = "";
     };
     flameshot.enable = true;
   };
diff --git a/nix/os/devices/steveej-t14/system.nix b/nix/os/devices/steveej-t14/system.nix
index cfe6f1d..52ab96b 100644
--- a/nix/os/devices/steveej-t14/system.nix
+++ b/nix/os/devices/steveej-t14/system.nix
@@ -74,5 +74,6 @@ in {
 
   boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
 
+
   hardware.ledger.enable = true;
 }
diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix
index ff3def4..06e7d69 100644
--- a/nix/os/profiles/graphical/system.nix
+++ b/nix/os/profiles/graphical/system.nix
@@ -20,7 +20,7 @@
 
   # hardware related services
   services.illum.enable = true;
-  services.pcscd.enable = true;
+  services.pcscd.enable = false;
   hardware = {
     bluetooth.enable = true;
     pulseaudio = {
@@ -109,6 +109,9 @@
     SUBSYSTEM=="usb", ATTR{idVendor}=="047f", ATTR{idProduct}=="011a", GROUP="users", MODE="0777"
     SUBSYSTEM=="usb", ATTR{idVendor}=="047f", ATTR{idProduct}=="fffe", GROUP="users", MODE="0777"
     SUBSYSTEM=="usb", ATTR{idVendor}=="047f", ATTR{idProduct}=="0001", GROUP="users", MODE="0777"
+
+    # Yubikey 4/5 U2F+CCID
+    SUBSYSTEM=="usb", ATTR{idVendor}=="1050", ATTR{idProduct}=="0406", ENV{ID_SECURITY_TOKEN}="1", GROUP="wheel"
   '';