diff --git a/home/gpg.nix b/home/gpg.nix
new file mode 100644
index 0000000..9563388
--- /dev/null
+++ b/home/gpg.nix
@@ -0,0 +1,27 @@
+{ config, pkgs, ... }:
+
+{
+
+  programs.gpg.settings = {
+    no-emit-version = true;
+    no-comments = true;
+    keyserver = "hkps://keys.openpgp.org/";
+    keyserver-options = [
+      "no-honor-keyserver-url"
+      "include-revoked"
+    ];
+    personal-cipher-preferences = "AES256 AES192 AES CAST5";
+    personal-digest-preferences = "SHA512 SHA384 SHA256 SHA224";
+    cert-digest-algo = "SHA512";
+    default-preference-list = "SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed";
+  };
+
+  xdg.configFile."scdaemon" = {
+    text = ''
+      disable-ccid
+      pcsc-shared
+    '';
+    target = "../.gnupg/scdaemon.conf";
+  };
+
+}
diff --git a/home/minimal.nix b/home/minimal.nix
index 6d7ceca..5f12b1c 100644
--- a/home/minimal.nix
+++ b/home/minimal.nix
@@ -44,6 +44,8 @@
     ./password-store.nix
     ./vifm
     ./nvim
+    ./gpg.nix
+    ./ssh.nix
   ];
 
   programs.nix-index = {
@@ -73,30 +75,4 @@
     settings.styles.theme = "default-light";
   };
 
-  programs.ssh.matchBlocks = {
-    geocom = {
-      hostname = "geocom.uni-frankfurt.de";
-      user = "till";
-      identityFile = "${config.home.homeDirectory}/.ssh/tstraube";
-    };
-  };
-
-  programs.gpg.settings = {
-
-    no-emit-version = true;
-    no-comments = true;
-
-    keyserver = "hkps://keys.openpgp.org/";
-    keyserver-options = [
-      "no-honor-keyserver-url"
-      "include-revoked"
-    ];
-
-    personal-cipher-preferences = "AES256 AES192 AES CAST5";
-    personal-digest-preferences = "SHA512 SHA384 SHA256 SHA224";
-    cert-digest-algo = "SHA512";
-    default-preference-list = "SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed";
-
-  };
-
 }
diff --git a/home/ssh.nix b/home/ssh.nix
new file mode 100644
index 0000000..bbcbfa3
--- /dev/null
+++ b/home/ssh.nix
@@ -0,0 +1,24 @@
+{ config, ... }:
+
+{
+  programs.ssh = {
+
+    enable = true;
+
+    matchBlocks = {
+
+      gu = {
+        hostname = "login.server.uni-frankfurt.de";
+        user = "tstraube";
+        identityFile = "${config.home.homeDirectory}/.ssh/tstraube";
+      };
+
+      geocom = {
+        hostname = "geocom.uni-frankfurt.de";
+        user = "till";
+        identityFile = "${config.home.homeDirectory}/.ssh/tstraube";
+      };
+
+    };
+  };
+}
diff --git a/system/secrets.nix b/system/secrets.nix
index 88313b4..98d5838 100644
--- a/system/secrets.nix
+++ b/system/secrets.nix
@@ -6,6 +6,9 @@
     enable = true;
     pinentryPackage = pkgs.pinentry-gnome3;
     enableSSHSupport = true;
+    settings = {
+      # disable-scdaemon = "";
+    };
   };
 
 }