From f87f7d2007e330c0a2e05586fcc38a64cd2939d1 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Fri, 6 Jan 2023 00:14:08 +0100
Subject: [PATCH] swaylock-effects is causing issues with sway 1.8

---
 home-manager/modules/hyprland/default.nix | 2 +-
 home-manager/modules/sway/default.nix     | 3 ++-
 home-manager/modules/sway/powermenu.sh    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix
index d7ea974..70dd756 100644
--- a/home-manager/modules/hyprland/default.nix
+++ b/home-manager/modules/hyprland/default.nix
@@ -14,7 +14,7 @@ let
     qhd = ../sway/wallpapers/river-2560.png;
     uhd = ../sway/wallpapers/river-3840.png;
   };
-  swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ${wallpapers.qhd} --fade-in 0.5 --scaling fill";
+  swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${wallpapers.qhd} --scaling fill";
 
 in
 {
diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix
index 3a258f5..68e195c 100644
--- a/home-manager/modules/sway/default.nix
+++ b/home-manager/modules/sway/default.nix
@@ -11,7 +11,8 @@ with lib; let
     qhd = ./wallpapers/river-2560.png;
     uhd = ./wallpapers/river-3840.png;
   };
-  swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ${wallpapers.qhd} --fade-in 0.5 --scaling fill";
+  # swaylockcmd = "${pkgs.swaylock-effects}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ${wallpapers.qhd} --fade-in 0.5 --scaling fill";
+  swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image ${wallpapers.qhd} --scaling fill";
   rofiPower = pkgs.writeShellScriptBin "rofi-power" (builtins.readFile ./powermenu.sh);
 in
 {
diff --git a/home-manager/modules/sway/powermenu.sh b/home-manager/modules/sway/powermenu.sh
index dbf6439..f878d2c 100755
--- a/home-manager/modules/sway/powermenu.sh
+++ b/home-manager/modules/sway/powermenu.sh
@@ -23,7 +23,7 @@ exit_wm=""
 # Variable passed to rofi
 options="${shutdown}\n${reboot}\n${lock}\n${hibernate}\n${exit_wm}"
 uptime=$(uptime | awk '{print $1}' || true)
-lockcmd="swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image /home/erwin/.wallpapers/river-2560.png --fade-in 0.5 --scaling fill"
+lockcmd="swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --image /home/erwin/.wallpapers/river-2560.png --scaling fill"
 
 chosen="$(echo -e "${options}" | rofi -theme power -p "Uptime: ${uptime}" -dmenu -selected-row 2)"