diff options
| -rw-r--r-- | hm/soispha/conf/git/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hm/soispha/conf/git/default.nix b/hm/soispha/conf/git/default.nix index d7b78fec..491b3648 100644 --- a/hm/soispha/conf/git/default.nix +++ b/hm/soispha/conf/git/default.nix @@ -134,7 +134,7 @@ in { markUnblamables = true; }; merge = { - conflictstyle = "diff3"; + conflictstyle = "zdiff3"; }; url = { "git@codeberg.org:" = { @@ -164,8 +164,7 @@ in { condition = "gitdir:~/school/"; contents = { user = { - name = nixosConfig.soispha.secret.me.name; - email = nixosConfig.soispha.secret.me.email; + inherit (nixosConfig.soispha.secret.me) name email; signingKey = nixosConfig.soispha.secret.me.gpgKey; }; }; |