diff --git a/modules/toolchains.nix b/modules/toolchains.nix
index 9dbe6b3..e5aff50 100644
--- a/modules/toolchains.nix
+++ b/modules/toolchains.nix
@@ -14,7 +14,11 @@ in {
     jdk17
     python3
     pkg-config
-    imgui
+
+    pinentry
+    pass
+    tea
+    (writeShellScriptBin "passw" "pass $@")
 #    nodejs_21 # ugh.... somehow nvim needs node now?!?
   ];
 
@@ -90,6 +94,11 @@ in {
     };
   };
 
+  services.pcscd.enable = true;
   programs.xonsh.enable = true;
   programs.ssh.startAgent = true;
+  programs.gnupg.agent = {
+    pinentryFlavor = "tty";
+    enable = true;
+  };
 }
diff --git a/modules/tui.nix b/modules/tui.nix
index 6ce2b75..4516c36 100644
--- a/modules/tui.nix
+++ b/modules/tui.nix
@@ -6,8 +6,5 @@
     spotify-tui
     ranger
     alacritty
-    pass
-    tea
-    (writeShellScriptBin "passw" "pass $@")
   ];
 }
diff --git a/modules/users.nix b/modules/users.nix
index 97542cb..32d3deb 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -16,7 +16,7 @@
       element-desktop
       nmap
       ghidra
-      firefox
+#      firefox
       kcalc
       rmview
       krita
@@ -42,6 +42,13 @@
     ];
   };
 
+  environment.systemPackages = with pkgs; [ pinentry-qt ];
+
+  programs.firefox = {
+    enable = true;
+    nativeMessagingHosts.packages = with pkgs; [ passff-host ];
+  };
+
   programs.steam = {
     enable = true;
     gamescopeSession.enable = true;