diff --git a/home/nogui/git.nix b/home/nogui/git.nix index 1576e254c6bf014fbd1e555e591357271d5291b0..e45ec8446a8f4c6e9af986035367af8545e0487c 100644 --- a/home/nogui/git.nix +++ b/home/nogui/git.nix @@ -9,6 +9,15 @@ insteadOf = prefix: domain: { "https://${domain}/".insteadOf = "${prefix}:"; "git@${domain}:".insteadOf = "ssh:${prefix}:"; }; + sshSigning = { + user.signingkey = jolheiser.git.sshKey; + commit.gpgSign = true; + tag.gpgSign = true; + gpg = { + format = "ssh"; + ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "${jolheiser.git.email} ${jolheiser.git.sshKey}"}"; + }; + }; in { age.secrets.git-send-email.file = ../../secrets/git-send-email.age; @@ -25,7 +34,6 @@ settings = { user = { name = jolheiser.git.username; email = jolheiser.git.email; - signingkey = jolheiser.git.sshKey; }; alias = { wt = "worktree"; @@ -61,12 +69,6 @@ format = { coverLetter = "auto"; useAutoBase = "whenAble"; }; - commit.gpgSign = true; - tag.gpgSign = true; - gpg = { - format = "ssh"; - ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "${jolheiser.git.email} ${jolheiser.git.sshKey}"}"; - }; url = insteadOf "jo" "git.jolheiser.com" // insteadOf "gh" "github.com" @@ -74,7 +76,8 @@ // insteadOf "gt" "gitea.com" // insteadOf "gl" "gitlab.com" // insteadOf "cb" "codeberg.org" // insteadOf "tngl" "tangled.sh"; - }; + } + // sshSigning; includes = [ { inherit (config.age.secrets.git-send-email) path; } ]; }; }