From c4c5502f196f5e7b14428e35b9613d26d9b97ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Wed, 12 Jun 2024 12:16:47 +0200
Subject: [PATCH] Improve hyprlock stuff

---
 home/hyprland/hypridle_magicman.conf | 6 +++---
 home/hyprland/hyprlock_magicman.conf | 2 +-
 home/scripts/randomwp.sh             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/home/hyprland/hypridle_magicman.conf b/home/hyprland/hypridle_magicman.conf
index f41c1ed..e9864fb 100644
--- a/home/hyprland/hypridle_magicman.conf
+++ b/home/hyprland/hypridle_magicman.conf
@@ -1,14 +1,14 @@
 general {
-    lock_cmd = hyprlock          # dbus/sysd lock command (loginctl lock-session)
+    lock_cmd = lockhelper # dbus/sysd lock command (loginctl lock-session)
     # unlock_cmd = notify-send "unlock!"      # same as above, but unlock
-    before_sleep_cmd = hyprlock    # command ran before sleep
+    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 = hyprlock # command to run when timeout has passed
+    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.
 }
 
diff --git a/home/hyprland/hyprlock_magicman.conf b/home/hyprland/hyprlock_magicman.conf
index fd5a982..e78a9d3 100644
--- a/home/hyprland/hyprlock_magicman.conf
+++ b/home/hyprland/hyprlock_magicman.conf
@@ -2,7 +2,7 @@ source = ~/.cache/wal/colors-hyprland.conf
 # BACKGROUND
 background {
     monitor =
-    path = /tmp/lock.png
+    path = /tmp/lockscreen/eDP-1.png
     blur_passes = 3
     contrast = 0.8916
     brightness = 0.8172
diff --git a/home/scripts/randomwp.sh b/home/scripts/randomwp.sh
index e257521..e364135 100644
--- a/home/scripts/randomwp.sh
+++ b/home/scripts/randomwp.sh
@@ -17,7 +17,7 @@ if [ "$#" -eq 1 ]; then
         echo "$wallpaper_path is an invalid wallpaper"
     fi
 else
-    wallpaper_path=$(find "$WALLPAPER_DIR" -mindepth 1 | grep png| sort -R | tail -n 1)
+    wallpaper_path=$(find "$WALLPAPER_DIR" -mindepth 1 | grep png| grep -v current| sort -R | tail -n 1)
 fi