diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index c6214da..157a8ae 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -11,6 +11,16 @@
   unstable-pkgs,
   ...
 }:
+let ladybird = unstable-pkgs.ladybird.overrideAttrs(old: {
+      src = fetchFromGitHub {
+	owner = "LadybirdWebBrowser";
+	repo = "ladybird";
+	rev = "f148af0a9399139b85308ae1eacc8f0f738ed26c";
+	hash = "sha256-pmUpVa1l47m6mLilaMuxuIGNRkcOGscr5h6T0sNBXOM=";
+      };
+      version = "0-unstable-2025-03-04";
+    });
+in
 {
   imports = [
     inputs.sops-nix.nixosModules.sops
@@ -27,6 +37,7 @@
     ./modules/services/autoupgrade
     ./modules/sops
     ./modules/emacs
+    ./modules/gnupg
     ./hosts/${hwconfig.hostname}
   ] ++ lib.optional (hwconfig.useImpermanence) ./modules/impermanence;
   facter.reportPath = ./hosts/${hwconfig.hostname}/facter.json;
@@ -167,6 +178,7 @@
     obs-studio
     neovim
   ];
+
   programs.kdeconnect.enable = true;
   programs.kdeconnect.package = lib.mkDefault pkgs.kdePackages.kdeconnect-kde;
 
diff --git a/nixos/modules/gnupg/default.nix b/nixos/modules/gnupg/default.nix
new file mode 100644
index 0000000..d20d019
--- /dev/null
+++ b/nixos/modules/gnupg/default.nix
@@ -0,0 +1,12 @@
+{ pkgs,... }:
+{
+  programs.gnupg.agent = {
+    enable = true;
+    settings = {
+      pinentry-program = lib.mkForce "${pkgs.pinentry-curses}/bin/pinentry-curses";
+    };
+  };
+  environment.systemPackages = with pkgs;[
+     (pass.withExtensions (exts: with exts;[pass-otp]))
+  ];
+}
diff --git a/nixos/modules/impermanence/home.nix b/nixos/modules/impermanence/home.nix
index ee990d5..15efad3 100644
--- a/nixos/modules/impermanence/home.nix
+++ b/nixos/modules/impermanence/home.nix
@@ -18,6 +18,7 @@
       "nixos-config"
       "blender"
       ".gnupg"
+      ".password-store"
       ".ssh"
       ".emacs.d"
       ".local/share/keyrings"