From 5b68da7ee5216b35db966a1ae68ef38d2c5f91c2 Mon Sep 17 00:00:00 2001 From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com> Date: Tue, 30 Dec 2025 10:47:50 -0600 Subject: setup commit signing --- modules/terminal/hjem/programs/git.nix | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'modules/terminal/hjem/programs/git.nix') diff --git a/modules/terminal/hjem/programs/git.nix b/modules/terminal/hjem/programs/git.nix index d196f26..1c557bc 100644 --- a/modules/terminal/hjem/programs/git.nix +++ b/modules/terminal/hjem/programs/git.nix @@ -6,17 +6,25 @@ }: let cfg = config.collinux.terminal.programs.git; - git_config = { - alias = { - stage = "add"; - unstage = "restore --staged"; - }; - init.defaultBranch = "main"; - user = { - email = cfg.userEmail; - name = cfg.userName; - }; - }; + git_config = lib.mkMerge [ + { + alias = { + stage = "add"; + unstage = "restore --staged"; + }; + init.defaultBranch = "main"; + user = { + email = cfg.userEmail; + name = cfg.userName; + }; + } + (lib.mkIf cfg.installKey { + # commit signing + gpg.format = "ssh"; + user.signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3SjzIs3YI8PWJaNrAuaEeRcTcvIVHOKyCh2VwHTHEF"; + commit.gpgsign = "true"; + }) + ]; in { files = { ".config/git/config" = { -- cgit v1.3.1