lyrathorpe/nixfiles
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(git.nix): make personal signingkey a mkDefault

Browse Source 
git.nix and work.nix both define user.signingkey. They used to hold the
same value, which types.str tolerates, but git.nix now sets the personal
key while work.nix sets the work key, so the two plain definitions
conflict on the EDaaS host.

Mark git.nix's signingkey as mkDefault, mirroring user.email: personal
hosts get the personal key, and work.nix's plain work-key definition wins
on the work host.
This commit is contained in:
Emma Thorpe
2026-06-16 11:27:17 +01:00
parent ffedf769a0
commit 886ac4eb36
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lyrathorpe/home/git.nix
+7 -5
View File
@@ -77,12 +77,14 @@ in
cc = "!cz commit"; cc = "!cz commit";
}; };
# SSH commit signing on personal hosts too (the work module sets the same # SSH commit signing. This personal key is the default; the work module
# on the work host). mkDefault so a host without the key in its ssh-agent # (work.nix) overrides it with the work key on the EDaaS host, the same way
# can override to false -- otherwise commits there would fail. Reuses the # user.email is overridden -- so mkDefault here lets that plain definition
# existing ssh key; a dedicated personal key can be swapped in later. # win instead of conflicting. gpgsign is mkDefault too, so a host without
# the key in its ssh-agent can override it to false rather than fail every
# commit.
gpg.format = "ssh"; gpg.format = "ssh";
user.signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDxHvdMTOzpFWUFMtCP7C/4tIOUO3GIO2QPvaifSnWH lyrathorpe@Lyra-MBA"; user.signingkey = lib.mkDefault "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDxHvdMTOzpFWUFMtCP7C/4tIOUO3GIO2QPvaifSnWH lyrathorpe@Lyra-MBA";
commit.gpgsign = lib.mkDefault true; commit.gpgsign = lib.mkDefault true;
tag.gpgsign = lib.mkDefault true; tag.gpgsign = lib.mkDefault true;
}; };