diff options
| author | Soispha <soispha@vhack.eu> | 2024-02-23 20:54:19 +0100 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2024-02-23 20:54:19 +0100 |
| commit | 19b06fa82942cf2a703d212ef1761293242fa7bf (patch) | |
| tree | 9c442ff4fc09dee63b42e1b5d1eb78d0f26bd0d6 /hm | |
| parent | build(flake): Update (diff) | |
| download | nixos-config-19b06fa82942cf2a703d212ef1761293242fa7bf.tar.gz nixos-config-19b06fa82942cf2a703d212ef1761293242fa7bf.zip | |
feat(hm/conf/git): Switch to zdiff3 instead of diff3
Diffstat (limited to '')
| -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; }; }; |