From 5cf0960459ca7d0409eb30d905b14f924e2ad525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Tue, 28 Jan 2025 01:20:27 +0100
Subject: [PATCH] Gitignore

---
 home/git/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/home/git/default.nix b/home/git/default.nix
index 9521f1a..7547981 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -1,4 +1,4 @@
-{ inputs, config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
     programs.git = {
@@ -11,11 +11,13 @@
         };
         ignores = [
             "*.direnv/"
+            ".dmypy.json"
         ];
         extraConfig = {
             credentials.helper = "store";
             pull.rebase = false;
             push.autoSetupRemove = true;
+            branch.autoSetupMerge = "simple";
             init.defaultBranch = "master";
             diff.noprefix = true;
             color.ui = "auto";