diff --git a/modules/other/git.nix b/modules/other/git.nix
index 2c7c748..48a5a3f 100644
--- a/modules/other/git.nix
+++ b/modules/other/git.nix
@@ -5,17 +5,29 @@
 }: let
   inherit (config.modules.other.system) username;
 in {
-  home-manager.users.${username} = {
-    home.packages = with pkgs; [gnupg];
-    programs.git = {
-      enable = true;
-      userName = "Charlie Root";
-      userEmail = "charlie@charlieroot.dev";
-      signing = {
-        key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPiRe9OH/VtWFWyy5QbAVcN7CLxr4zUtRCwmxD6aeN6";
-        signByDefault = true;
+  programs.git = {
+    enable = true;
+    lfs.enable = true;
+    config = {
+      user = {
+        name = "Charlie Root";
+        email = "charlie@charlieroot.dev";
+        signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPiRe9OH/VtWFWyy5QbAVcN7CLxr4zUtRCwmxD6aeN6";
+      };
+      init.defaultbranch = "main";
+      branch.autosetupmerge = "true";
+      merge.stat = "true";
+      pull.ff = "only";
+      gpg.format = "ssh";
+      commit.gpgsign = "true";
+      rebase = {
+        autoSquash = true;
+        autoStash = true;
+      };
+      rerere = {
+        enabled = true;
+        autoupdate = true;
       };
-      extraConfig.gpg.format = "ssh";
     };
   };
 }