hyprland: remove lockhelper, use hyprlock directly
This commit is contained in:
@@ -31,8 +31,6 @@ in
|
||||
|
||||
enableStreamController = mkEnableOption "streamcontroller service";
|
||||
|
||||
useLockHelper = mkEnableOption "use lockhelper script instead of hyprlock directly";
|
||||
|
||||
enableGrimblast = mkEnableOption "grimblast screenshot keybinds";
|
||||
|
||||
enableWacom = mkEnableOption "Wacom tablet device configuration";
|
||||
@@ -108,11 +106,7 @@ in
|
||||
enable = true;
|
||||
settings = {
|
||||
general = {
|
||||
lock_cmd =
|
||||
if cfg.useLockHelper then
|
||||
"${pkgs.callPackage ../scripts/lockhelper.nix { }}/bin/lockhelper"
|
||||
else
|
||||
"${pkgs.hyprlock}/bin/hyprlock";
|
||||
lock_cmd = "${pkgs.hyprlock}/bin/hyprlock";
|
||||
ignore_dbus_inhibit = false;
|
||||
};
|
||||
listener = {
|
||||
@@ -297,12 +291,7 @@ in
|
||||
"$mainMod,D,exec,rofi-launcher"
|
||||
"$mainMod,P,exec,rofi-rbw"
|
||||
# hyprlock
|
||||
"$shiftMainMod,l,exec,${
|
||||
if cfg.useLockHelper then
|
||||
"${pkgs.callPackage ../scripts/lockhelper.nix { }}/bin/lockhelper"
|
||||
else
|
||||
"${pkgs.hyprlock}/bin/hyprlock"
|
||||
}"
|
||||
"$shiftMainMod,l,exec,${pkgs.hyprlock}/bin/hyprlock"
|
||||
# hyprland
|
||||
"$mainMod,Q,killactive,"
|
||||
"CTRLALT,Delete,exit,"
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
general {
|
||||
lock_cmd = hyprlock # dbus/sysd lock command (loginctl lock-session)
|
||||
# unlock_cmd = notify-send "unlock!" # same as above, but unlock
|
||||
before_sleep_cmd = lockhelper # command ran before sleep
|
||||
# after_sleep_cmd = # command ran after sleep
|
||||
ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
|
||||
}
|
||||
|
||||
listener {
|
||||
timeout = 240 # in seconds
|
||||
on-timeout = lockhelper # command to run when timeout has passed
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
general {
|
||||
lock_cmd = lockhelper # dbus/sysd lock command (loginctl lock-session)
|
||||
# unlock_cmd = notify-send "unlock!" # same as above, but unlock
|
||||
before_sleep_cmd = lockhelper # command ran before sleep
|
||||
# after_sleep_cmd = lockhelper # command ran after sleep
|
||||
ignore_dbus_inhibit = false # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
|
||||
}
|
||||
|
||||
listener {
|
||||
timeout = 240 # in seconds
|
||||
on-timeout = lockhelper # command to run when timeout has passed
|
||||
# on-resume = notify-send "Welcome back!" # command to run when activity is detected after timeout has fired.
|
||||
}
|
||||
|
||||
listener {
|
||||
timeout = 900
|
||||
on-timeout = systemctl suspend # command to run when timeout has passed
|
||||
# on-resume = notify-send "Welcome back!" # command to run when activity is detected after timeout has fired.
|
||||
}
|
||||
Reference in New Issue
Block a user