From 8bd6b91288b8e81da6a847019125cb81f7501925 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 09:41:41 -0500 Subject: [PATCH] stop locks racing --- modules/desktop/wm/lockscreen.nix | 7 ++----- modules/graphical/gtklock.nix | 13 ++++++++++++- modules/mobile/niri.nix | 8 ++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/desktop/wm/lockscreen.nix b/modules/desktop/wm/lockscreen.nix index ee6b0d4..9b7895e 100644 --- a/modules/desktop/wm/lockscreen.nix +++ b/modules/desktop/wm/lockscreen.nix @@ -4,19 +4,16 @@ lib, ... }: -let - lock = "pidof gtklock || ${lib.getExe config.programs.gtklock.package}"; -in { services.logind.settings.Login.HandlePowerKey = "suspend"; programs.fht-compositor = { # We log in automatically, so lock straight away. - settings.autostart = [ lock ]; + settings.autostart = [ "${config.quad.lock}" ]; sessionPrograms.hypridle = "${lib.getExe pkgs.hypridle} --config ${pkgs.writeText "hypridle.conf" '' general { - lock_cmd = ${lock} + lock_cmd = ${config.quad.lock} before_sleep_cmd = loginctl lock-session } ''}"; diff --git a/modules/graphical/gtklock.nix b/modules/graphical/gtklock.nix index 6af55e2..29df52d 100644 --- a/modules/graphical/gtklock.nix +++ b/modules/graphical/gtklock.nix @@ -1,5 +1,6 @@ { config, + lib, pkgs, ... }: @@ -129,7 +130,17 @@ let ''; in { - programs.gtklock = { + options.quad.lock = lib.mkOption { + type = lib.types.package; + readOnly = true; + description = "Locks the session with gtklock, unless it's already running."; + default = pkgs.writeShellScript "lock" '' + exec ${lib.getExe' pkgs.util-linux "flock"} --nonblock "$XDG_RUNTIME_DIR/gtklock.lock" \ + ${lib.getExe config.programs.gtklock.package} + ''; + }; + + config.programs.gtklock = { enable = true; config.main = { diff --git a/modules/mobile/niri.nix b/modules/mobile/niri.nix index b8046a7..6c4694c 100644 --- a/modules/mobile/niri.nix +++ b/modules/mobile/niri.nix @@ -32,13 +32,9 @@ let ]; }); - lock = pkgs.writeShellScript "lock" '' - ${lib.getExe' pkgs.procps "pidof"} gtklock || exec ${lib.getExe config.programs.gtklock.package} - ''; - hypridleConfig = pkgs.writeText "hypridle.conf" '' general { - lock_cmd = ${lock} + lock_cmd = ${config.quad.lock} before_sleep_cmd = loginctl lock-session } ''; @@ -115,7 +111,7 @@ in spawn-at-startup "${lib.getExe stevia}" spawn-at-startup "${lib.getExe' pkgs.swayosd "swayosd-server"}" "--style" "${swayosdStyle}" // We log in automatically, so lock straight away. - spawn-at-startup "${lock}" + spawn-at-startup "${config.quad.lock}" spawn-at-startup "${lib.getExe pkgs.hypridle}" "--config" "${hypridleConfig}" binds {