From f753d6787429dcd7468c7eaab4a8d577b3a4eb20 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 5 Oct 2023 10:13:06 +0200
Subject: [PATCH 1/2] Gaming: install Heroic games launcher

---
 roles/gaming/programs/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/gaming/programs/default.nix b/roles/gaming/programs/default.nix
index dc70b10..ad5e946 100755
--- a/roles/gaming/programs/default.nix
+++ b/roles/gaming/programs/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ config, pkgs, ... }:
 
 {
 	imports = [
@@ -6,4 +6,7 @@
 		./mangohud.nix
 		./rpcs3.nix
 	];
+	environment.systemPackages = with pkgs; [
+		heroic
+	];
 }

From f2a3cbdbf656dca2927e2592fdd4f5293c543fd1 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 5 Oct 2023 12:47:23 +0200
Subject: [PATCH 2/2] Common: enable and configure Git

---
 roles/common/programs/default.nix |  1 +
 roles/common/programs/git.nix     | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 roles/common/programs/git.nix

diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index 1aa9c89..4d89ef0 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -9,6 +9,7 @@
 		./command-not-found.nix
 		./comma.nix
 		./bash.nix
+		./git.nix
 	];
 	# Some programs dont have a programs.*.enable option, so I install their package here
 	environment.systemPackages = with pkgs; [
diff --git a/roles/common/programs/git.nix b/roles/common/programs/git.nix
new file mode 100644
index 0000000..7a3e2bd
--- /dev/null
+++ b/roles/common/programs/git.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ... }:
+
+{
+	home-manager.users.toast = {
+		programs.git = {
+			enable = true;
+			delta.enable = true;
+			extraConfig = {
+				init.defaultBranch = "main";
+				pull.rebase = "interactive";
+			};
+		};
+	};
+}
+