diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix index fcab9c3..98361ad 100644 --- a/modules/home/git/default.nix +++ b/modules/home/git/default.nix @@ -134,30 +134,34 @@ in }; }; - includes = [ + includes = lib.mkMerge [ # Multiple identities - { - condition = "gitdir:~/git/EPITA/"; - contents = { - user = { - name = "Bruno BELANYI"; - email = mkMailAddress "bruno.belanyi" "epita.fr"; + [ + { + condition = "gitdir:~/git/EPITA/"; + contents = { + user = { + name = "Bruno BELANYI"; + email = mkMailAddress "bruno.belanyi" "epita.fr"; + }; }; - }; - } - { - condition = "gitdir:~/git/work/"; - contents = { - user = { - name = "Bruno BELANYI"; - email = mkMailAddress "ambroisie" "google.com"; + } + { + condition = "gitdir:~/git/work/"; + contents = { + user = { + name = "Bruno BELANYI"; + email = mkMailAddress "ambroisie" "google.com"; + }; }; - }; - } + } + ] # Local configuration, not-versioned - { - path = "config.local"; - } + (lib.mkAfter [ + { + path = "config.local"; + } + ]) ]; ignores =