Merge remote-tracking branch 'origin/master'

This commit is contained in:
Gabriel Ebner 2020-07-15 11:37:32 +02:00
commit 460a893555

@ -154,8 +154,8 @@ exec --no-startup-id gsd-xsettings
bindsym $mod+Ctrl+l exec --no-startup-id ~/etc/swaylock.sh bindsym $mod+Ctrl+l exec --no-startup-id ~/etc/swaylock.sh
exec swayidle -w \ exec swayidle -w \
timeout 300 /home/gebner/etc/swaylock.sh \ timeout 240 /home/gebner/etc/swaylock.sh \
timeout 600 'swaymsg "output * dpms off"' \ timeout 330 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \ resume 'swaymsg "output * dpms on"' \
before-sleep /home/gebner/etc/swaylock.sh before-sleep /home/gebner/etc/swaylock.sh