From cc20c415eebe51a31fe79282d2c8f1854abbf4ae Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jul 2023 03:22:42 -0400 Subject: users/seth: separate gpg/ssh config from git --- users/seth/programs/git.nix | 48 ++++++++++----------------------------------- 1 file changed, 10 insertions(+), 38 deletions(-) (limited to 'users/seth/programs/git.nix') diff --git a/users/seth/programs/git.nix b/users/seth/programs/git.nix index 59b5f4f..f496f90 100644 --- a/users/seth/programs/git.nix +++ b/users/seth/programs/git.nix @@ -1,45 +1,17 @@ -{ - config, - lib, - pkgs, - osConfig, - ... -}: { - programs = { - gpg.enable = true; - - git = { - enable = true; - - extraConfig = { - init = {defaultBranch = "main";}; - }; - - signing = { - key = "D31BD0D494BBEE86"; - signByDefault = true; - }; +_: { + programs.git = { + enable = true; - userEmail = "getchoo@tuta.io"; - userName = "seth"; + extraConfig = { + init = {defaultBranch = "main";}; }; - ssh = { - enable = true; - package = pkgs.openssh; + signing = { + key = "D31BD0D494BBEE86"; + signByDefault = true; }; - }; - - services.gpg-agent = lib.mkIf pkgs.stdenv.isLinux { - 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"; + userEmail = "getchoo@tuta.io"; + userName = "seth"; }; } -- cgit v1.2.3