Update i3 configuration, move session commands in xinitrc.

i3/i3/scripts/genconfig.bash

@@ -31,3 +31,8 @@ else
 fi
 
 echo "$SESSION_CONF"
+
+# if we got any parameters, tell i3 to reload the config
+# so the script can be used both on startup without reload (as i3 is not even
+# running yet) and later when reloading
+[[ -n "$1" ]] && i3-msg reload

i3/i3/scripts/i3exit.bash

@@ -28,6 +28,9 @@ lock()
         background_options="--color $FALLBACK_COLOR"
     fi
     i3lock $background_options
+    retval=$?
+    [[ -z "$1" ]] && sleep 1 && xset dpms force off
+    return $retval
 }
 
 log "[I] Received signal \"$1\"."
@@ -43,7 +46,7 @@ case "$1" in
         ;;
     suspend)
         log "[I] Suspending."
-        lock && systemctl suspend
+        lock "1" && systemctl suspend
         ;;
     hibernate)
         log "[I] Hibernating."