diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix index 3ac3e55133255bc02f865178e8fb02970d42d2ae..c7637ee716745b79d0c1c87e811de2d5f707569f 100644 --- a/apps/nogui/git.nix +++ b/apps/nogui/git.nix @@ -9,9 +9,8 @@ "git@${domain}:".insteadOf = "ssh:${prefix}:"; }; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX"; sshSigning = { + commit.gpgsign = true; user.signingkey = key; - commit.gpgSign = true; - tag.gpgSign = true; gpg = { format = "ssh"; ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}"; @@ -41,6 +40,8 @@ lfs.enable = true; ignores = [".idea/" "result" "node_modules" "ve"]; extraConfig = ... +{ + "https://${domain}/".insteadOf = "${prefix}:"; { init.defaultBranch = "main"; merge.conflictstyle = "zdiff3";