home: git: use 'mkAfter' for local config include
All checks were successful
ci/woodpecker/push/check Pipeline was successful
All checks were successful
ci/woodpecker/push/check Pipeline was successful
This should ensure that it will be included at the very end of the configuration, allowing it to override any other options in the file. Not sure that I _really_ need it, but it's tidier this way.
This commit is contained in:
parent
1237ef4174
commit
7df5426ecb
1 changed files with 24 additions and 20 deletions
|
|
@ -162,30 +162,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 =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue