diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix index 20ca019..57a1d03 100644 --- a/nix/configuration/configuration.nix +++ b/nix/configuration/configuration.nix @@ -130,6 +130,7 @@ strace tcpdump git-crypt + nix-index-unwrapped ]; services.openssh = { diff --git a/nix/configuration/roles/gpg/default.nix b/nix/configuration/roles/gpg/default.nix index 38dc3ca..5187d6f 100644 --- a/nix/configuration/roles/gpg/default.nix +++ b/nix/configuration/roles/gpg/default.nix @@ -71,16 +71,51 @@ }; }; - # 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" - # ''; - # }); - # }) - # ]; + 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) { @@ -97,9 +132,11 @@ # ''; environment.systemPackages = with pkgs; [ + pcsclite pcsctools yubikey-personalization yubikey-manager + glibcLocales ]; # nixpkgs.overlays = [ diff --git a/nix/configuration/roles/gpg/files/scdaemon.conf b/nix/configuration/roles/gpg/files/scdaemon.conf index b336abf..acf09be 100644 --- a/nix/configuration/roles/gpg/files/scdaemon.conf +++ b/nix/configuration/roles/gpg/files/scdaemon.conf @@ -1,2 +1,7 @@ reader-port Yubico Yubi disable-ccid + +log-file /home/talexander/scd.log +verbose +debug cardio +debug-level 5