refactor: make the whole thing more generic

2025-12-12 03:26:17 +00:00 · 2024-04-02 16:28:57 +02:00
parent 7b648e1955
commit 651f3ad808
193 changed files with 763 additions and 521 deletions
--- a/modules/home-manager/programs/git.nix
+++ b/modules/home-manager/programs/git.nix
@@ -0,0 +1,23 @@
+{
+  enable = true;
+  userName = "Thea Schöbl";
+  userEmail = "dev@theaninova.de";
+  signing = {
+    key = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA";
+    signByDefault = true;
+  };
+  extraConfig = {
+    pull.rebase = true;
+    merge = {
+      tool = "nvim-mergetool";
+      conflictstyle = "diff3";
+    };
+    mergetool.nvim-mergetool = {
+      cmd = ''
+        nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
+      '';
+      trustExitCode = true;
+    };
+    mergetool.prompt = false;
+  };
+}