conflict cleanup with mozilla and thunderbird mount

This commit is contained in:
Charlotte 🦝 Delenk 2024-11-22 20:35:07 +01:00
parent 80fc93efe5
commit aabf260a7f
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122

View file

@ -69,6 +69,10 @@ with lib;
partOf = [ partOf = [
"user@${toString cfg.uid}.service" "user@${toString cfg.uid}.service"
]; ];
conflicts = [
"home-darkkirb-.mozilla.mount"
"home-darkkirb-.thunderbird.mount"
];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
script = '' script = ''
if [[ -e ${cfg.home} ]]; then if [[ -e ${cfg.home} ]]; then
@ -100,11 +104,17 @@ with lib;
{ {
name = "home-manager-${name}"; name = "home-manager-${name}";
value = { value = {
wants = [
"home-darkkirb-.mozilla.mount"
"home-darkkirb-.thunderbird.mount"
];
wantedBy = [ wantedBy = [
"user@${toString cfg.uid}.service" "user@${toString cfg.uid}.service"
]; ];
after = [ after = [
"cleanup-home-${name}.service" "cleanup-home-${name}.service"
"home-darkkirb-.mozilla.mount"
"home-darkkirb-.thunderbird.mount"
]; ];
before = [ before = [
"user@${toString cfg.uid}.service" "user@${toString cfg.uid}.service"