diff --git a/lib/shared/modules/git.nix b/lib/shared/modules/git.nix index ea54306f..5f1b5170 100644 --- a/lib/shared/modules/git.nix +++ b/lib/shared/modules/git.nix @@ -21,15 +21,6 @@ ''; - xdg.configFile."git/ignore".text = '' - /.direnv/ - /.ignored/ - /.issue-id - /.phpactor.json - /notes - /todo - ''; - programs = { git = { enable = true; @@ -93,6 +84,16 @@ worktrees = "worktree list"; }; + ignores = [ + "/.ddev/providers/" + "/.direnv/" + "/.ignored/" + "/.issue-id" + "/.phpactor.json" + "/notes" + "/todo" + ]; + extraConfig = { branch = { autosetupmerge = true;