test #17

Merged
jahanson merged 3 commits from merge-nixconfigs into main 2024-05-31 09:49:49 -05:00
Showing only changes of commit 3f95678318 - Show all commits

View file

@ -33,24 +33,19 @@ in
userEmail = cfg.email; userEmail = cfg.email;
extraConfig = { extraConfig = {
core = { core.autocrlf = "input";
autocrlf = "input"; init.defaultBranch = "main";
}; pull.rebase = true;
init = { rebase.autoStash = true;
defaultBranch = "main"; # public key for signing commits
}; user.signingKey = cfg.signingKey;
pull = { # ssh instead of gpg
rebase = true;
};
rebase = {
autoStash = true;
};
user = {
signingKey = cfg.signingKey;
};
gpg.format = "ssh"; gpg.format = "ssh";
# gpg.ssh.program = "/etc/profiles/per-user/jahanson/bin/op-ssh-sign"; # gpg.ssh.program = "/etc/profiles/per-user/jahanson/bin/op-ssh-sign";
# 1password signing gui git signing
gpg.ssh.program = "${pkgs._1password-gui}/bin/op-ssh-sign"; gpg.ssh.program = "${pkgs._1password-gui}/bin/op-ssh-sign";
# Auto sign commits without -S
commit.gpgsign = true;
}; };
aliases = { aliases = {
co = "checkout"; co = "checkout";