diff --git a/darwin-configuration.nix b/darwin-configuration.nix
index af667d6..391a307 100644
--- a/darwin-configuration.nix
+++ b/darwin-configuration.nix
@@ -61,6 +61,14 @@
         signing.key = "877300954D1493E6";
         
       };
+
+      gpg = {
+	    # Required on MacOS for GPG to recognise YubiKey.
+	    # https://github.com/NixOS/nixpkgs/issues/155629
+	    scdaemonSettings = pkgs.lib.mkIf pkgs.stdenv.isDarwin {
+	      disable-ccid = true;
+        };
+      };
     };
 
     home.file.".ssh/authorized_keys" = {
diff --git a/macos/packages-darwin.nix b/macos/packages-darwin.nix
index 5b32a2a..5c78bc7 100644
--- a/macos/packages-darwin.nix
+++ b/macos/packages-darwin.nix
@@ -4,7 +4,8 @@ environment.systemPackages = with pkgs; [
     # Darwin Specific
     opensc
     libu2f-host
-    
+    pinentry_mac
+
     ### (Installed System Packages) ###
 
     # Applications
@@ -15,6 +16,7 @@ environment.systemPackages = with pkgs; [
     pinentry-curses
     #zoom-us
     iterm2
+   # vivaldi
 
     # Development, Git or Libraries
     ffmpeg