diff --git a/sway-home/.config/sway/autostart b/sway-home/.config/sway/autostart
index 4981d536..5c5fa9ee 100644
--- a/sway-home/.config/sway/autostart
+++ b/sway-home/.config/sway/autostart
@@ -1,5 +1,6 @@
 exec swaync -s /home/piotr/.config/swaync/preset-0.css
 exec nm-applet --indicator
+exec swayidle -w timeout 1200 nwg-lock timeout 1800 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep nwg-lock
 exec_always autotiling
 exec_always nwg-drawer -r -s preset-0.css -term foot
 exec_always nwg-panel -c preset-0 -s preset-0.css
diff --git a/sway-home/.config/sway/config b/sway-home/.config/sway/config
index 9dc61da2..bbb1ff35 100644
--- a/sway-home/.config/sway/config
+++ b/sway-home/.config/sway/config
@@ -47,16 +47,6 @@ set $laptop eDP-1
 bindswitch lid:on output $laptop disable
 bindswitch lid:off output $laptop enable
 
-### Idle configuration
-exec swayidle -w \
-    timeout 3000 'swaylock -f -c 212121' \
-    timeout 3300 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -f -c 212121'
-# This will lock your screen after 3000 seconds of inactivity, then turn off
-# your displays after another 3300 seconds, and turn your screens back on when
-# resumed. It will also lock your screen before your computer goes to sleep.
-
 #############         Bindings           ##################
 
 # kill focused window
diff --git a/sway-home/.local/share/nwg-shell-config/settings b/sway-home/.local/share/nwg-shell-config/settings
index a849191a..a52a1afb 100644
--- a/sway-home/.local/share/nwg-shell-config/settings
+++ b/sway-home/.local/share/nwg-shell-config/settings
@@ -47,5 +47,27 @@
   "touchpad-dwt": "enabled",
   "touchpad-middle-emulation": "enabled",
   "touchpad-custom-name": "",
-  "touchpad-custom-value": ""
+  "touchpad-custom-value": "",
+  "lockscreen-use-settings": true,
+  "lockscreen-locker": "swaylock",
+  "lockscreen-background-source": "local",
+  "lockscreen-custom-cmd": "",
+  "lockscreen-timeout": 1200,
+  "sleep-cmd": "swaymsg \"output * dpms off\"",
+  "sleep-timeout": 1800,
+  "resume-cmd": "swaymsg \"output * dpms on\"",
+  "before-sleep": "",
+  "backgrounds-custom-path": "",
+  "backgrounds-use-custom-path": false,
+  "background-dirs": [
+    "/usr/share/backgrounds/archlabs"
+  ],
+  "background-dirs-once-set": false,
+  "unsplash-width": 1920,
+  "unsplash-height": 1080,
+  "unsplash-keywords": [
+    "nature",
+    "water",
+    "landscape"
+  ]
 }