diff options
-rw-r--r-- | common/commandline/git.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/common/commandline/git.nix b/common/commandline/git.nix index 914cdb4..e3ca37f 100644 --- a/common/commandline/git.nix +++ b/common/commandline/git.nix | |||
@@ -11,6 +11,11 @@ inputs: | |||
11 | userEmail = "minijackson@riseup.net"; | 11 | userEmail = "minijackson@riseup.net"; |
12 | userName = "Minijackson"; | 12 | userName = "Minijackson"; |
13 | 13 | ||
14 | signing = { | ||
15 | signByDefault = true; | ||
16 | key = "minijackson@riseup.net"; | ||
17 | }; | ||
18 | |||
14 | extraConfig = | 19 | extraConfig = |
15 | let | 20 | let |
16 | deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta"; | 21 | deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta"; |
@@ -58,7 +63,15 @@ inputs: | |||
58 | }; | 63 | }; |
59 | 64 | ||
60 | home-manager.users.root = { ... }: { | 65 | home-manager.users.root = { ... }: { |
61 | programs.git = | 66 | programs.git = with lib; |
62 | lib.mkDefault config.home-manager.users.minijackson.programs.git; | 67 | mkMerge [ |
68 | (mkDefault config.home-manager.users.minijackson.programs.git) | ||
69 | { | ||
70 | signing = { | ||
71 | signByDefault = false; | ||
72 | key = null; | ||
73 | }; | ||
74 | } | ||
75 | ]; | ||
63 | }; | 76 | }; |
64 | } | 77 | } |