stop locks racing
This commit is contained in:
parent
527374059e
commit
8bd6b91288
3 changed files with 16 additions and 12 deletions
|
|
@ -4,19 +4,16 @@
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
|
||||||
lock = "pidof gtklock || ${lib.getExe config.programs.gtklock.package}";
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
services.logind.settings.Login.HandlePowerKey = "suspend";
|
services.logind.settings.Login.HandlePowerKey = "suspend";
|
||||||
|
|
||||||
programs.fht-compositor = {
|
programs.fht-compositor = {
|
||||||
# We log in automatically, so lock straight away.
|
# 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" ''
|
sessionPrograms.hypridle = "${lib.getExe pkgs.hypridle} --config ${pkgs.writeText "hypridle.conf" ''
|
||||||
general {
|
general {
|
||||||
lock_cmd = ${lock}
|
lock_cmd = ${config.quad.lock}
|
||||||
before_sleep_cmd = loginctl lock-session
|
before_sleep_cmd = loginctl lock-session
|
||||||
}
|
}
|
||||||
''}";
|
''}";
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
@ -129,7 +130,17 @@ let
|
||||||
'';
|
'';
|
||||||
in
|
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;
|
enable = true;
|
||||||
|
|
||||||
config.main = {
|
config.main = {
|
||||||
|
|
|
||||||
|
|
@ -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" ''
|
hypridleConfig = pkgs.writeText "hypridle.conf" ''
|
||||||
general {
|
general {
|
||||||
lock_cmd = ${lock}
|
lock_cmd = ${config.quad.lock}
|
||||||
before_sleep_cmd = loginctl lock-session
|
before_sleep_cmd = loginctl lock-session
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
@ -115,7 +111,7 @@ in
|
||||||
spawn-at-startup "${lib.getExe stevia}"
|
spawn-at-startup "${lib.getExe stevia}"
|
||||||
spawn-at-startup "${lib.getExe' pkgs.swayosd "swayosd-server"}" "--style" "${swayosdStyle}"
|
spawn-at-startup "${lib.getExe' pkgs.swayosd "swayosd-server"}" "--style" "${swayosdStyle}"
|
||||||
// We log in automatically, so lock straight away.
|
// 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}"
|
spawn-at-startup "${lib.getExe pkgs.hypridle}" "--config" "${hypridleConfig}"
|
||||||
|
|
||||||
binds {
|
binds {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue