update system

2026-10-03 12:11:51 +00:00 · 2026-07-14 14:33:45 +02:00
parent 8d2607c8ad
commit cbc6eaab1e
5 changed files with 30 additions and 30 deletions
@@ -27,4 +27,30 @@
        accel_profile = "flat";
      }
    ];
+  programs.git = {
+    enable = true;
+    signing = {
+      format = "openpgp";
+      key = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA";
+      signByDefault = true;
+    };
+    settings = {
+      user = {
+        email = "dev@theaninova.de";
+        name = "Thea Schöbl";
+      };
+      pull.rebase = true;
+      init.defaultBranch = "main";
+      merge = {
+        tool = "nvim-mergetool";
+        conflictstyle = "diff3";
+      };
+      mergetool.nvim-mergetool = {
+        cmd = # sh
+          ''nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'';
+        trustExitCode = true;
+      };
+      mergetool.prompt = false;
+    };
+  };
 }