Compare commits

..

No commits in common. "ed980b89cd5aa79db310950ceb608aaa0b8c4538" and "e6d6e08621655aed31c59ba7be7e43e22ef880b9" have entirely different histories.

3 changed files with 2 additions and 16 deletions

View File

@ -66,13 +66,6 @@ with lib; {
tmate tmate
]; ];
}) })
(mkIf (config.nathan.programs.util.git.enable
&& config.nathan.programs.util.git.gpgSign) {
programs.git.signing = {
key = lib.mkDefault "B7A40A5D78C08885";
signByDefault = lib.mkDefault config.nathan.programs.util.git.gpgSign;
};
})
(mkIf config.nathan.programs.util.git.enable { (mkIf config.nathan.programs.util.git.enable {
# Git adjacent packages # Git adjacent packages
home.packages = [ home.packages = [
@ -87,7 +80,7 @@ with lib; {
userName = "Nathan McCarty"; userName = "Nathan McCarty";
userEmail = "nathan@mccarty.io"; userEmail = "nathan@mccarty.io";
signing = { signing = {
key = lib.mkDefault "B7A40A5D78C08885"; key = "B7A40A5D78C08885";
signByDefault = config.nathan.programs.util.git.gpgSign; signByDefault = config.nathan.programs.util.git.gpgSign;
}; };
ignores = [ ignores = [

View File

@ -21,6 +21,7 @@
# Setup WSL # Setup WSL
wsl = { wsl = {
enable = true; enable = true;
automountPath = "/mnt";
defaultUser = "nathan"; defaultUser = "nathan";
startMenuLaunchers = true; startMenuLaunchers = true;
}; };

View File

@ -22,12 +22,4 @@
}; };
}; };
}; };
# Setup git commit signing with ssh key
programs.git = {
extraConfig = {
commit.gpgsign = true;
gpg.format = "ssh";
user.signingkey = "~/.ssh/id_ed25519.pub";
};
};
} }