diff --git a/modules/home/default.nix b/modules/home/default.nix index e1a4bf81367ab94c08da38e09c9349991cfa5210..6e9a26196dcdf34958881eb89a2316560317139d 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -141,10 +141,10 @@ in email = config.programs.git.userEmail; name = config.programs.git.userName; }; - signing = { + signing = lib.mkIf (config.programs.git.signing.key != null) { + inherit (config.programs.git.signing) key; + backend = "gpg"; behavior = "own"; - backend = "ssh"; - key = "~/.ssh/id_ed25519.pub"; }; git = { sign-on-push = true; diff --git a/users/clover/home.nix b/users/clover/home.nix index 5fb0d3e278fe30910d702ec5e12ed553fc1461e3..72bcfaec101f041eb4446cb5874a40c9ea3ff74b 100644 --- a/users/clover/home.nix +++ b/users/clover/home.nix @@ -14,7 +14,8 @@ in ripgrep uv nh - pkgs.autofmt + autofmt + gnupg ]; # packages to install for desktop environments (non-server) desktop = [ @@ -101,6 +102,10 @@ in # use a git-specific email git.userEmail = "git@paperclover.net"; + git.signing = { + signByDefault = true; + key = "C0D577FD799F9D11"; + }; jujutsu = { enable = true; @@ -286,13 +291,14 @@ in ) ''; }; + }; }; ssh = { enable = true; extraConfig = '' - SetEnv TERM=xterm-color + SetEnv TERM=xterm-256color ''; matchBlocks = rec { zenith = {