diff --git a/modules/home/default.nix b/modules/home/default.nix
index e376b77..2e72f41 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -5,6 +5,7 @@
   home-manager.users.jake.home.stateVersion = "22.11";
 
   imports = [
+    ./git.nix
     ./tmux/default.nix
   ];
 
diff --git a/modules/home/git.nix b/modules/home/git.nix
new file mode 100644
index 0000000..f1fb230
--- /dev/null
+++ b/modules/home/git.nix
@@ -0,0 +1,22 @@
+{ pkgs, lib, config, ... }:
+
+{
+  home-manager.users.jake.programs.git = {
+    enable = true;
+    extraConfig = {
+      user = {
+        email = "jake@hillion.co.uk";
+        name = "Jake Hillion";
+      };
+      pull = {
+        rebase = true;
+      };
+      merge = {
+        conflictstyle = "diff3";
+      };
+      init = {
+        defaultBranch = "main";
+      };
+    };
+  };
+}