From 9d6eb1237ddaf15b447a5f60c1801ae075556664 Mon Sep 17 00:00:00 2001
From: Emma Thorpe <emma.thorpe@citrix.com>
Date: Tue, 2 Jun 2026 12:46:30 +0000
Subject: [PATCH] chore: update personal git, delta and editor config

Move git config to the settings option, switch to the standalone programs.delta module with git integration, add commitizen, and treat Jenkinsfiles as groovy.
---
 emmathorpe/home.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/emmathorpe/home.nix b/emmathorpe/home.nix
index a6ca088..306f58d 100644
--- a/emmathorpe/home.nix
+++ b/emmathorpe/home.nix
@@ -54,7 +54,8 @@
     size = 24;
 	};
 	home.packages = [
-		pkgs.element-desktop
+    pkgs.element-desktop
+    pkgs.commitizen
 	];
 	home.sessionVariables = {
 		MOZ_USE_XINPUT2 = "1";
@@ -79,19 +80,24 @@
       colorscheme peaksea
       set termguicolors
       set background=dark
+      au BufNewFile,BufRead *Jenkinsfile setf groovy
       '';
   };
   programs.git = {
     enable = true;
     package = pkgs.gitFull;
-    userName = "Emma Thorpe";
-    extraConfig = {
+    settings = {
+      user.name = "Emma Thorpe";
       push = {
         autoSetupRemote = true;
       };
+      init = {
+        defaultBranch = "main";
+      };
     };
-    delta = {
-      enable = true;
-    };
-  };  
+  };
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+  };
 }