genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-28 01:47:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #620 from genebean/fix_signing

Browse source 
Fixed ssh-based signing 🤦🏻‍♂️
This commit is contained in:
Gene Liverman 2026-03-27 16:29:17 -04:00 • committed by GitHub
commit 4f5d77e804
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/shared/home/general/default.nix
View file

@ -133,9 +133,6 @@ in
gh.enable = true; gh.enable = true;
git = { git = {
enable = true; enable = true;
settings = {
diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
};
ignores = [ ignores = [
"*~" "*~"
"*.swp" "*.swp"
@ -145,9 +142,17 @@ in
lfs.enable = true; lfs.enable = true;
package = pkgs.gitFull; package = pkgs.gitFull;
settings = { settings = {
diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
commit = {
gpgsign = true;
};
gpg = {
format = "ssh";
};
merge = { merge = {
conflictStyle = "diff3"; conflictStyle = "diff3";
tool = "meld"; tool = "meld";
@ -157,11 +162,7 @@ in
}; };
user = { user = {
name = "Gene Liverman"; name = "Gene Liverman";
}; signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
signing = {
format = "ssh";
key = "${config.home.homeDirectory}/.ssh/id_ed25519";
signByDefault = true;
}; };
}; };
}; # end git }; # end git