s6: river and stuff

94 files changed, 174 insertions, 47 deletions

diff --git a/.config/s6-rc/dbus/finish b/.config/s6-rc/dbus/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/dbus/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/default/contents.d/sway b/.config/s6-rc/default/contents.d/statusbar
index e69de29..e69de29 100644
--- a/.config/s6-rc/default/contents.d/sway
+++ b/.config/s6-rc/default/contents.d/statusbar
diff --git a/.config/s6-rc/default/contents.d/swaybg b/.config/s6-rc/default/contents.d/wayland
index e69de29..e69de29 100644
--- a/.config/s6-rc/default/contents.d/swaybg
+++ b/.config/s6-rc/default/contents.d/wayland
diff --git a/.config/s6-rc/ii/contents.d/ii-chat.sr.ht b/.config/s6-rc/default/contents.d/wbg
index e69de29..e69de29 100644
--- a/.config/s6-rc/ii/contents.d/ii-chat.sr.ht
+++ b/.config/s6-rc/default/contents.d/wbg
diff --git a/.config/s6-rc/eww-log/consumer-for b/.config/s6-rc/eww-log/consumer-for
new file mode 100644
index 0000000..3817e7a
--- /dev/null
+++ b/.config/s6-rc/eww-log/consumer-for
@@ -0,0 +1 @@
+eww
diff --git a/.config/s6-rc/swaybg-log/notification-fd b/.config/s6-rc/eww-log/notification-fd
index 00750ed..00750ed 100644
--- a/.config/s6-rc/swaybg-log/notification-fd
+++ b/.config/s6-rc/eww-log/notification-fd
diff --git a/.config/s6-rc/eww-log/pipeline-name b/.config/s6-rc/eww-log/pipeline-name
new file mode 100644
index 0000000..f2d8804
--- /dev/null
+++ b/.config/s6-rc/eww-log/pipeline-name
@@ -0,0 +1 @@
+eww-pipeline
diff --git a/.config/s6-rc/eww-log/run b/.config/s6-rc/eww-log/run
new file mode 100755
index 0000000..64b7783
--- /dev/null
+++ b/.config/s6-rc/eww-log/run
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+importas -i HOME HOME
+exec -c
+s6-log -d3 -- t ${HOME}/.local/state/s6/logs/eww
diff --git a/.config/s6-rc/ii-chat.sr.ht/type b/.config/s6-rc/eww-log/type
index 5883cff..5883cff 100644
--- a/.config/s6-rc/ii-chat.sr.ht/type
+++ b/.config/s6-rc/eww-log/type
diff --git a/.config/s6-rc/eww/data/check b/.config/s6-rc/eww/data/check
new file mode 100755
index 0000000..f460ac1
--- /dev/null
+++ b/.config/s6-rc/eww/data/check
@@ -0,0 +1,2 @@
+#!/command/execlineb -P
+redirfd -w 1 /dev/null fdmove -c 2 1 eww ping
diff --git a/.config/s6-rc/ii/contents.d/ii-libera.chat b/.config/s6-rc/eww/dependencies.d/wayland
index e69de29..e69de29 100644
--- a/.config/s6-rc/ii/contents.d/ii-libera.chat
+++ b/.config/s6-rc/eww/dependencies.d/wayland
diff --git a/.config/s6-rc/eww/finish b/.config/s6-rc/eww/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/eww/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/eww/notification-fd b/.config/s6-rc/eww/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/.config/s6-rc/eww/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/.config/s6-rc/eww/producer-for b/.config/s6-rc/eww/producer-for
new file mode 100644
index 0000000..f49fd8d
--- /dev/null
+++ b/.config/s6-rc/eww/producer-for
@@ -0,0 +1 @@
+eww-log
diff --git a/.config/s6-rc/eww/run b/.config/s6-rc/eww/run
new file mode 100755
index 0000000..a0258fa
--- /dev/null
+++ b/.config/s6-rc/eww/run
@@ -0,0 +1,6 @@
+#!/bin/execlineb -P
+fdmove -c 2 1
+importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
+s6-notifyoncheck
+eww daemon --no-daemonize
diff --git a/.config/s6-rc/ii-libera.chat/type b/.config/s6-rc/eww/type
index 5883cff..5883cff 100644
--- a/.config/s6-rc/ii-libera.chat/type
+++ b/.config/s6-rc/eww/type
diff --git a/.config/s6-rc/ii-chat.sr.ht/run b/.config/s6-rc/ii-chat.sr.ht/run
deleted file mode 100755
index 9bee56d..0000000
--- a/.config/s6-rc/ii-chat.sr.ht/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/execlineb -P
-importas -i HOME HOME
-backtick IIPASS { cat ${HOME}/irc/.password }
-export CADIR /etc/ssl/certs
-s6-tlsclient chat.sr.ht 6697
-redirfd -w 1 /dev/null
-ii -s chat.sr.ht -k IIPASS -n stonks3141/chat.sr.ht
diff --git a/.config/s6-rc/ii-libera.chat/run b/.config/s6-rc/ii-libera.chat/run
deleted file mode 100755
index cf5705e..0000000
--- a/.config/s6-rc/ii-libera.chat/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/execlineb -P
-importas -i HOME HOME
-backtick IIPASS { cat ${HOME}/irc/.password }
-export CADIR /etc/ssl/certs
-s6-tlsclient chat.sr.ht 6697
-redirfd -w 1 /dev/null
-ii -s libera.chat -k IIPASS -n stonks3141/irc.libera.chat
diff --git a/.config/s6-rc/ii-oftc.net/run b/.config/s6-rc/ii-oftc.net/run
deleted file mode 100755
index f19c7ff..0000000
--- a/.config/s6-rc/ii-oftc.net/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/execlineb -P
-importas -i HOME HOME
-backtick IIPASS { cat ${HOME}/irc/.password }
-export CADIR /etc/ssl/certs
-s6-tlsclient chat.sr.ht 6697
-redirfd -w 1 /dev/null
-ii -s oftc.net -k IIPASS -n stonks3141/irc.oftc.net
diff --git a/.config/s6-rc/ii-tilde.chat/run b/.config/s6-rc/ii-tilde.chat/run
deleted file mode 100755
index 488f9a8..0000000
--- a/.config/s6-rc/ii-tilde.chat/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/execlineb -P
-importas -i HOME HOME
-backtick IIPASS { cat ${HOME}/irc/.password }
-export CADIR /etc/ssl/certs
-s6-tlsclient chat.sr.ht 6697
-redirfd -w 1 /dev/null
-ii -s tilde.chat -k IIPASS -n stonks3141/irc.tilde.chat
diff --git a/.config/s6-rc/pipewire-pulse/finish b/.config/s6-rc/pipewire-pulse/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/pipewire-pulse/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/pipewire/finish b/.config/s6-rc/pipewire/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/pipewire/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/river-log/consumer-for b/.config/s6-rc/river-log/consumer-for
new file mode 100644
index 0000000..5f58d4e
--- /dev/null
+++ b/.config/s6-rc/river-log/consumer-for
@@ -0,0 +1 @@
+river
diff --git a/.config/s6-rc/river-log/notification-fd b/.config/s6-rc/river-log/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/.config/s6-rc/river-log/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/.config/s6-rc/river-log/pipeline-name b/.config/s6-rc/river-log/pipeline-name
new file mode 100644
index 0000000..77c6e7a
--- /dev/null
+++ b/.config/s6-rc/river-log/pipeline-name
@@ -0,0 +1 @@
+river-pipeline
diff --git a/.config/s6-rc/river-log/run b/.config/s6-rc/river-log/run
new file mode 100755
index 0000000..ff52209
--- /dev/null
+++ b/.config/s6-rc/river-log/run
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+importas -i HOME HOME
+exec -c
+s6-log -d3 -- t ${HOME}/.local/state/s6/logs/river
diff --git a/.config/s6-rc/ii-oftc.net/type b/.config/s6-rc/river-log/type
index 5883cff..5883cff 100644
--- a/.config/s6-rc/ii-oftc.net/type
+++ b/.config/s6-rc/river-log/type
diff --git a/.config/s6-rc/ii/contents.d/ii-oftc.net b/.config/s6-rc/river/dependencies.d/dbus
index e69de29..e69de29 100644
--- a/.config/s6-rc/ii/contents.d/ii-oftc.net
+++ b/.config/s6-rc/river/dependencies.d/dbus
diff --git a/.config/s6-rc/river/finish b/.config/s6-rc/river/finish
new file mode 100755
index 0000000..4c78186
--- /dev/null
+++ b/.config/s6-rc/river/finish
@@ -0,0 +1,5 @@
+#!/bin/execlineb -S2
+importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+foreground { s6-rc -l ${XDG_RUNTIME_DIR}/s6-rc -bDa change }
+s6-svscanctl -t ${XDG_RUNTIME_DIR}/service
+exit 125
diff --git a/.config/s6-rc/river/notification-fd b/.config/s6-rc/river/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/.config/s6-rc/river/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/.config/s6-rc/river/producer-for b/.config/s6-rc/river/producer-for
new file mode 100644
index 0000000..051e7e4
--- /dev/null
+++ b/.config/s6-rc/river/producer-for
@@ -0,0 +1 @@
+river-log
diff --git a/.config/s6-rc/river/run b/.config/s6-rc/river/run
new file mode 100755
index 0000000..de4fd8a
--- /dev/null
+++ b/.config/s6-rc/river/run
@@ -0,0 +1,28 @@
+#!/bin/execlineb -P
+fdmove -c 2 1
+multisubstitute {
+	importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+	importas -i HOME HOME
+}
+if { mkdir -p ${XDG_RUNTIME_DIR}/wl_env }
+if {
+	forx -E var {
+		XDG_SESSION_TYPE=wayland
+		XDG_SESSION_DESKTOP=wlroots
+		XDG_CURRENT_DESKTOP=wlroots
+		MOZ_ENABLE_WAYLAND=1
+		QT_QPA_PLATFORM=wayland
+		SDL_VIDEODRIVER=wayland
+		_JAVA_AWT_WM_NONREPARENTING=1
+	}
+		multidefine -d= ${var} { key val }
+		redirfd -w 1 ${XDG_RUNTIME_DIR}/wl_env/${key}
+		heredoc 0 ${val} cat
+}
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
+if { mkdir -p ./data }
+if { rm -f ./data/ready }
+if { mkfifo ./data/ready }
+background { redirfd -r 0 ./data/ready fdmove 1 3 cat }
+cd ${HOME}
+river
diff --git a/.config/s6-rc/ii-tilde.chat/type b/.config/s6-rc/river/type
index 5883cff..5883cff 100644
--- a/.config/s6-rc/ii-tilde.chat/type
+++ b/.config/s6-rc/river/type
diff --git a/.config/s6-rc/rivertile-log/consumer-for b/.config/s6-rc/rivertile-log/consumer-for
new file mode 100644
index 0000000..d73f7d3
--- /dev/null
+++ b/.config/s6-rc/rivertile-log/consumer-for
@@ -0,0 +1 @@
+rivertile
diff --git a/.config/s6-rc/rivertile-log/notification-fd b/.config/s6-rc/rivertile-log/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/.config/s6-rc/rivertile-log/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/.config/s6-rc/rivertile-log/pipeline-name b/.config/s6-rc/rivertile-log/pipeline-name
new file mode 100644
index 0000000..0b1402c
--- /dev/null
+++ b/.config/s6-rc/rivertile-log/pipeline-name
@@ -0,0 +1 @@
+rivertile-pipeline
diff --git a/.config/s6-rc/rivertile-log/run b/.config/s6-rc/rivertile-log/run
new file mode 100755
index 0000000..9ae3251
--- /dev/null
+++ b/.config/s6-rc/rivertile-log/run
@@ -0,0 +1,4 @@
+#!/command/execlineb -P
+importas -i HOME HOME
+exec -c
+s6-log -d3 -- t ${HOME}/.local/state/s6/logs/rivertile
diff --git a/.config/s6-rc/swaybg-log/type b/.config/s6-rc/rivertile-log/type
index 5883cff..5883cff 100644
--- a/.config/s6-rc/swaybg-log/type
+++ b/.config/s6-rc/rivertile-log/type
diff --git a/.config/s6-rc/ii/contents.d/ii-tilde.chat b/.config/s6-rc/rivertile/dependencies.d/river
index e69de29..e69de29 100644
--- a/.config/s6-rc/ii/contents.d/ii-tilde.chat
+++ b/.config/s6-rc/rivertile/dependencies.d/river
diff --git a/.config/s6-rc/rivertile/producer-for b/.config/s6-rc/rivertile/producer-for
new file mode 100644
index 0000000..30d5062
--- /dev/null
+++ b/.config/s6-rc/rivertile/producer-for
@@ -0,0 +1 @@
+rivertile-log
diff --git a/.config/s6-rc/rivertile/run b/.config/s6-rc/rivertile/run
new file mode 100755
index 0000000..68b9075
--- /dev/null
+++ b/.config/s6-rc/rivertile/run
@@ -0,0 +1,8 @@
+#!/command/execlineb -P
+fdmove -c 2 1
+multisubstitute {
+	importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+	importas -i HOME HOME
+}
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
+${HOME}/.config/river/rivertile
diff --git a/.config/s6-rc/swaybg/type b/.config/s6-rc/rivertile/type
index 5883cff..5883cff 100644
--- a/.config/s6-rc/swaybg/type
+++ b/.config/s6-rc/rivertile/type
diff --git a/.config/s6-rc/sandbar-log/consumer-for b/.config/s6-rc/sandbar-log/consumer-for
new file mode 100644
index 0000000..a73c0ba
--- /dev/null
+++ b/.config/s6-rc/sandbar-log/consumer-for
@@ -0,0 +1 @@
+sandbar
diff --git a/.config/s6-rc/sandbar-log/notification-fd b/.config/s6-rc/sandbar-log/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/.config/s6-rc/sandbar-log/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/.config/s6-rc/sandbar-log/pipeline-name b/.config/s6-rc/sandbar-log/pipeline-name
new file mode 100644
index 0000000..fbbf07e
--- /dev/null
+++ b/.config/s6-rc/sandbar-log/pipeline-name
@@ -0,0 +1 @@
+sandbar-pipeline
diff --git a/.config/s6-rc/sandbar-log/run b/.config/s6-rc/sandbar-log/run
new file mode 100755
index 0000000..f269e87
--- /dev/null
+++ b/.config/s6-rc/sandbar-log/run
@@ -0,0 +1,4 @@
+#!/command/execlineb -P
+importas -i HOME HOME
+exec -c
+s6-log -d3 -- t ${HOME}/.local/state/s6/logs/sandbar
diff --git a/.config/s6-rc/sandbar-log/type b/.config/s6-rc/sandbar-log/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/.config/s6-rc/sandbar-log/type
@@ -0,0 +1 @@
+longrun
diff --git a/.config/s6-rc/sandbar/consumer-for b/.config/s6-rc/sandbar/consumer-for
new file mode 100644
index 0000000..9f6b34e
--- /dev/null
+++ b/.config/s6-rc/sandbar/consumer-for
@@ -0,0 +1 @@
+statusline
diff --git a/.config/s6-rc/swaybg/dependencies.d/sway b/.config/s6-rc/sandbar/dependencies.d/wayland
index e69de29..e69de29 100644
--- a/.config/s6-rc/swaybg/dependencies.d/sway
+++ b/.config/s6-rc/sandbar/dependencies.d/wayland
diff --git a/.config/s6-rc/sandbar/finish b/.config/s6-rc/sandbar/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/sandbar/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/sandbar/producer-for b/.config/s6-rc/sandbar/producer-for
new file mode 100644
index 0000000..1b1bb42
--- /dev/null
+++ b/.config/s6-rc/sandbar/producer-for
@@ -0,0 +1 @@
+sandbar-log
diff --git a/.config/s6-rc/sandbar/run b/.config/s6-rc/sandbar/run
new file mode 100755
index 0000000..b9858fc
--- /dev/null
+++ b/.config/s6-rc/sandbar/run
@@ -0,0 +1,5 @@
+#!/command/execlineb -P
+fdmove -c 2 1
+importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
+pipeline { loopwhilex cat } sandbar
diff --git a/.config/s6-rc/sandbar/type b/.config/s6-rc/sandbar/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/.config/s6-rc/sandbar/type
@@ -0,0 +1 @@
+longrun
diff --git a/.config/s6-rc/swayidle/dependencies.d/sway b/.config/s6-rc/statusbar/contents.d/sandbar-pipeline
index e69de29..e69de29 100644
--- a/.config/s6-rc/swayidle/dependencies.d/sway
+++ b/.config/s6-rc/statusbar/contents.d/sandbar-pipeline
diff --git a/.config/s6-rc/ii/type b/.config/s6-rc/statusbar/type
index 757b422..757b422 100644
--- a/.config/s6-rc/ii/type
+++ b/.config/s6-rc/statusbar/type
diff --git a/.config/s6-rc/statusline/finish b/.config/s6-rc/statusline/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/statusline/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/statusline/producer-for b/.config/s6-rc/statusline/producer-for
new file mode 100644
index 0000000..a73c0ba
--- /dev/null
+++ b/.config/s6-rc/statusline/producer-for
@@ -0,0 +1 @@
+sandbar
diff --git a/.config/s6-rc/statusline/run b/.config/s6-rc/statusline/run
new file mode 100755
index 0000000..35012fe
--- /dev/null
+++ b/.config/s6-rc/statusline/run
@@ -0,0 +1,2 @@
+#!/command/execlineb -P
+statusline
diff --git a/.config/s6-rc/statusline/type b/.config/s6-rc/statusline/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/.config/s6-rc/statusline/type
@@ -0,0 +1 @@
+longrun
diff --git a/.config/s6-rc/sway/run b/.config/s6-rc/sway/run
index 181d4db..4a4e701 100755
--- a/.config/s6-rc/sway/run
+++ b/.config/s6-rc/sway/run
@@ -1,6 +1,10 @@
 #!/bin/execlineb -P
 fdmove -c 2 1
-if { mkdir -p ./env }
+multisubstitute {
+	importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+	importas -i HOME HOME
+}
+if { mkdir -p ${XDG_RUNTIME_DIR}/wl_env }
 if {
 	forx -E var {
 		XDG_SESSION_TYPE=wayland
@@ -12,14 +16,13 @@ if {
 		_JAVA_AWT_WM_NONREPARENTING=1
 	}
 		multidefine -d= ${var} { key val }
-		redirfd -w 1 ./env/${key}
+		redirfd -w 1 ${XDG_RUNTIME_DIR}/wl_env/${key}
 		heredoc 0 ${val} cat
 }
-s6-envdir ./env
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
 if { mkdir -p ./data }
 if { rm -f ./data/ready }
 if { mkfifo ./data/ready }
 background { redirfd -r 0 ./data/ready fdmove 1 3 cat }
-importas -i HOME HOME
-execline-cd ${HOME}
+cd ${HOME}
 sway
diff --git a/.config/s6-rc/swaybg-log/consumer-for b/.config/s6-rc/swaybg-log/consumer-for
deleted file mode 100644
index a5fe31a..0000000
--- a/.config/s6-rc/swaybg-log/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-swaybg
diff --git a/.config/s6-rc/swaybg-log/pipeline-name b/.config/s6-rc/swaybg-log/pipeline-name
deleted file mode 100644
index fcd8a1d..0000000
--- a/.config/s6-rc/swaybg-log/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-swaybg-pipeline
diff --git a/.config/s6-rc/swaybg-log/run b/.config/s6-rc/swaybg-log/run
deleted file mode 100755
index 26bc1d5..0000000
--- a/.config/s6-rc/swaybg-log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/execlineb -P
-importas -i HOME HOME
-exec -c
-s6-log -d3 -- t ${HOME}/.local/state/s6/logs/swaybg
diff --git a/.config/s6-rc/swaybg/producer-for b/.config/s6-rc/swaybg/producer-for
deleted file mode 100644
index 5a8d08e..0000000
--- a/.config/s6-rc/swaybg/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-swaybg-log
diff --git a/.config/s6-rc/swaybg/run b/.config/s6-rc/swaybg/run
deleted file mode 100755
index 1a7f89a..0000000
--- a/.config/s6-rc/swaybg/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/execlineb -P
-fdmove -c 2 1
-s6-envdir ../sway/env
-swaybg -i /home/samn/wallpaper.jpg
diff --git a/.config/s6-rc/swayidle-log/consumer-for b/.config/s6-rc/swayidle-log/consumer-for
index 3949f0c..41abd49 100644
--- a/.config/s6-rc/swayidle-log/consumer-for
+++ b/.config/s6-rc/swayidle-log/consumer-for
@@ -1 +1,2 @@
 swayidle
+swayidle-nosleep
diff --git a/.config/s6-rc/wlsunset/dependencies.d/sway b/.config/s6-rc/swayidle-nosleep/dependencies.d/wayland
index e69de29..e69de29 100644
--- a/.config/s6-rc/wlsunset/dependencies.d/sway
+++ b/.config/s6-rc/swayidle-nosleep/dependencies.d/wayland
diff --git a/.config/s6-rc/swayidle-nosleep/finish b/.config/s6-rc/swayidle-nosleep/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/swayidle-nosleep/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/swayidle-nosleep/producer-for b/.config/s6-rc/swayidle-nosleep/producer-for
new file mode 100644
index 0000000..490cb3b
--- /dev/null
+++ b/.config/s6-rc/swayidle-nosleep/producer-for
@@ -0,0 +1 @@
+swayidle-log
diff --git a/.config/s6-rc/swayidle-nosleep/run b/.config/s6-rc/swayidle-nosleep/run
new file mode 100755
index 0000000..bc4fcd9
--- /dev/null
+++ b/.config/s6-rc/swayidle-nosleep/run
@@ -0,0 +1,8 @@
+#!/bin/execlineb -P
+fdmove -c 2 1
+multisubstitute {
+	importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+	importas -i HOME HOME
+}
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
+swayidle -C ${HOME}/.config/swayidle/config-nosleep
diff --git a/.config/s6-rc/swayidle-nosleep/type b/.config/s6-rc/swayidle-nosleep/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/.config/s6-rc/swayidle-nosleep/type
@@ -0,0 +1 @@
+longrun
diff --git a/.config/s6-rc/xdg-desktop-portal/dependencies.d/sway b/.config/s6-rc/swayidle/dependencies.d/wayland
index e69de29..e69de29 100644
--- a/.config/s6-rc/xdg-desktop-portal/dependencies.d/sway
+++ b/.config/s6-rc/swayidle/dependencies.d/wayland
diff --git a/.config/s6-rc/swayidle/finish b/.config/s6-rc/swayidle/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/swayidle/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/swayidle/run b/.config/s6-rc/swayidle/run
index f41a40b..bde027f 100755
--- a/.config/s6-rc/swayidle/run
+++ b/.config/s6-rc/swayidle/run
@@ -1,4 +1,5 @@
 #!/bin/execlineb -P
 fdmove -c 2 1
-s6-envdir ../sway/env
+importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
 swayidle
diff --git a/.config/s6-rc/wayland/contents.d/river b/.config/s6-rc/wayland/contents.d/river
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/s6-rc/wayland/contents.d/river
diff --git a/.config/s6-rc/wayland/contents.d/rivertile b/.config/s6-rc/wayland/contents.d/rivertile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/s6-rc/wayland/contents.d/rivertile
diff --git a/.config/s6-rc/wayland/type b/.config/s6-rc/wayland/type
new file mode 100644
index 0000000..757b422
--- /dev/null
+++ b/.config/s6-rc/wayland/type
@@ -0,0 +1 @@
+bundle
diff --git a/.config/s6-rc/wbg-log/consumer-for b/.config/s6-rc/wbg-log/consumer-for
new file mode 100644
index 0000000..bb4038a
--- /dev/null
+++ b/.config/s6-rc/wbg-log/consumer-for
@@ -0,0 +1 @@
+wbg
diff --git a/.config/s6-rc/wbg-log/notification-fd b/.config/s6-rc/wbg-log/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/.config/s6-rc/wbg-log/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/.config/s6-rc/wbg-log/pipeline-name b/.config/s6-rc/wbg-log/pipeline-name
new file mode 100644
index 0000000..b78a029
--- /dev/null
+++ b/.config/s6-rc/wbg-log/pipeline-name
@@ -0,0 +1 @@
+wbg-pipeline
diff --git a/.config/s6-rc/wbg-log/run b/.config/s6-rc/wbg-log/run
new file mode 100755
index 0000000..f2f9494
--- /dev/null
+++ b/.config/s6-rc/wbg-log/run
@@ -0,0 +1,4 @@
+#!/command/execlineb -P
+importas -i HOME HOME
+exec -c
+s6-log -d3 -- t ${HOME}/.local/state/s6/logs/wbg
diff --git a/.config/s6-rc/wbg-log/type b/.config/s6-rc/wbg-log/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/.config/s6-rc/wbg-log/type
@@ -0,0 +1 @@
+longrun
diff --git a/.config/s6-rc/wbg/dependencies.d/wayland b/.config/s6-rc/wbg/dependencies.d/wayland
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/s6-rc/wbg/dependencies.d/wayland
diff --git a/.config/s6-rc/wbg/finish b/.config/s6-rc/wbg/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/wbg/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/wbg/producer-for b/.config/s6-rc/wbg/producer-for
new file mode 100644
index 0000000..35b7757
--- /dev/null
+++ b/.config/s6-rc/wbg/producer-for
@@ -0,0 +1 @@
+wbg-log
diff --git a/.config/s6-rc/wbg/run b/.config/s6-rc/wbg/run
new file mode 100755
index 0000000..73da181
--- /dev/null
+++ b/.config/s6-rc/wbg/run
@@ -0,0 +1,8 @@
+#!/command/execlineb -P
+fdmove -c 2 1
+multisubstitute {
+	importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+	importas -i HOME HOME
+}
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
+wbg ${HOME}/wallpaper
diff --git a/.config/s6-rc/wbg/type b/.config/s6-rc/wbg/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/.config/s6-rc/wbg/type
@@ -0,0 +1 @@
+longrun
diff --git a/.config/s6-rc/wireplumber/finish b/.config/s6-rc/wireplumber/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/wireplumber/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/wlsunset/dependencies.d/wayland b/.config/s6-rc/wlsunset/dependencies.d/wayland
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/s6-rc/wlsunset/dependencies.d/wayland
diff --git a/.config/s6-rc/wlsunset/finish b/.config/s6-rc/wlsunset/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/wlsunset/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/wlsunset/run b/.config/s6-rc/wlsunset/run
index d6a3b50..933e919 100755
--- a/.config/s6-rc/wlsunset/run
+++ b/.config/s6-rc/wlsunset/run
@@ -1,4 +1,5 @@
 #!/bin/execlineb -P
 fdmove -c 2 1
-s6-envdir ../sway/env
+importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
 wlsunset -l 36.2 -L 81.7
diff --git a/.config/s6-rc/xdg-desktop-portal/dependencies.d/wayland b/.config/s6-rc/xdg-desktop-portal/dependencies.d/wayland
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/s6-rc/xdg-desktop-portal/dependencies.d/wayland
diff --git a/.config/s6-rc/xdg-desktop-portal/finish b/.config/s6-rc/xdg-desktop-portal/finish
new file mode 100755
index 0000000..b22f9dc
--- /dev/null
+++ b/.config/s6-rc/xdg-desktop-portal/finish
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+s6-permafailon 60 10 1-255
+exit
diff --git a/.config/s6-rc/xdg-desktop-portal/run b/.config/s6-rc/xdg-desktop-portal/run
index b8b6e0f..5c814c3 100755
--- a/.config/s6-rc/xdg-desktop-portal/run
+++ b/.config/s6-rc/xdg-desktop-portal/run
@@ -1,5 +1,6 @@
 #!/bin/execlineb -P
 fdmove -c 2 1
-s6-envdir ../sway/env
+importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+s6-envdir ${XDG_RUNTIME_DIR}/wl_env
 dbus-waiter -n3 -b org.freedesktop.portal.Desktop
 /usr/libexec/xdg-desktop-portal