mirror of
https://github.com/genebean/dots.git
synced 2026-03-27 17:37:43 -04:00
Fixed ssh-based signing 🤦🏻♂️
This commit is contained in:
parent
4c44af35bc
commit
90175d5053
1 changed files with 9 additions and 8 deletions
|
|
@ -133,9 +133,6 @@ in
|
|||
gh.enable = true;
|
||||
git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
|
||||
};
|
||||
ignores = [
|
||||
"*~"
|
||||
"*.swp"
|
||||
|
|
@ -145,9 +142,17 @@ in
|
|||
lfs.enable = true;
|
||||
package = pkgs.gitFull;
|
||||
settings = {
|
||||
diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
|
||||
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
commit = {
|
||||
gpgsign = true;
|
||||
};
|
||||
gpg = {
|
||||
format = "ssh";
|
||||
};
|
||||
merge = {
|
||||
conflictStyle = "diff3";
|
||||
tool = "meld";
|
||||
|
|
@ -157,11 +162,7 @@ in
|
|||
};
|
||||
user = {
|
||||
name = "Gene Liverman";
|
||||
};
|
||||
signing = {
|
||||
format = "ssh";
|
||||
key = "${config.home.homeDirectory}/.ssh/id_ed25519";
|
||||
signByDefault = true;
|
||||
signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
|
||||
};
|
||||
};
|
||||
}; # end git
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue