From fb1ce98514667838b98e811074d4841cd6f25432 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Wed, 26 Nov 2025 15:49:49 +0100
Subject: [PATCH] home: git: move settings around

---
 home/git.nix | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/home/git.nix b/home/git.nix
index 11a57ae..a70301c 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -17,19 +17,18 @@ in {
   config = mkIf cfg.enable {
     programs.git = {
       enable = true;
-
-      delta = {
-        enable = true;
-        options = {
-          syntax-theme = "Solarized (light)";
-        };
-      };
       lfs.enable = true;
 
-      userEmail = "antoine@alarsyo.net";
-      userName = "Antoine Martin";
-
-      extraConfig = {
+      settings = {
+        user = {
+          name = "Antoine Martin";
+          email = "antoine@alarsyo.net";
+        };
+        alias = {
+          push-wip = "push -o ci.skip";
+          push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
+          push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
+        };
         commit = {verbose = true;};
         core = {editor = "vim";};
         init = {defaultBranch = "main";};
@@ -38,12 +37,6 @@ in {
         maintenance.prefetch.enabled = false;
       };
 
-      aliases = {
-        push-wip = "push -o ci.skip";
-        push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
-        push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
-      };
-
       includes = [
         {
           condition = "gitdir:~/work/lrde/";
@@ -64,5 +57,13 @@ in {
         "/.envrc"
       ];
     };
+
+    programs.delta = {
+      enable = true;
+      enableGitIntegration = true;
+      options = {
+        syntax-theme = "Solarized (light)";
+      };
+    };
   };
 }