about summary refs log tree commit diff
path: root/machines/sternenseemann/base.nix
diff options
context:
space:
mode:
Diffstat (limited to 'machines/sternenseemann/base.nix')
-rw-r--r--machines/sternenseemann/base.nix19
1 files changed, 19 insertions, 0 deletions
diff --git a/machines/sternenseemann/base.nix b/machines/sternenseemann/base.nix
index ac555e24..7eb977fc 100644
--- a/machines/sternenseemann/base.nix
+++ b/machines/sternenseemann/base.nix
@@ -131,5 +131,24 @@ in {
       GIT_PAGER = bins.less;
       LESS = "-R";
     };
+
+    environment.etc."gitconfig".text = ''
+      [user]
+          email = sternenseemann@systemli.org
+          name = sternenseemann
+      [push]
+          default = matching
+      [pull]
+          rebase = true
+      [init]
+          defaultBranch = canon
+      [sendemail]
+          smtpEncryption = tls
+          smtpServer = mail.systemli.org
+          smtpUser = sternenseemann@systemli.org
+          smtpServerPort = 587
+      [merge]
+          conflictstyle = diff3
+    '';
   };
 }