diff options
| author | makefu <github@syntax-fehler.de> | 2021-01-27 22:57:15 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2021-01-27 22:57:15 +0100 |
| commit | 144edeee1030d647bcc64083efc5834d1628341d (patch) | |
| tree | 92f32df8dbc09b1bc36061267967b605628409b7 /tv/3modules | |
| parent | 9c6c20f69e7b76e4231ffeae715d2ee5d453bb4d (diff) | |
| parent | a2ca5f2e214be259fdb0f9ea92b79d74e6216a51 (diff) | |
Merge remote-tracking branch 'lass/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"; |