diff --git a/home/default.nix b/home/default.nix
index 483cef2..2252224 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,6 +1,6 @@
 { system, pkgs, home-manager, modules, ... }:
 let
-  ivand-programs = with modules.home.programs; [ nvim zsh tmux git chromium firefox kitty lf obs-studio sway swaylock browserpass bottom ];
+  ivand-programs = with modules.home.programs; [ nvim zsh tmux git chromium firefox kitty lf obs-studio sway swaylock browserpass bottom gpg ];
   ivand-packages = with modules.home.packages; [ dev essential media ];
   vid-programs = with modules.home.programs; [ nvim zsh tmux ];
 in
diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix
index 832766e..552b68d 100644
--- a/modules/home/programs/default.nix
+++ b/modules/home/programs/default.nix
@@ -4,6 +4,7 @@
     nvim = ide.nvim.${system}.homeManagerModules.nvim;
   };
   git = import ./git;
+  gpg = import ./gpg { inherit pkgs; };
   chromium = import ./chromium { inherit pkgs; };
   firefox = import ./firefox { inherit pkgs; };
   kitty = import ./kitty;
diff --git a/modules/home/programs/gpg/default.nix b/modules/home/programs/gpg/default.nix
new file mode 100644
index 0000000..71b1e2c
--- /dev/null
+++ b/modules/home/programs/gpg/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  programs.gpg = {
+    enable = true;
+  };
+  services.gpg-agent = {
+    enable = true;
+    enableZshIntegration = true;
+    extraConfig = ''
+      pinentry-program ${pkgs.pinentry-bemenu}/bin/pinentry-bemenu
+    '';
+  };
+}
diff --git a/nixos/laptop/default.nix b/nixos/laptop/default.nix
index 7ccab8b..4050a89 100644
--- a/nixos/laptop/default.nix
+++ b/nixos/laptop/default.nix
@@ -100,10 +100,6 @@
   };
 
   programs = {
-    gnupg.agent = {
-      enable = true;
-      pinentryFlavor = "curses";
-    };
     zsh.enable = true;
     nix-ld.enable = true;
     wshowkeys.enable = true;