diff --git a/modules/git.nix b/modules/git.nix index 4e2fe45..b6ed408 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -92,18 +92,20 @@ in enable = true; userName = "Filippo Berto"; userEmail = "berto.f@protonmail.com"; - signing = { - key = "berto.f@protonmail.com"; - signByDefault = true; - }; + # signing = { + # key = "berto.f@protonmail.com"; + # signByDefault = true; + # }; extraConfig = { + commit.gpgSign = true; core.editor = kak; credential.helper = "cache --timeout = 3600 "; diff.guitool = meld; + init.defaultBranch = "main"; merge.guitool = meld; pull.rebase = true; rebase.autoStash = true; - init.defaultBranch = "main"; + user.signingKey = "berto.f@protonmail.com"; }; lfs.enable = true; delta.enable = true;