diff --git a/home/linux.nix b/home/linux.nix
index 0b7fe9b..e4c991e 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -22,7 +22,7 @@ in {
   '';
 
   nix = {
-    settings = let 
+    settings = let
       foreignLinuxBuilder = if pkgs.system == "x86_64-linux" then
         "ssh://heywoodlh@nixos-mac-mini aarch64-linux" else
         "ssh://heywoodlh@nix-nvidia x86_64-linux";
@@ -74,6 +74,12 @@ allowedSignersFile = ${signersFile}
     '';
   };
 
+  # Gnupg settings
+  services.gpg-agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-curses;
+  };
+
   # FBTerm config
   home.file.".config/fbterm/fbtermrc" = {
     enable = true;
diff --git a/home/linux/desktop.nix b/home/linux/desktop.nix
index f6c77cf..277426b 100644
--- a/home/linux/desktop.nix
+++ b/home/linux/desktop.nix
@@ -54,7 +54,6 @@ in {
     pkgs.libnotify #(notify-send)
     pkgs.nixos-install-tools
     pkgs.nordic
-    pkgs.pinentry-rofi
     pkgs.rofi
     pkgs.tailscale
     pkgs.virt-manager
diff --git a/nixos/base.nix b/nixos/base.nix
index 522d4da..c683d67 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -79,6 +79,12 @@ in {
     };
   };
 
+  # Enable gnupg agent
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-curses;
+  };
+
   # NixOS version
   system.stateVersion = "24.11";
 }