From 19b06fa82942cf2a703d212ef1761293242fa7bf Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Fri, 23 Feb 2024 20:54:19 +0100
Subject: feat(hm/conf/git): Switch to zdiff3 instead of diff3
---
hm/soispha/conf/git/default.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'hm/soispha/conf/git/default.nix')
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;
};
};
--
cgit 1.4.1