diff --git a/hardware-specific/onlykey.nix b/key-management.nix
similarity index 79%
rename from hardware-specific/onlykey.nix
rename to key-management.nix
index d4b4e3c..ef866d0 100644
--- a/hardware-specific/onlykey.nix
+++ b/key-management.nix
@@ -13,6 +13,13 @@
     onlykey-agent
   ];
 
+  programs.ssh.startAgent = pkgs.lib.mkForce false; # TEMPORARY!
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryPackage = pkgs.pinentry-curses;
+  };
+
   services.udev.extraRules = with pkgs; ''
     ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", ENV{ID_MM_DEVICE_IGNORE}="1"
     ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="60fc", ENV{MTP_NO_PROBE}="1"
diff --git a/machine-confs/helium.nix b/machine-confs/helium.nix
index f707db4..d9a5da9 100644
--- a/machine-confs/helium.nix
+++ b/machine-confs/helium.nix
@@ -69,6 +69,7 @@
     ../users/vili.nix
     ../desktop.nix
     ../development.nix
+    ../key-management.nix
     ../services/syncthing.nix
     ../services/redshift.nix
     ../services/game-streaming.nix
@@ -76,7 +77,6 @@
     ../hardware-specific/trackball.nix
     ../hardware-specific/amd-laptop.nix
     ../hardware-specific/usb-automount.nix
-    ../hardware-specific/onlykey.nix
   ];
 
   services.xserver.displayManager.setupCommands = ''