From e724778fcf55203cf4e7aa29c194ec8134189dcf Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 22 Feb 2024 10:03:12 +0100
Subject: [PATCH 1/3] Common/git: set delta theme to catppuccin-mocha

---
 roles/common/programs/git.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix
index ed5cc08..4ac4731 100644
--- a/roles/common/programs/git.nix
+++ b/roles/common/programs/git.nix
@@ -6,7 +6,12 @@
 			enable = true;
 			userName = "Toast";
 			userEmail = "toast003@tutamail.com";
-			delta.enable = true;
+			delta = {
+				enable = true;
+				options = {
+					syntax-theme = "catppuccin-mocha";
+				};
+			};
 			extraConfig = {
 				init.defaultBranch = "main";
 				commit.verbose = "true";

From 1132547d9161465120c3ac75ef71ad52b4c7a0d5 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 22 Feb 2024 23:58:08 +0100
Subject: [PATCH 2/3] Common/git: use catppuccin mocha theme

---
 roles/common/programs/git.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix
index 4ac4731..01f0108 100644
--- a/roles/common/programs/git.nix
+++ b/roles/common/programs/git.nix
@@ -1,5 +1,14 @@
 { config, pkgs, ... }:
 
+let
+	catppuccinDelta = pkgs.fetchFromGitHub {
+		owner = "catppuccin";
+		repo = "delta";
+		rev = "main";
+		hash = "sha256-0QQLkfLBVuB2re6tjtPNuOQZNK0MDBAIFgNGHZM8afs=";
+	};
+in
+
 {
 	home-manager.users.toast = {
 		programs.git = {
@@ -10,8 +19,10 @@
 				enable = true;
 				options = {
 					syntax-theme = "catppuccin-mocha";
+					features = "catppuccin-mocha";
 				};
 			};
+			includes = [{ path = "${catppuccinDelta}/themes/mocha.gitconfig"; }];
 			extraConfig = {
 				init.defaultBranch = "main";
 				commit.verbose = "true";

From dddd601fd262b0a8a1708c83761fabb396ef391d Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 22 Feb 2024 23:58:37 +0100
Subject: [PATCH 3/3] Git/common: enable diff colorMoved

---
 roles/common/programs/git.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix
index 01f0108..17fdf47 100644
--- a/roles/common/programs/git.nix
+++ b/roles/common/programs/git.nix
@@ -25,6 +25,7 @@ in
 			includes = [{ path = "${catppuccinDelta}/themes/mocha.gitconfig"; }];
 			extraConfig = {
 				init.defaultBranch = "main";
+				diff.colorMoved = "default";
 				commit.verbose = "true";
 			};
 		};