From 921f1866657e30ff9ee68030fb69f2c6a82cadec Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Mon, 25 Aug 2025 18:16:45 -0500
Subject: [PATCH] fix conflict

---
 modules/home/gpg/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/home/gpg/default.nix b/modules/home/gpg/default.nix
index e8b2ac4..777f6e0 100644
--- a/modules/home/gpg/default.nix
+++ b/modules/home/gpg/default.nix
@@ -3,6 +3,10 @@
   programs = {
     gpg = {
       enable = true;
+      scdaemonSettings = {
+        disable-ccid = true;
+        pcsc-shared = true;
+      };
       publicKeys = [
         {
           text = ''