From ae90629639e0301def0e72d63f94866534ab0179 Mon Sep 17 00:00:00 2001
From: Sijmen <me@sijman.nl>
Date: Mon, 8 Aug 2022 14:14:34 +0200
Subject: [PATCH] add git aliases and enable pull.rebase

---
 common/home-manager.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/home-manager.nix b/common/home-manager.nix
index 984d160..74f550b 100644
--- a/common/home-manager.nix
+++ b/common/home-manager.nix
@@ -85,6 +85,15 @@
         nsp = "nix-shell -p";
 
         cdnix = "cd /etc/nixos";
+
+        ga = "git add";
+        gc = "git commit";
+        gcm = "git commit -m";
+        gl = "git pull";
+        gla = "git pull --autostash";
+        gp = "git push";
+        gpf = "git push --force-with-lease";
+        tigs = "tig status";
       };
     };
 
@@ -149,6 +158,7 @@
       extraConfig = {
         fetch.prune = true;
         init.defaultBranch = "main";
+        pull.rebase = true;
         push.autoSetupRemote = true;
         safe.directory = [ "/etc/nixos" ];
       };