diff --git a/home/home.nix b/home/home.nix
index 314e005..3e3f8ba 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -25,7 +25,9 @@ in {
     news.display = "silent";
 
     home.file.".local/bin/scripts" = {
-      source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nix-config/scripts";
+      source = ../scripts;
+      recursive = true;
+      executable = true;
     };
 
     programs.home-manager.enable = true;
diff --git a/home/modules/git.nix b/home/modules/git.nix
index 5450edc..b99e9ab 100644
--- a/home/modules/git.nix
+++ b/home/modules/git.nix
@@ -100,7 +100,11 @@
 
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     matchBlocks = {
+      "*" = {
+        addKeysToAgent = "yes";
+      };
       "github.com" = {
         identityFile = "~/.ssh/id_ed25519";
       };
@@ -138,7 +142,7 @@
     enable = true;
     defaultCacheTtl = 3600;
     maxCacheTtl = 7200;
-    pinentryPackage = pkgs.pinentry-curses;
+    pinentry.package = pkgs.pinentry-curses;
   };
 
   home.activation.secretPermissions = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
diff --git a/home/modules/shell.nix b/home/modules/shell.nix
index 182a812..755bd92 100644
--- a/home/modules/shell.nix
+++ b/home/modules/shell.nix
@@ -169,6 +169,7 @@ in {
     '';
 
     initContent = ''
+      export GPG_TTY=$(tty)
       export THEME="''${THEME:-${config.theme}}"
 
       setopt auto_cd