Move wayland-services to s6.

Also:

- moved the services directory to a less hidden position.
- update swaylock config.
- use wayland-logout in killing script (it's provided by wf-shell >= 0.6.0)

media/.local/bin/spd

@@ -1,4 +1,3 @@
 #!/bin/execlineb -P
-foreground
-{ sv up spotifyd }
-sv reload spotifyd
+importas HOME HOME
+s6-svc -r ${HOME}/services/spotifyd

utils/.local/bin/s6-svscan-tty

@@ -0,0 +1,3 @@
+#!/bin/execlineb -S0
+trap -x { SIGINT { importas pid ! kill -SIGTERM $pid } } setsid s6-svscan $@
+# useful for running s6-svscan on a terminal

wayland/.config/swaylock/config

@@ -5,7 +5,5 @@
 #   \___||_|   |_| \___| \___/ |_| |_||_|   
 #                                           
 
-daemonize
 color=000000
 image=~/Pictures/wallpaper.png
-

wayland/.local/bin/kill-sway

@@ -1,6 +0,0 @@
-#!/bin/sh
-# TODO: some way of checking if this is the right runsvdir instance to kill
-
-echo "Quitting sway"
-pkill -HUP -f "^runsvdir $HOME/.local/share/wayland-services"
-swaymsg exit

wayland/.local/bin/runsvdir-sway

@@ -1,7 +1,3 @@
-#!/bin/sh
-
-pgrep -f "^runsvdir $HOME/.local/share/wayland-services" &&
-	exec echo "runsvdir has already been launched"
-
-exec runsvdir "$HOME/.local/share/wayland-services" \
-	'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+#!/bin/execlineb -P
+importas HOME HOME
+s6-svscan ${HOME}/services

wayland/.local/bin/runsvdir-sway-kill

@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+importas HOME HOME
+foreground
+{ s6-svscanctl -t ${HOME}/services }
+wayland-logout

wayland/services/.gitignore

@@ -1 +1,2 @@
 supervise/
+event/

wayland/services/.s6-svscan/finish

@@ -0,0 +1,2 @@
+#!/bin/execlineb -P
+exit