diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d09ab1b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Encrypt Mopidy config as it contains Spotify credentials
+system/shared/services/mopidy.nix filter=git-crypt diff=git-crypt
diff --git a/system/shared/desktop-configuration.nix b/system/shared/desktop-configuration.nix
index 06e797f..e2104c4 100644
--- a/system/shared/desktop-configuration.nix
+++ b/system/shared/desktop-configuration.nix
@@ -21,6 +21,12 @@
     openFirewall = true;
   };
 
+  services.pcscd.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryFlavor = "curses";
+  };
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;