diff --git a/home/river/config/fish/config.fish b/home/river/config/fish/config.fish
index f1ff551..9521463 100644
--- a/home/river/config/fish/config.fish
+++ b/home/river/config/fish/config.fish
@@ -23,7 +23,8 @@ alias cea="bunx create-expo-app --no-install"
 
 export PATH="$HOME/.local/bin:$PATH"
 
-set -x GPG_TTY $(tty)
+set -gx GPG_TTY (tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null
 
 # OpenClaw Completion
 test -f "/home/river/.openclaw/completions/openclaw.fish"; and source "/home/river/.openclaw/completions/openclaw.fish"
diff --git a/home/river/default.nix b/home/river/default.nix
index 9db77f6..1811cf9 100644
--- a/home/river/default.nix
+++ b/home/river/default.nix
@@ -5,6 +5,7 @@
   imports = [
     ./programs/bash.nix
     ./programs/git.nix
+    ./programs/gpg.nix
     ./programs/fish.nix
     ./programs/vesktop.nix
     ./programs/java.nix
diff --git a/home/river/programs/git.nix b/home/river/programs/git.nix
index 1551062..865ec59 100644
--- a/home/river/programs/git.nix
+++ b/home/river/programs/git.nix
@@ -8,20 +8,17 @@
         name = "Maaz Khokhar";
         email = "khokharmaaz@gmail.com";
       };
-      signing = {
-        key = "0xA8D1AEA9C92D6867"; # e.g., "0x1234567890ABCDEF"
-        signByDefault = true;
-      };
-
+      commit.gpgSign = true;
+      tag.gpgSign = true;
+      gpg.program = "${pkgs.gnupg}/bin/gpg";
+      init.defaultBranch = "main";
+      pull.rebase = true;
       credential.helper = "libsecret";
+    };
 
-      extraConfig = {
-        commit.gpgSign = true;
-        tag.gpgSign = true;
-        gpg.program = "${pkgs.gnupg}/bin/gpg";
-        init.defaultBranch = "main";
-        pull.rebase = true;
-      };
+    signing = {
+      key = "0xA8D1AEA9C92D6867";
+      signByDefault = true;
     };
   };
 
diff --git a/home/river/programs/gpg.nix b/home/river/programs/gpg.nix
index c0ae23e..11f30b6 100644
--- a/home/river/programs/gpg.nix
+++ b/home/river/programs/gpg.nix
@@ -5,9 +5,13 @@
     enable = true;
     defaultCacheTtl = 1800;
     maxCacheTtl = 1800;
-    pinentry.package = pkgs.pinentry-curses;
+    pinentry.package = pkgs.pinentry-qt;
   };
 
+  services.gpg-agent.extraConfig = ''
+    pinentry-program ${pkgs.pinentry-qt}/bin/pinentry
+  '';
+
   programs.gpg = {
     enable = true;
     settings = {
@@ -15,4 +19,4 @@
       keyserver = "hkps://keys.openpgp.org";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 3e10ba6..e0d2ea2 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -35,6 +35,7 @@
     pavucontrol
     ghostty
     git-credential-manager
+    gnupg
   ];
 
   nix = {