From fbaf835e0f3e3ceb4baa896c97a32b75e0e7e0dd Mon Sep 17 00:00:00 2001
From: Adithya Nair <adtya@adtya.xyz>
Date: Sat, 8 Jul 2023 14:11:28 +0530
Subject: [PATCH] rebase when pulling by default

---
 home/programs/git.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index c5e1637..ef73534 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  secrets,
-  ...
-}: let
+{secrets, ...}: let
   user = secrets.users;
 in {
   programs.git = {
@@ -10,10 +6,7 @@ in {
     diff-so-fancy = {
       enable = true;
     };
-    userEmail =
-      if pkgs.stdenv.isLinux
-      then user.primary.emailAddress
-      else user.primary.workEmail;
+    userEmail = user.primary.emailAddress;
     userName = user.primary.realName;
     signing = {
       key = user.primary.pgpFingerprint;
@@ -22,6 +15,7 @@ in {
     extraConfig = {
       init.defaultBranch = "main";
       push.autoSetupRemote = true;
+      pull.rabase = true;
     };
     ignores = ["/.nix" "/.direnv"];
   };