Bump s6 services and prepare XDG stuff

main/nnd-s6-linux-init/APKBUILD

@@ -1,7 +1,7 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=nnd-s6-linux-init
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=0
 pkgdesc="Skeleton for nnd-s6-services and symlinks"
 url="none"
@@ -22,6 +22,7 @@ prepare() {
 
 build() {
 	s6-linux-init-maker -1 \
+		-e PATH='/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin' \
 		-e HOME=/root \
 		-e XDG_RUNTIME_DIR=/run \
 		-e XDG_CONFIG_HOME=/etc \

main/nnd-s6-services/APKBUILD

@@ -3,8 +3,8 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=2.64
-pkgrel=2
+pkgver=2.66
+pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
 builddir="$srcdir/"
@@ -14,7 +14,6 @@ options=""
 prepare() {
 	default_prepare
 	cp -R "$startdir"/rc "$builddir"/rc
-	cp -R "$startdir"/env "$builddir"/env
 	cp -R "$startdir"/tmpl "$builddir"/tmpl
 	cp "$startdir"/manage.sh "$builddir"/manage.sh
 }
@@ -22,8 +21,8 @@ prepare() {
 package() {
 	# Distributed bundles
 	mkdir -p "$pkgdir/$_distpfx"
+	mkdir -p "$pkgdir/$_distpfx"/env
 	mv "$builddir"/rc "$pkgdir/$_distpfx"/rc
-	mv "$builddir"/env "$pkgdir/$_distpfx"/env
 
 	mkdir -p "$pkgdir/usr/libexec/nnd/"
 	mv "$builddir"/tmpl "$pkgdir/usr/libexec/nnd"/s6

main/nnd-s6-services/env/path/PATH

@@ -1 +0,0 @@
-/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin

main/nnd-s6-services/env/xdg/HOME

@@ -1 +0,0 @@
-/root

main/nnd-s6-services/env/xdg/XDG_CACHE_HOME

@@ -1 +0,0 @@
-/var/cache

main/nnd-s6-services/env/xdg/XDG_CONFIG_HOME

@@ -1 +0,0 @@
-/etc

main/nnd-s6-services/env/xdg/XDG_DATA_HOME

@@ -1 +0,0 @@
-/usr/share

main/nnd-s6-services/env/xdg/XDG_RUNTIME_DIR

@@ -1 +0,0 @@
-/run

main/nnd-s6-services/env/xdg/XDG_STATE_HOME

@@ -1 +0,0 @@
-/var/lib

main/nnd-s6-services/manage.sh

@@ -13,6 +13,8 @@ alt_ab() {
 
 : ${S6_PATH:="${XDG_DATA_HOME:="/etc"}/s6"}
 : ${S6_DIST_PATH:="${XDG_CONFIG_HOME:="/usr/share"}/nnd/s6/dist"}
+: ${S6_LIVE_PATH:="${XDG_RUNTIME_DIR:="/run"}/s6-rc"}
+: ${S6_SCANDIR_PATH:="${XDG_RUNTIME_DIR:="/run"}/service"}
 : ${S6_RC_PATH:="$S6_PATH/rc"}
 : ${S6_ENV_PATH:="$S6_PATH/env"}
 : ${S6_SV_PATH:="$S6_PATH/sv"}
@@ -64,14 +66,15 @@ swap() {
 }
 
 update() {
-	if ! s6-rc-update "$S6_SV_PATH/current.$(DB_FRESH_ACT)"; then
+	if ! s6-rc-update -l "$S6_LIVE_PATH" "$S6_SV_PATH/current.$(DB_FRESH_ACT)"; then
 		error "Failed to update live state of the database"
 		return "$?"
 	fi
 }
 
 dist() {
-	for src in "$S6_DIST_PATH/rc"/* "$S6_DIST_PATH/env"/*; do
+	#for src in "$S6_DIST_PATH/rc"/* "$S6_DIST_PATH/env"/*; do
+	for src in "$S6_DIST_PATH/rc"/*; do
 		local svc="${src#$S6_DIST_PATH/}"
 		if [ ! -e "$S6_PATH/$svc" ]; then
 			default "$svc" || return "$?"
@@ -157,6 +160,21 @@ removedangle() {
 	find -L "$dir" -maxdepth 1 -type l -exec rm -v -- {} +
 }
 
+# TODO
+# makeusertree() {
+# 	USR="$1"
+# 	UID="$(id -u "$USR")"
+# 	RUNTIME_DIR="/run/user/$UID"
+# 	: ${PARENT_RCDIR:+"/etc/s6/rc"}
+# 	s6-usertree-maker \
+# 		-d "$RUNTIME_DIR"/service \
+# 		-r usertree."$UID"/logger.usertree."$UID" \
+# 		-l "$USR" \
+# 		"$USR" \
+# 		"$RUNTIME_DIR"/uncaught-logs/ \
+# 		"$PARENT_RCDIR"
+# }
+
 cmd="$1"
 shift
 if [ -z "$cmd" ]; then

main/nnd-s6-services/rc/bird/run

@@ -1,9 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -I /etc/s6/env/bird
-importas -D /etc/bird/bird.conf CONFIG CONFIG
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/bird
+importas -D ${XDG_CONFIG_HOME}/bird/bird.conf CONFIG CONFIG
 
 fdmove -c 2 1
 

main/nnd-s6-services/rc/bundle.interface.lo.configure/type

@@ -0,0 +1 @@
+bundle

main/nnd-s6-services/rc/bundle.interface.lo.ready/type

@@ -0,0 +1 @@
+bundle

main/nnd-s6-services/rc/bundle.interface.lo/type

@@ -0,0 +1 @@
+bundle

main/nnd-s6-services/rc/ceph-exporter/run

@@ -1,7 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 fdmove -c 2 1
 
 ceph-exporter

main/nnd-s6-services/rc/ceph.osd.0.block/up

@@ -1,11 +1,12 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+importas -i XDG_STATE_HOME XDG_STATE_HOME
 define ID 0
 
-s6-envdir -i /etc/s6/env/ceph.osd.${ID}
+s6-envdir -i ${XDG_CONFIG_HOME}/s6/env/ceph.osd.${ID}
 importas -i DEV DEV
-emptyenv
 
-export SRC /var/lib/ceph/osd/ceph-${ID}/block
+export SRC ${XDG_STATE_HOME}/ceph/osd/ceph-${ID}/block
 export DEST $DEV
 
 /usr/libexec/nnd/s6/symlink

main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up

@@ -1,10 +1,8 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
 define ID 0
 
-s6-envdir -i /etc/s6/env/ceph.osd.${ID}
+s6-envdir -i ${XDG_CONFIG_HOME}/s6/env/ceph.osd.${ID}
 importas -i DEV DEV
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 ceph-bluestore-tool prime-osd-dir --dev $DEV --path /var/lib/ceph/osd/ceph-${ID} --no-mon-config

main/nnd-s6-services/rc/clock.hw/up

@@ -1,5 +1,2 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 hwclock -u --systz

main/nnd-s6-services/rc/dbus/run

@@ -1,7 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 fdmove -c 2 1
 
 dbus-daemon --system --nopidfile --nosyslog --nofork

main/nnd-s6-services/rc/dmeventd/producer-for

@@ -0,0 +1 @@
+logger.dmeventd

main/nnd-s6-services/rc/dmeventd/run

@@ -1,5 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
+fdmove -c 2 1
 
-dmeventd -d -f
+dmeventd -ddd -l

main/nnd-s6-services/rc/gortr/run

@@ -1,9 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -I /etc/s6/env/gortr
-importas -D https://dn42.burble.com/roa/dn42_roa_46.json ENDPOINT ENDPOINT
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/gortr
+importas -D https://dn42.burble.com/roa/dn42_roa_46.json ENDPOINT ENDPOINT
 
 fdmove -c 2 1
 

main/nnd-s6-services/rc/group.seat/up

@@ -1,9 +1,6 @@
 #!/bin/execlineb -P
 define GROUP seat
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 ifelse -n {
 	# Silence output
 	redirfd -w 1 /dev/null

main/nnd-s6-services/rc/interface.br0.bridge.mcast_mld_version/up

@@ -1,6 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 define PROP mcast_mld_version
 define STATE 2

main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/down

@@ -1,6 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 define PROP mcast_querier
 define STATE 0

main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/up

@@ -1,6 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 define PROP mcast_querier
 define STATE 1

main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/down

@@ -1,6 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 define PROP mcast_router
 define STATE 0

main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/up

@@ -1,6 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 define PROP mcast_router
 define STATE 1

main/nnd-s6-services/rc/interface.br0.bridge.mcast_snooping/up

@@ -1,6 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 define PROP mcast_snooping
 define STATE 0

main/nnd-s6-services/rc/interface.br0.create/down

@@ -1,5 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 ip link del $INTERFACE

main/nnd-s6-services/rc/interface.br0.create/up

@@ -1,5 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 ip link add $INTERFACE type bridge

main/nnd-s6-services/rc/interface.br0.dhcp/run

@@ -1,6 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 fdmove -c 2 1
 udhcpc -i $INTERFACE -f -S

main/nnd-s6-services/rc/interface.br0.link/down

@@ -1,5 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 ip link set dev $INTERFACE down

main/nnd-s6-services/rc/interface.br0.link/up

@@ -1,5 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE br0
 ip link set dev $INTERFACE up

main/nnd-s6-services/rc/interface.br0.slave.eth0/down

@@ -1,5 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define SLAVEIF eth0
 ip link set dev $SLAVEIF nomaster

main/nnd-s6-services/rc/interface.br0.slave.eth0/up

@@ -1,6 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define MASTERIF br0
 define SLAVEIF eth0
 ip link set dev $SLAVEIF master $MASTERIF

main/nnd-s6-services/rc/interface.eth0.create/up

@@ -1,5 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE eth0
 bcnm-waitif 1 $INTERFACE

main/nnd-s6-services/rc/interface.eth0.link/down

@@ -1,5 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE eth0
 ip link set dev $INTERFACE down

main/nnd-s6-services/rc/interface.eth0.link/up

@@ -1,5 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
 define INTERFACE eth0
 ip link set dev $INTERFACE up

main/nnd-s6-services/rc/interface.lo.create/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/interface.lo.create/up

@@ -0,0 +1,3 @@
+#!/bin/execlineb -P
+define INTERFACE lo
+bcnm-waitif 1 $INTERFACE

main/nnd-s6-services/rc/interface.lo.link/down

@@ -1,7 +1,3 @@
 #!/bin/execlineb -P
 define INTERFACE lo
-
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 ip link set dev $INTERFACE down

main/nnd-s6-services/rc/interface.lo.link/up

@@ -1,7 +1,3 @@
 #!/bin/execlineb -P
 define INTERFACE lo
-
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 ip link set dev $INTERFACE up

main/nnd-s6-services/rc/irqbalance/run

@@ -1,9 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -I /etc/s6/env/irqbalance
-importas -D 10 INTERVAL INTERVAL
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/irqbalance
+importas -D 10 INTERVAL INTERVAL
 
 fdmove -c 2 1
 

main/nnd-s6-services/rc/klogd/run

@@ -1,7 +1,4 @@
 #!/bin/execlineb -P
 define READFROM /proc/kmsg
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 redirfd -r 0 $READFROM ucspilogd

main/nnd-s6-services/rc/kmod.sysfs/up

@@ -1,7 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 if -t {
 	pipeline {
 		pipeline {

main/nnd-s6-services/rc/libvirt.stopall/down

@@ -1,6 +1,3 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 pipeline { virsh list --name --all --state-running --state-paused --state-other }
         forstdin -E -C -p DOMAIN virsh destroy $DOMAIN

main/nnd-s6-services/rc/lldpd/run

@@ -1,7 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 fdmove -c 2 1
 
 lldpd -d

main/nnd-s6-services/rc/logger.dmeventd/consumer-for

@@ -0,0 +1 @@
+dmeventd

main/nnd-s6-services/rc/logger.dmeventd/notification-fd

@@ -0,0 +1 @@
+3

main/nnd-s6-services/rc/logger.dmeventd/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export NAME dmeventd
+
+/usr/libexec/nnd/s6/logger

main/nnd-s6-services/rc/logger.dmeventd/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/logger.pipewire/consumer-for

@@ -0,0 +1,3 @@
+pipewire
+wireplumber
+pipewire-pulse

main/nnd-s6-services/rc/logger.pipewire/notification-fd

@@ -0,0 +1 @@
+3

main/nnd-s6-services/rc/logger.pipewire/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export NAME pipewire
+
+/usr/libexec/nnd/s6/logger

main/nnd-s6-services/rc/logger.pipewire/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/lxd/run

@@ -1,8 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
-# Log everything to stdout
 fdmove -c 2 1
 
 lxd -v

main/nnd-s6-services/rc/machineid/up

@@ -1,7 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 ifelse -Xn { [ -r /etc/machine-id ] } {
 	redirfd -w 1 /etc/machine-id
 		foreground {

main/nnd-s6-services/rc/mdevd.coldplug/up

@@ -1,5 +1,2 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 mdevd-coldplug

main/nnd-s6-services/rc/mdevd/run

@@ -1,10 +1,8 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
 define NOTIFYFD 3
 
-s6-envdir -I /etc/s6/env/mdevd
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mdevd
 importas -D 500000 KBUFSZ KBUFSZ
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 mdevd -D $NOTIFYFD -b $KBUFSZ

main/nnd-s6-services/rc/mount.boot-efi/up

@@ -1,8 +1,10 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export SRC LABEL=nnd-efi
 export OPTS rw
 export FSTYPE vfat
-s6-envdir -I /etc/s6/env/mount.boot-efi
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.boot-efi
 
 export DEST /boot/efi
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.boot/up

@@ -1,8 +1,10 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export SRC LABEL=nnd-boot
 export OPTS rw
 export FSTYPE ext4
-s6-envdir -I /etc/s6/env/mount.boot
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.boot
 
 export DEST /boot
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.dev-hugepages/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS pagesize=2M
 export FSTYPE hugetlbfs
-s6-envdir -I /etc/s6/env/mount.dev-hugepages
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-hugepages
 
 export DEST /dev/hugepages
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.dev-mqueue/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,noexec,nodev
 export FSTYPE mqueue
-s6-envdir -I /etc/s6/env/mount.dev-mqueue
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-mqueue
 
 export DEST /dev/mqueue
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.dev-pts/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,noexec,mode=620,ptmxmode=000
 export FSTYPE devpts
-s6-envdir -I /etc/s6/env/mount.dev-pts
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-pts
 
 export DEST /dev/pts
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.dev-shm/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,noexec,nodev,inode64
 export FSTYPE tmpfs
-s6-envdir -I /etc/s6/env/mount.dev-shm
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-shm
 
 export DEST /dev/shm
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.dev/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,noexec,mode=755,inode64
 export FSTYPE devtmpfs
-s6-envdir -I /etc/s6/env/mount.dev
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev
 
 export DEST /dev
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS rw,nosuid,nodev,noexec,relatime
 export FSTYPE binfmt_misc
-s6-envdir -I /etc/s6/env/mount.proc-sys-fs-binfmt_misc
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.proc-sys-fs-binfmt_misc
 
 export DEST /proc/sys/fs/binfmt_misc
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.proc/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,nodev,noexec,hidepid=2
 export FSTYPE proc
-s6-envdir -I /etc/s6/env/mount.proc
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.proc
 
 export DEST /proc
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.root/up

@@ -1,8 +1,10 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export SRC LABEL=nnd-root
 export OPTS rw
 export FSTYPE btrfs
-s6-envdir -I /etc/s6/env/mount.root
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.root
 
 export DEST /
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.run/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nodev,nosuid,mode=755,inode64
 export FSTYPE tmpfs
-s6-envdir -I /etc/s6/env/mount.run
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.run
 
 export DEST /run
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,nodev,noexec
 export FSTYPE efivarfs
-s6-envdir -I /etc/s6/env/mount.sys-firmware-efi-efivars
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-firmware-efi-efivars
 
 export DEST /sys/firmware/efi/efivars
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.sys-fs-cgroup/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS rw,nosuid,nodev,noexec,relatime,nsdelegate
 export FSTYPE cgroup2
-s6-envdir -I /etc/s6/env/mount.sys-fs-cgroup
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-fs-cgroup
 
 export DEST /sys/fs/cgroup
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.sys-fs-pstore/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,nodev,noexec
 export FSTYPE pstore
-s6-envdir -I /etc/s6/env/mount.sys-fs-pstore
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-fs-pstore
 
 export DEST /sys/fs/pstore
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.sys-kernel-security/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,nodev,noexec
 export FSTYPE securityfs
-s6-envdir -I /etc/s6/env/mount.sys-kernel-security
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-kernel-security
 
 export DEST /sys/kernel/security
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.sys/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nosuid,nodev,noexec
 export FSTYPE sysfs
-s6-envdir -I /etc/s6/env/mount.sys
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys
 
 export DEST /sys
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.tmp/up

@@ -1,7 +1,9 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export OPTS nodev,nosuid
 export FSTYPE tmpfs
-s6-envdir -I /etc/s6/env/mount.tmp
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.tmp
 
 export DEST /tmp
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up

@@ -1,6 +1,8 @@
 #!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+
 export FSTYPE tmpfs
-s6-envdir -I /etc/s6/env/mount.var-lib-ceph-osd-ceph-0
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.var-lib-ceph-osd-ceph-0
 
 export DEST /var/lib/ceph/osd/ceph-0
 /usr/libexec/nnd/s6/mount

main/nnd-s6-services/rc/multipathd/run

@@ -1,7 +1,4 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 fdmove -c 2 1
 
 multipathd -d -v 3

main/nnd-s6-services/rc/nameif/up

@@ -1,8 +1,7 @@
 #!/bin/execlineb -P
-s6-envdir -I /etc/s6/env/nameif
-importas -D /etc/mactab CONFIG CONFIG
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/nameif
+importas -D ${XDG_CONFIG_HOME}/mactab CONFIG CONFIG
 
 nameif -c $CONFIG

main/nnd-s6-services/rc/nftables/down

@@ -1,5 +1,2 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
-
 nft flush ruleset

main/nnd-s6-services/rc/nftables/up

@@ -1,9 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -I /etc/s6/env/nftables
-importas -D /etc/nnd/nftables/loadall RULESET RULESET
-importas -D /etc/nnd/nftables/ RULEDIR RULEDIR
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/nftables
+importas -D ${XDG_CONFIG_HOME}/nnd/nftables/loadall RULESET RULESET
+importas -D ${XDG_CONFIG_HOME}/nnd/nftables/ RULEDIR RULEDIR
 
 nft -I $RULEDIR -f $RULESET

main/nnd-s6-services/rc/ntpd.1/run

@@ -1,9 +1,8 @@
 #!/bin/execlineb -P
-s6-envdir -I /etc/s6/env/ntpd.1
-importas -D 2.pool.ntp.org NTPS NTPS
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
 
-s6-envdir -i /etc/s6/env/path
-emptyenv -p
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/ntpd.1
+importas -D 2.pool.ntp.org NTPS NTPS
 
 fdmove -c 2 1
 

main/nnd-s6-services/rc/partprobe/up

@@ -1,5 +1,2 @@
 #!/bin/execlineb -P
-s6-envdir -I /etc/s6/env/path
-emptyenv -p
-
 partprobe

main/nnd-s6-services/rc/pipewire-pulse/producer-for

@@ -0,0 +1 @@
+logger.pipewire

main/nnd-s6-services/rc/pipewire-pulse/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+fdmove -c 2 1
+
+pipewire-pulse

main/nnd-s6-services/rc/pipewire-pulse/type

@@ -0,0 +1 @@
+longrun

main/nnd-s6-services/rc/pipewire/producer-for

@@ -0,0 +1 @@
+logger.pipewire

main/nnd-s6-services/rc/pipewire/run

@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+fdmove -c 2 1
+
+pipewire