hyprland: remove lockhelper, use hyprlock directly

home/hosts/gunter/default.nix

@@ -55,7 +55,6 @@
         ];
 
         hyprland.enableStreamController = true;
-        hyprland.useLockHelper = true;
         hyprland.enableGrimblast = true;
         hyprland.enableWacom = true;
         hyprland.cursorNoHardware = true;

home/hyprland/default.nix

@@ -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 =
+          lock_cmd = "${pkgs.hyprlock}/bin/hyprlock";
-            if cfg.useLockHelper then
-              "${pkgs.callPackage ../scripts/lockhelper.nix { }}/bin/lockhelper"
-            else
-              "${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,${
+          "$shiftMainMod,l,exec,${pkgs.hyprlock}/bin/hyprlock"
-            if cfg.useLockHelper then
-              "${pkgs.callPackage ../scripts/lockhelper.nix { }}/bin/lockhelper"
-            else
-              "${pkgs.hyprlock}/bin/hyprlock"
-          }"
           # hyprland
           "$mainMod,Q,killactive,"
           "CTRLALT,Delete,exit,"

home/hyprland/hypridle_gunter.conf

@@ -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
-}

home/hyprland/hypridle_magicman.conf

@@ -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.
-}

home/scripts/lockhelper.nix

@@ -1,21 +0,0 @@
-{
-  writeShellApplication,
-  grim,
-  jq,
-  gawk,
-  hyprland,
-  hyprlock,
-  procps,
-}:
-writeShellApplication {
-  name = "lockhelper";
-  runtimeInputs = [
-    grim
-    jq
-    gawk
-    hyprland
-    hyprlock
-    procps
-  ];
-  text = (builtins.readFile ./lockhelper.sh);
-}

home/scripts/lockhelper.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-
-mkdir -p /tmp/lockscreen || true
-
-monitor_lines=$(hyprctl monitors -j | jq -r '.[] | select (.name | contains ("DP")) | [.name, .description]| @tsv')
-
-while IFS= read -r m; do
-    name=$(echo "$m" | awk -F $'\t' '{print $1}')
-    sum=$(echo "$m" | awk -F $'\t' '{printf $2}' | sha256sum | awk '{print substr($1,1,8)}')
-
-    grim -o "$name" "/tmp/lockscreen/$sum.png" || true
-done <<< "$monitor_lines"
-
-# Only lock if not already running
-if [ -z "$(pgrep hyprlock)" ] 
-then 
-    exec hyprlock
-else
-    echo "Already locked"
-fi