diff options
author | lassulus <lassulus@lassul.us> | 2021-01-18 21:13:46 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2021-01-18 21:13:46 +0100 |
commit | c5b36af49fdfac5934edd376c8de84a6947ebd4a (patch) | |
tree | d467593699cad09b06c779f60ce6164d55bf6f20 /tv/3modules | |
parent | dba3ca21f28dbb213d6dc44cfc301a958f87a623 (diff) | |
parent | ff6f5ef5e1cdbd27b2211c54643fa2754f888cbb (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/3modules')
-rw-r--r-- | tv/3modules/slock.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tv/3modules/slock.nix b/tv/3modules/slock.nix index 53f7f1f62..926adc8e0 100644 --- a/tv/3modules/slock.nix +++ b/tv/3modules/slock.nix @@ -28,6 +28,9 @@ in { }); ''; systemd.services."slock-${cfg.user.name}@" = { + conflicts = [ + "picom@%i.target" + ]; environment = { DISPLAY = ":%I"; LD_PRELOAD = pkgs.runCommandCC "slock-${cfg.user.name}.so" { @@ -61,6 +64,8 @@ in { restartIfChanged = false; serviceConfig = { ExecStart = "${pkgs.slock}/bin/slock"; + ExecStopPost = + "+${pkgs.systemd}/bin/systemctl start xsession@%i.target"; OOMScoreAdjust = -1000; Restart = "on-failure"; RestartSec = "100ms"; |