From 5f3c944bba0fa5be2f1a9f44248707e061df994d Mon Sep 17 00:00:00 2001
From: "Casper V. Kristensen" <casper@vkristensen.dk>
Date: Mon, 2 Sep 2024 14:45:56 +0200
Subject: [PATCH] git: always use main email

---
 hosts/mu/default.nix |  1 -
 hosts/mu/git.nix     | 15 ---------------
 modules/base/git.nix |  5 +++++
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 hosts/mu/git.nix

diff --git a/hosts/mu/default.nix b/hosts/mu/default.nix
index 6a997f4..6122906 100644
--- a/hosts/mu/default.nix
+++ b/hosts/mu/default.nix
@@ -6,7 +6,6 @@
     ./hardware.nix
     ./fan.nix
     ./fish.nix
-    ./git.nix
     ./hosts.nix
     ./programs.nix
     ./sway.nix
diff --git a/hosts/mu/git.nix b/hosts/mu/git.nix
deleted file mode 100644
index 0fd2701..0000000
--- a/hosts/mu/git.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  home-manager,
-  lib,
-  ...
-}: {
-  home-manager.users.caspervk = {
-    programs.git = {
-      userEmail = lib.mkForce "vk@magenta.dk";
-      aliases = {
-        # https://docs.gitlab.com/ee/user/project/push_options.html
-        mr = "push --push-option=merge_request.create --push-option=merge_request.assign='vk'";
-      };
-    };
-  };
-}
diff --git a/modules/base/git.nix b/modules/base/git.nix
index a16c1cc..f68d462 100644
--- a/modules/base/git.nix
+++ b/modules/base/git.nix
@@ -28,6 +28,11 @@
         rebase.autoStash = true;
         rebase.updateRefs = true;
       };
+
+      aliases = {
+        # https://docs.gitlab.com/ee/user/project/push_options.html
+        mr = "push --push-option=merge_request.create --push-option=merge_request.assign='vk'";
+      };
     };
   };
 }