From 6be185eb76295e7562f5bf2da42afe374b8beb15 Mon Sep 17 00:00:00 2001
From: Even Brenden <2512008+evenbrenden@users.noreply.github.com>
Date: Wed, 26 Feb 2025 22:41:55 +0100
Subject: [PATCH] screen-locker: set Restart=always for all services (#6534)

---
 modules/services/screen-locker.nix                           | 2 ++
 tests/modules/services/screen-locker/basic-configuration.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/services/screen-locker.nix b/modules/services/screen-locker.nix
index 085573f8..b552e1ba 100644
--- a/modules/services/screen-locker.nix
+++ b/modules/services/screen-locker.nix
@@ -127,6 +127,7 @@ in {
           ExecStart = concatStringsSep " "
             ([ "${cfg.xss-lock.package}/bin/xss-lock" "-s \${XDG_SESSION_ID}" ]
               ++ cfg.xss-lock.extraOptions ++ [ "-- ${cfg.lockCmd}" ]);
+          Restart = "always";
         };
       };
     }
@@ -153,6 +154,7 @@ in {
             "-locker '${pkgs.systemd}/bin/loginctl lock-session \${XDG_SESSION_ID}'"
           ] ++ optional cfg.xautolock.detectSleep "-detectsleep"
             ++ cfg.xautolock.extraOptions);
+          Restart = "always";
         };
       };
     })
diff --git a/tests/modules/services/screen-locker/basic-configuration.nix b/tests/modules/services/screen-locker/basic-configuration.nix
index 855370d2..e92a4a9f 100644
--- a/tests/modules/services/screen-locker/basic-configuration.nix
+++ b/tests/modules/services/screen-locker/basic-configuration.nix
@@ -19,7 +19,9 @@
 
     assertFileExists $xssService
     assertFileRegex $xssService 'ExecStart=.*/bin/xss-lock.*-test.*i3lock -n -c AA0000'
+    assertFileRegex $xssService 'Restart=always'
     assertFileExists $xautolockService
     assertFileRegex $xautolockService 'ExecStart=.*/bin/xautolock.*-time 5.*-detectsleep.*-test.*'
+    assertFileRegex $xautolockService 'Restart=always'
   '';
 }