diff --git a/module/configuration.nix b/module/configuration.nix
index 05b6a53..f5fb641 100644
--- a/module/configuration.nix
+++ b/module/configuration.nix
@@ -19,7 +19,6 @@
   };
 
   programs.zsh.enable = true;
-  programs.gnupg.agent.enable = true;
 
   networking.hostName = hostname;
 
diff --git a/module/home-manager.nix b/module/home-manager.nix
index f1fb0fe..c5d960d 100644
--- a/module/home-manager.nix
+++ b/module/home-manager.nix
@@ -37,10 +37,11 @@
     nixd
     nixpkgs-fmt
     nodejs
-    nodePackages.typescript-language-server
-    nodePackages.vscode-json-languageserver
+    typescript-language-server
+    vscode-json-languageserver
     noto-fonts
     pass
+    pinentry_mac
     ripgrep
     tree
     typescript
@@ -70,6 +71,7 @@
 
     git = {
       enable = true;
+      signing.format = null;
       settings = {
         core.editor = "emacsclient -c -a ''";
         init.defaultBranch = "main";
@@ -112,6 +114,11 @@
     };
   };
 
+  services.gpg-agent = {
+    enable = true;
+    pinentry.package = pkgs.pinentry_mac;
+  };
+
   launchd.agents.disable-hotkey = {
     enable = true;
     config = {