From 05756be4a1fd88ea8de3a09706ed5f5c6bd5c6f8 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jul 2023 02:55:49 -0400 Subject: users/seth: enable ssh+gpg for git --- users/seth/programs/git.nix | 47 +++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) (limited to 'users/seth') diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix index bc19c8e..01b4277 100644 --- a/users/seth/programs/git.nix +++ b/users/seth/programs/git.nix @@ -1,25 +1,44 @@ { - lib, + config, pkgs, + osConfig, ... }: { - programs.git = { - enable = true; + programs = { + gpg.enable = true; - extraConfig = { - init = {defaultBranch = "main";}; - }; + git = { + enable = true; + + extraConfig = { + init = {defaultBranch = "main";}; + }; - signing = { - key = "D31BD0D494BBEE86"; - signByDefault = true; + signing = { + key = "D31BD0D494BBEE86"; + signByDefault = true; + }; + + userEmail = "getchoo@tuta.io"; + userName = "seth"; }; - userEmail = "getchoo@tuta.io"; - userName = "seth"; + ssh = { + enable = true; + package = pkgs.openssh; + }; }; - services.gpg-agent.extraConfig = lib.optionalString pkgs.stdenv.isLinux '' - pinentry-program /run/current-system/sw/bin/pinentry - ''; + services.gpg-agent = { + enable = true; + + enableBashIntegration = config.programs.bash.enable; + enableFishIntegration = config.programs.fish.enable; + enableZshIntegration = config.programs.zsh.enable; + + pinentryFlavor = + if osConfig ? programs + then osConfig.programs.gnupg.agent.pinentryFlavor or "curses" + else "curses"; + }; } -- cgit v1.2.3