From 612e5e35c0cab9ed9f836d1dc861a815d3921bbe Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 1 Oct 2022 23:12:48 +0200
Subject: [PATCH] Fix swayidle, lock, waybar menu

---
 modules/sway/config/config.d/mode_system.conf.nix | 15 +++++++++++----
 modules/sway/default.nix                          |  2 +-
 modules/sway/swayidle.service.nix                 |  8 ++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/modules/sway/config/config.d/mode_system.conf.nix b/modules/sway/config/config.d/mode_system.conf.nix
index f34ecc5..f01921c 100644
--- a/modules/sway/config/config.d/mode_system.conf.nix
+++ b/modules/sway/config/config.d/mode_system.conf.nix
@@ -1,15 +1,22 @@
-{ psCfg, ... }: ''
+{ pkgs, psCfg, ... }: ''
   # Set shut down, restart and locking features
+'' + (if psCfg.core.hibernation.enable && !psCfg.paranoia.enable then ''
+  set $mode_system (e)xit, (h)ibernate, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
+'' else if psCfg.paranoia.enable then ''
   set $mode_system (e)xit, (h)ibernate, (r)eboot, (Shift+s)hutdown
+'' else ''
+  set $mode_system (e)xit, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
+'')
++ ''
   bindsym $mod+0 mode "$mode_system"
   mode "$mode_system" {
       bindsym e exec swaymsg exit, mode "default"
 '' + (if psCfg.core.hibernation.enable then ''
-  bindsym h exec systemctl hibernate, mode "default"
+      bindsym h exec systemctl hibernate, mode "default"
 '' else "")
 + (if !psCfg.paranoia.enable then ''
-  bindsym l exec swaylock-bg, mode "default"
-  bindsym s exec systemctl suspend, mode "default"
+      bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default"
+      bindsym s exec systemctl suspend, mode "default"
 '' else "") + ''
       bindsym r exec systemctl reboot, mode "default"
       bindsym Shift+s exec systemctl poweroff, mode "default"
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index dd0e605..c173e9c 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -98,7 +98,7 @@ in
         xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf;
         xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf;
         xdg.configFile."sway/config.d/custom-keybindings.conf".source = ./config/config.d/custom-keybindings.conf;
-        xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix { inherit psCfg; };
+        xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix { inherit pkgs psCfg; };
         xdg.configFile."sway/config.d/applications.conf".source = ./config/config.d/applications.conf;
         xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf;
       };
diff --git a/modules/sway/swayidle.service.nix b/modules/sway/swayidle.service.nix
index 685d0f1..80a0451 100644
--- a/modules/sway/swayidle.service.nix
+++ b/modules/sway/swayidle.service.nix
@@ -9,14 +9,14 @@
   };
   Service = {
     Type = "simple";
-    Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin";
-    ExecStart = ''${pkgs.swayidle}/bin/swayidle -w \
+    Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin:${pkgs.swaylock-bg}/bin:${pkgs.swayidle}/bin";
+    ExecStart = ''swayidle -w \
         after-resume 'swaymsg "output * dpms on"' \
-        before-sleep '${pkgs.swaylock-bg}/bin/swaylock-bg' '' + (if psCfg.paranoia.enable then '' \
+        before-sleep 'swaylock-bg' '' + (if psCfg.paranoia.enable then '' \
         timeout 120 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
         timeout 150 'systemctl hibernate'
       '' else '' \
-        timeout 600 '${pkgs.swaylock-bg}/bin/swaylock-bg' \
+        timeout 600 'swaylock-bg' \
         timeout 900 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
       '');
   };