=== modified file 'home/container-setup'
--- old/home/container-setup	2024-07-23 21:43:18 +0000
+++ new/home/container-setup	2024-05-07 20:36:32 +0000
@@ -74,10 +74,6 @@
 	to-current-inbox ssh.$USER run/ssh-exec/$^@ || exit $?
 }
 
-setup-rcm-ssh-exec() {
-	to-current-inbox rcm-ssh.$USER run/ssh-exec/$^@ || exit $?
-}
-
 main() {
 	if ! [[ -d $DSTROOT ]]; then
 		echo >&2 "Destination root not a directory: $DSTROOT" 
@@ -96,42 +92,22 @@
 		(pass)
 			setup-gpg-agent
 			;;
-		(ff-*-audio|mpd|mpv)
+		(ff-*-audio|mpd)
 			setup-sndio
 			;;
 		(alpine-recombee)
 			setup-gpg-agent
 			setup-gpg-ssh-agent
 			;;
-		(mail-net)
+		(mail)
+			setup-gpg-agent
 			setup-pass-show smtp:/te2000.cz/ccx smtp:/disroot.org/ccx
 			;;
-		(rcm-mail-net)
-			setup-pass-show mailto:/recombee.com/jan.pobrislo
-			;;
-		(mail|rcm-mail)
-			to-current-inbox $CONTAINER_NAME-net.$USER run/exec/sync-mail
-			setup-gpg-agent
-			;;
 		(weechat)
 			setup-pass-show weechat/P14s-gen2
 			;;
-		(bzr)
-			setup-ssh-exec ccx@eva ccx@saturnin ccx@www_te2000 root@masterozo root@masterozo2
-			;;
-		(git)
-			setup-ssh-exec ccx@eva ccx@saturnin ccx@www_te2000
-			setup-rcm-ssh-exec git@git.recombee.net
-			to-current-inbox tinyproxy.$USER run/http_proxy/git-forges
-			;;
-		(socials)
-			to-current-inbox tor.$USER run/tor/socks
-			;;
-		(ssrn-master-dev)
-			to-current-inbox tinyproxy.$USER run/http_proxy/pypi
-			;;
-		(rcm-postgresql-dev)
-			to-current-inbox git.$USER run/git/rw.git.recombee.net
+		(bzr|git)
+			setup-ssh-exec ccx@saturnin ccx@eva {ccx,www}@www_te2000
 			;;
 		(notes)
 			to-current-inbox git.$USER run/git/rw.notes

=== removed file 'xsession-skel/homedir/bin/c.lastlogs'
--- old/xsession-skel/homedir/bin/c.lastlogs	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/c.lastlogs	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh
-awk '
-/^@/ {
-	match(FILENAME, "/[^/]*/@[^/]*$");
-	logdir = substr(FILENAME, RSTART+1, RLENGTH-29);
-	print substr($0, 1, 26) "{" logdir "} " substr($0, 27);
-}' /mnt/container-logs/*/@* | sort | s6-tai64nlocal

=== removed file 'xsession-skel/homedir/bin/c.logs'
--- old/xsession-skel/homedir/bin/c.logs	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/c.logs	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/zsh
-setopt no_unset warn_create_global extended_glob
-cd /mnt/container-logs || exit $?
-exec tail -f "$@" */current(Om) | s6-tai64nlocal

=== modified file 'xsession-skel/homedir/bin/c.urxvt'
--- old/xsession-skel/homedir/bin/c.urxvt	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/c.urxvt	2024-05-07 20:36:32 +0000
@@ -6,27 +6,21 @@
 	exit 1
 }
 
-direct-urxvt() {
+container-urxvt() {
 	local container cmd sockd display
 	container=$1
 	cmd=$2
 	sock=/run/inbox/$container/run/exec/exec 
 	display=${DISPLAY#:}
 
-	#s6-sudo /run/cmd.s up $container || 
-	#	die "Failed to start container ${(qqq)container}"
-
-	s6-sudo /run/cmd.s link $container xsession.$display.$USER run/exec/exec ||
-		die "Failed to link ${(qqq)container} exec socket."
-
-	[[ -S $sock ]] ||
-		die "Failed to link ${(qqq)container} exec socket."
+	s6-sudo /run/cmd.s up $container || 
+		die "Failed to start container ${(qqq)container}"
 
 	s6-sudo /run/cmd.s link xsession.$display.$USER $container run/exec/urxvt ||
 		die "Failed to link urxvt socket."
 
 	local -a el_env=(
-		EXEC_PATH=$sock
+		EXEC_PATH=/run/containers/$container/run/exec/exec
 		URXVT_PATH=/run/inbox/xsession.$display.$USER/run/exec/urxvt
 	)
 	local -a el_cmd=(
@@ -54,12 +48,12 @@
 		quoted+=( "$(s6-quote -- "$arg")" )
 	done
 
-#	if [[ -S $sock ]]; then
-#		#exec s6-sudo $sock "$@"
+	if [[ -S $sock ]]; then
+		#exec s6-sudo $sock "$@"
 		direct-urxvt $container "${(j: :)quoted}"
-#	else
-#		powerbox-plumb "container-urxvt/$container/${(j: :)quoted}"
-#	fi
+	else
+		powerbox-plumb "container-urxvt/$container/${(j: :)quoted}"
+	fi
 	
 }
 typeset -f -t main

=== removed file 'xsession-skel/homedir/bin/login.capability'
--- old/xsession-skel/homedir/bin/login.capability	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/login.capability	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/zsh
-setopt no_unset extended_glob warn_create_global
-
-die() {
-	printf >&2 '%s\n' "$@"
-	exit 1
-}
-
-main() {
-	local name=$1 arg
-	local -a quoted
-	shift
-	for arg in "$@"; do
-		quoted+=( "$(s6-quote -- "$arg")" )
-	done
-	powerbox-plumb "login.capability.$name/${(j: :)quoted}"
-	
-}
-typeset -f -t main
-
-main "$@"

=== removed file 'xsession-skel/homedir/bin/mpv-term'
--- old/xsession-skel/homedir/bin/mpv-term	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/mpv-term	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/bin/zsh
-# vim: sts=2 sw=2 et
-setopt no_unset warn_create_global
-
-main() {
-  local container display xsession_cookie
-  container=mpv.$USER
-  [[ $container == */* ]] && exit 100
-  display=${DISPLAY#:}
-  xsession_cookie=${"$(xauth list $DISPLAY)"##* } || exit $?
-
-  s6-sudo /run/cmd.s link $container xsession.$display.$USER run/exec/x11 run/exec/exec || exit $?
-  s6-sudo /run/cmd.s link xsession.$display.$USER $container tmp/.X11-unix/X$display || exit $?
-
-  exec s6-sudo /run/inbox/$container/run/exec/x11 $display $xsession_cookie urxvt
-}
-typeset -f -t main
-
-main "$@"
-

=== modified file 'xsession-skel/homedir/bin/open-im'
--- old/xsession-skel/homedir/bin/open-im	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/open-im	2024-05-24 21:52:30 +0000
@@ -18,9 +18,9 @@
 typeset -f -t launch_app
 
 
-add_app '*weechat*'	'"weechat:ccx:" "URxvt"'	powerbox-plumb 'container-urxvt/weechat.ccx/tmux -2u new-session -s weechat -A weechat-curses'
-add_app '*profanity*'	'"profanity:ccx:" "URxvt"'	powerbox-plumb 'container-urxvt/profanity.ccx/tmux -2u new-session -s profanity -A profanity'
-add_app '*iamb*'	'"iamb:ccx:" "URxvt"'	powerbox-plumb 'container-urxvt/iamb.ccx/tmux -2u new-session -s iamb -A iamb'
+add_app '*weechat*'	'"weechat:ccx" "URxvt"'	powerbox-plumb 'container-urxvt/weechat.ccx/tmux -2u new-session -s weechat -A weechat-curses'
+add_app '*profanity*'	'"profanity:ccx" "URxvt"'	powerbox-plumb 'container-urxvt/profanity.ccx/tmux -2u new-session -s profanity -A profanity'
+add_app '*iamb*'	'"iamb:ccx" "URxvt"'	powerbox-plumb 'container-urxvt/iamb.ccx/tmux -2u new-session -s iamb -A iamb'
 add_app '\[telegram.ccx:*'	'"telegram-desktop" "TelegramDesktop"'	xsvc-in-container-xpra telegram.ccx telegram-desktop
 add_app '\[signal.ccx:*'	'"signal" "Signal"'	xsvc-in-container-xpra signal.ccx signal-desktop
 add_app '\[signal2.ccx:*'	'"signal" "Signal"'	xsvc-in-container-xpra signal2.ccx signal-desktop

=== modified file 'xsession-skel/homedir/bin/ptmx-handler'
--- old/xsession-skel/homedir/bin/ptmx-handler	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/ptmx-handler	2024-04-17 00:59:47 +0000
@@ -10,5 +10,4 @@
 fdmove 3 0  # move ptmx to FD 3
 redirfd -r 0 /dev/null  # open /dev/null for stdin
 importas -D unnamed NAME 1  # get first positional argument, falling back to "unnamed"
-importas -D "-" CAP capability_v0  # expose the env string (for debugging)
-background { urxvt -name ${NAME}:${CAP} -pty-fd 3 }
+background { urxvt -name $NAME -pty-fd 3 }

=== modified file 'xsession-skel/homedir/bin/run-in-container-xpra'
--- old/xsession-skel/homedir/bin/run-in-container-xpra	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/run-in-container-xpra	2024-05-07 20:36:32 +0000
@@ -10,8 +10,8 @@
   display=${DISPLAY#:}
   xsession_cookie=${"$(xauth list $DISPLAY)"##* } || exit $?
 
+  # s6-sudo /run/cmd.s up $container || exit $?
   s6-sudo /run/cmd.s link $container xsession.$display.$USER run/exec/x11 run/exec/exec || exit $?
-  s6-sudo /run/cmd.s link xpra.$USER xsession.$display.$USER run/exec/x11 || exit $?
   s6-sudo /run/cmd.s link xsession.$display.$USER xpra.$USER tmp/.X11-unix/X$display || exit $?
 
   local -a xpra

=== modified file 'xsession-skel/homedir/bin/xsvc-in-container-xpra'
--- old/xsession-skel/homedir/bin/xsvc-in-container-xpra	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/bin/xsvc-in-container-xpra	2024-05-07 20:36:32 +0000
@@ -11,8 +11,8 @@
   display=${DISPLAY#:}
   xsession_cookie=${"$(xauth list $DISPLAY)"##* } || exit $?
 
+  # s6-sudo /run/cmd.s up $container || exit $?
   s6-sudo /run/cmd.s link $container xsession.$display.$USER run/exec/xsvc run/exec/exec || exit $?
-  s6-sudo /run/cmd.s link xpra.$USER xsession.$display.$USER run/exec/x11 || exit $?
   s6-sudo /run/cmd.s link xsession.$display.$USER xpra.$USER tmp/.X11-unix/X$display || exit $?
 
   local -a xpra

=== modified file 'xsession-skel/homedir/s6-rc/source/urxvt.exec/run'
--- old/xsession-skel/homedir/s6-rc/source/urxvt.exec/run	2024-07-23 21:43:18 +0000
+++ new/xsession-skel/homedir/s6-rc/source/urxvt.exec/run	2024-04-14 15:35:09 +0000
@@ -1,7 +1,7 @@
 #!/bin/execlineb -P
 cd /home/ccx
 fdmove -c 4 2
-env capability_v0= TERM= HOME=/home/ccx USER=ccx SHELL=/bin/zsh LANG=C.UTF-8
+env TERM= HOME=/home/ccx USER=ccx SHELL=/bin/zsh LANG=C.UTF-8
 if { mkdir -p /run/exec }
 s6-ipcserver -a 0700 -- /run/exec/urxvt
 s6-sudod