Merge branch 'master' of github.com:ahub2/dotfiles

.config/sway/config

@@ -50,10 +50,10 @@ exec_always {
 # Example configuration:
 #
  exec swayidle -w \
-          timeout 900 'waylock &' \
+          timeout 900 'swaylock &' \
           timeout 1200 'swaymsg "output * dpms off"' \
                resume 'swaymsg "output * dpms on"' \
-          before-sleep 'waylock &'
+          before-sleep 'swaylock &'
 
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when