From cf1cbd5c481cf86c42fc71fa5dca4b7d53b3c0d8 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Mon, 27 Mar 2023 18:37:02 -0400 Subject: [PATCH] Git ssh signing darwin also fix defaults woop --- home-manager/common/programs/core.nix | 4 ---- machines/extremophile/home.nix | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/home-manager/common/programs/core.nix b/home-manager/common/programs/core.nix index 80be469..afcafee 100644 --- a/home-manager/common/programs/core.nix +++ b/home-manager/common/programs/core.nix @@ -86,10 +86,6 @@ with lib; { package = pkgs.gitAndTools.gitFull; userName = "Nathan McCarty"; userEmail = "nathan@mccarty.io"; - signing = { - key = lib.mkDefault "B7A40A5D78C08885"; - signByDefault = config.nathan.programs.util.git.gpgSign; - }; ignores = [ "**/*~" "*~" diff --git a/machines/extremophile/home.nix b/machines/extremophile/home.nix index f7151e7..1cb982f 100644 --- a/machines/extremophile/home.nix +++ b/machines/extremophile/home.nix @@ -14,4 +14,12 @@ }; config = { isDesktop = true; }; }; + # Setup git commit signing with ssh key + programs.git = { + extraConfig = { + commit.gpgSign = true; + gpg.format = "ssh"; + user.signingKey = "~/.ssh/id_ed25519.pub"; + }; + }; }