nix/configuration/hosts/odo/default.nix

@@ -38,7 +38,6 @@
   me.emacs_flavor = "full";
   me.firefox.enable = true;
   me.git.config = ../../roles/git/files/gitconfig_home;
-  me.gpg.enable = true;
   me.graphical = true;
   me.graphics_card_type = "amd";
   me.kanshi.enable = true;

nix/configuration/roles/gpg/default.nix

@@ -16,18 +16,6 @@ in
 {
   imports = [ ];
 
-  options.me = {
-    gpg.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install gpg.";
-    };
-  };
-
-  config = lib.mkIf config.me.gpg.enable (
-    lib.mkMerge [
-      {
   # Fetch public keys:
   # gpg --locate-keys tom@fizz.buzz
   #
@@ -90,6 +78,66 @@ in
     };
   };
 
+  nixpkgs.overlays = [
+    (final: prev: {
+      # pcsclite = prev.pcsclite.overrideAttrs (old: {
+      #   postPatch = ''
+      #     substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
+      #       --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+      #   '';
+      # });
+
+      # pcsclite = prev.pcsclite.overrideAttrs (old: {
+      #   postPatch =
+      #     old.postPatch
+      #     + (lib.optionalString
+      #       (!(lib.strings.hasInfix ''--replace-fail "libpcsclite_real.so.1"'' old.postPatch))
+      #       ''
+      #         substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
+      #           --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+      #       ''
+      #     );
+      # });
+
+      # pcsclite = prev.pcsclite.overrideAttrs (old: {
+      #   postPatch =
+      #     old.postPatch
+      #     + ''
+      #       substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
+      #         --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+      #     '';
+      # });
+
+      # gnupg = prev.gnupg.override {
+      #   pcsclite = pkgs.pcsclite.overrideAttrs (old: {
+      #     postPatch =
+      #       old.postPatch
+      #       + (lib.optionalString
+      #         (!(lib.strings.hasInfix ''--replace-fail "libpcsclite_real.so.1"'' old.postPatch))
+      #         ''
+      #           substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
+      #             --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+      #         ''
+      #       );
+      #   });
+      # };
+    })
+  ];
+
+  # security.polkit.extraConfig = ''
+  #   polkit.addRule(function(action, subject) {
+  #     if (action.id == "org.debian.pcsc-lite.access_card") {
+  #       return polkit.Result.YES;
+  #     }
+  #   });
+
+  #   polkit.addRule(function(action, subject) {
+  #     if (action.id == "org.debian.pcsc-lite.access_pcsc") {
+  #       return polkit.Result.YES;
+  #     }
+  #   });
+  # '';
+
   environment.systemPackages = with pkgs; [
     pcsclite
     pcsctools
@@ -101,8 +149,25 @@ in
     gpg_test_wkd
   ];
 
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     gnupg = pkgs-unstable.gnupg;
+  #     scdaemon = pkgs-unstable.scdaemon;
+  #     libgcrypt = pkgs-unstable.libgcrypt;
+  #   })
+  # ];
+
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     gnupg = prev.gnupg.overrideAttrs (old: rec {
+  #       version = "2.4.7";
+  #       src = prev.fetchurl {
+  #         url = "https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2";
+  #         hash = "sha256-eyRwbk2n4OOwbKBoIxAnQB8jgQLEHJCWMTSdzDuF60Y=";
+  #       };
+  #     });
+  #   })
+  # ];
+
   programs.gnupg.agent.enableExtraSocket = true;
-      }
-    ]
-  );
 }

nix/configuration/roles/gpg/files/scdaemon.conf

@@ -1,7 +1,7 @@
-#reader-port Yubico Yubi
+reader-port Yubico Yubi
 disable-ccid
 
-#log-file /home/talexander/scd.log
+log-file /home/talexander/scd.log
-#verbose
+verbose
-#debug cardio
+debug cardio
-#debug-level 5
+debug-level 5