diff --git a/modules/services/pam/gnome-keyring.nix b/modules/services/pam/gnome-keyring.nix
new file mode 100644
index 0000000..aef01a2
--- /dev/null
+++ b/modules/services/pam/gnome-keyring.nix
@@ -0,0 +1,12 @@
+{ pkgs, config, lib, ... }:
+with lib;
+let
+  cfg = config.nki.services.pam;
+in
+{
+  options.nki.services.pam.enableGnomeKeyring = mkEnableOption "Enable gnome-keyring on login";
+  config = mkIf cfg.enableGnomeKeyring {
+    security.pam.services.login.enableGnomeKeyring = true;
+    security.pam.services.login.gnupg.enable = true;
+  };
+}
diff --git a/nki-x1c1/configuration.nix b/nki-x1c1/configuration.nix
index 3317f28..8d1e18e 100644
--- a/nki-x1c1/configuration.nix
+++ b/nki-x1c1/configuration.nix
@@ -11,6 +11,8 @@
       ./hardware-configuration.nix
       # Fonts
       ../modules/personal/fonts
+      # Some PAM stuff
+      ../modules/services/pam/gnome-keyring.nix
     ];
   # Use the latest kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -142,6 +144,7 @@
   # };
 
   # List services that you want to enable:
+  nki.services.pam.enableGnomeKeyring = true;
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;