From 3f95678318365f70626a81bc68323dcaf9280e6f Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 31 May 2024 09:41:25 -0500 Subject: [PATCH] clean up --- nixos/home/modules/shell/git/default.nix | 25 ++++++++++-------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/nixos/home/modules/shell/git/default.nix b/nixos/home/modules/shell/git/default.nix index c215de6..b8ede7f 100644 --- a/nixos/home/modules/shell/git/default.nix +++ b/nixos/home/modules/shell/git/default.nix @@ -33,24 +33,19 @@ in userEmail = cfg.email; extraConfig = { - core = { - autocrlf = "input"; - }; - init = { - defaultBranch = "main"; - }; - pull = { - rebase = true; - }; - rebase = { - autoStash = true; - }; - user = { - signingKey = cfg.signingKey; - }; + core.autocrlf = "input"; + init.defaultBranch = "main"; + pull.rebase = true; + rebase.autoStash = true; + # public key for signing commits + user.signingKey = cfg.signingKey; + # ssh instead of gpg gpg.format = "ssh"; # gpg.ssh.program = "/etc/profiles/per-user/jahanson/bin/op-ssh-sign"; + # 1password signing gui git signing gpg.ssh.program = "${pkgs._1password-gui}/bin/op-ssh-sign"; + # Auto sign commits without -S + commit.gpgsign = true; }; aliases = { co = "checkout";