diff --git a/modules/cli/git.nix b/modules/cli/git.nix index 6eb017fd..e82cfbb2 100644 --- a/modules/cli/git.nix +++ b/modules/cli/git.nix @@ -37,10 +37,6 @@ in { home-manager.users.${username} = { programs.git = { inherit (cfg) enable userName userEmail; - signing = { - key = cfg.signingKey; - signByDefault = true; - }; extraConfig = { contents = { core = { @@ -49,7 +45,12 @@ in { }; init.defaultBranch = cfg.defaultBranch; push.autoSetupRemote = true; - commit.verbose = true; + commit = { + verbose = true; + gpgsign = true; + }; + gpg.format = "ssh"; + user.signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXD1EM4mQz99vJhmZX1r7kwMd8yewogOuoTUuv1xWZB"; merge.conflictstyle = "zdiff3"; interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only"; diff.algorithm = "histogram";