From 0cd9faa2984fe7bff3c246802be792752ad3f042 Mon Sep 17 00:00:00 2001
From: q3aql <q3aql@duck.com>
Date: Wed, 14 May 2025 17:13:55 +0200
Subject: [PATCH] Restart nwg-wrapper after resume screen

---
 .config/sway/config                 |  2 +-
 .config/sway/display-tools.py       |  4 +---
 .config/sway/nwg-wrapper-conky.sh   | 10 ++++++++++
 .config/sway/startwlrscreensaver.sh |  6 ++++++
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100755 .config/sway/nwg-wrapper-conky.sh

diff --git a/.config/sway/config b/.config/sway/config
index 108cb42..4c91229 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -54,7 +54,7 @@ exec --no-startup-id WAYLAND_DISPLAY=wayland-1 wl-paste --watch clipman store
 
 # Load Conky
 #exec --no-startup-id sleep 10 && conky -c ~/.config/conky/conkyrc_sway &
-exec --no-startup-id sleep 10 && nwg-wrapper -s conky_sway.sh -r 2000 -p right -mr 15 -mt 10 -mb 80
+exec --no-startup-id sleep 10 && ~/.config/sway/nwg-wrapper-conky.sh
 
 # Use pactl to adjust volume in PulseAudio.
 #set $refresh_i3status killall -SIGUSR1 i3status
diff --git a/.config/sway/display-tools.py b/.config/sway/display-tools.py
index 50b3e29..a7ef460 100755
--- a/.config/sway/display-tools.py
+++ b/.config/sway/display-tools.py
@@ -58,9 +58,7 @@ class MainWindow:
 
   def exec_command4(self):
     print('# Start/Restart nwg-wrapper (conky sway)')
-    command = "killall nwg-wrapper && sleep 1"
-    os.system(command)
-    command = "nwg-wrapper -s conky_sway.sh -r 2000 -p right -mr 15 -mt 10 -mb 80 &"
+    command = "~/.config/sway/nwg-wrapper-conky.sh"
     os.system(command)
 
   def exec_command5(self):
diff --git a/.config/sway/nwg-wrapper-conky.sh b/.config/sway/nwg-wrapper-conky.sh
new file mode 100755
index 0000000..6e69e77
--- /dev/null
+++ b/.config/sway/nwg-wrapper-conky.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Stop previous process
+killall nwg-wrapper
+
+# Sleep 1s
+sleep 1
+
+# Start new process
+nwg-wrapper -s conky_sway.sh -r 2000 -p right -mr 15 -mt 10 -mb 80 &
diff --git a/.config/sway/startwlrscreensaver.sh b/.config/sway/startwlrscreensaver.sh
index 2de2a4d..305e4e0 100755
--- a/.config/sway/startwlrscreensaver.sh
+++ b/.config/sway/startwlrscreensaver.sh
@@ -12,6 +12,9 @@ LoadConfigResume="${HOME}/.config/sway/startwlrrandr.sh"
 # StateFile variable
 stateFile="${HOME}/.config/sway/screen-state"
 
+# Start/Restart nwg-wrapper
+nwgWrapperRestart="${HOME}/.config/sway/nwg-wrapper-conky.sh"
+
 # Function for sleep monitors
 function sleepMonitors() {
   # Check monitor 3
@@ -64,6 +67,9 @@ function resumeMonitors() {
   # Load monitors config quickly
   bash ${LoadConfigResume} screensaver
   echo "resume" > ${stateFile}
+  # Restart nwg-wrapper
+  sleep 2
+  bash ${nwgWrapperRestart}
 }
 
 # Boot parameters