diff --git a/system/configuration.nix b/system/configuration.nix
index 1ece672..e0bf560 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -89,12 +89,19 @@ in
     pkgs.tmux
     pkgs.git
     pkgs.pciutils
+    pkgs.pinentry-curses
     pkgs.xdg-desktop-portal
     pkgs.xdg-desktop-portal-gtk
     pkgs.xdg-desktop-portal-kde
     inputs.devenv.packages.x86_64-linux.devenv
   ];
 
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    pinentryFlavor = "curses";
+  };
+
   environment.variables.LC_ALL = "en_GB.UTF-8";
 
 
diff --git a/users/tsv/gnupg/gpg-agent.conf b/users/tsv/gnupg/gpg-agent.conf
new file mode 100644
index 0000000..3164e70
--- /dev/null
+++ b/users/tsv/gnupg/gpg-agent.conf
@@ -0,0 +1,6 @@
+debug-pinentry
+debug ipc
+verbose
+enable-ssh-support
+pinentry-program /run/current-system/sw/bin/pinentry-curses
+
diff --git a/users/tsv/home.nix b/users/tsv/home.nix
index d5b989c..bd2d03a 100644
--- a/users/tsv/home.nix
+++ b/users/tsv/home.nix
@@ -52,6 +52,10 @@
     microsoft-edge
     nerdfonts
     pandoc
+    (pass.withExtensions (exts: [
+      exts.pass-import
+      exts.pass-otp
+    ]))
     pavucontrol
     polkit-kde-agent
     pspg
@@ -123,6 +127,7 @@
   home.file.".tmux.conf".source = ./tmux.conf;
   home.file.".psqlrc".source = ./psqlrc;
   home.file.".w3m/config".source = ./w3m/config;
+  home.file.".gnupg/gpg-agent.conf".source = ./gnupg/gpg-agent.conf;
   xdg.configFile."git/config".source = ./git/config;
   xdg.configFile."git/config_foxsoft".source = ./git/config_foxsoft;
   xdg.configFile."nvim/init.lua".source = ./nvim/init.lua;