feat: integrate system config

2026-01-07 00:02:50 +00:00 · 2023-12-23 00:34:40 +01:00
parent f082d6eb65
commit 044e96eda4
140 changed files with 638 additions and 229 deletions
--- a/home/programs/git.nix
+++ b/home/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;
+  };
+}