about summary refs log tree commit diff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/profiles/git.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/home/profiles/git.nix b/home/profiles/git.nix
index 6846a08..d559150 100644
--- a/home/profiles/git.nix
+++ b/home/profiles/git.nix
@@ -13,18 +13,17 @@ in
     userEmail = "franck@fcuny.net";
 
     signing = {
-      key = "key::${sshPub.ykey-laptop}";
-      signByDefault = false;
+      key = "key::${sshPub.op}";
+      signByDefault = true;
     };
 
     extraConfig = {
       core.whitespace = "trailing-space,space-before-tab";
       color.ui = "true";
 
-      diff.age.textconv = "${pkgs.age}/bin/age --identity ${config.home.homeDirectory}/.age/key.txt --decrypt";
-
       gpg.format = "ssh";
       gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
+      gpg.ssh.program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign";
 
       # abort if the remote branch does not match the local one
       push.default = "simple";