=== modified file 'home/container-setup'
--- old/home/container-setup	2024-04-23 21:15:55 +0000
+++ new/home/container-setup	2024-04-17 00:59:47 +0000
@@ -69,10 +69,6 @@
 	done
 }
 
-setup-ssh-exec() {
-	to-current-inbox ssh.$USER run/ssh-exec/$^@ || exit $?
-}
-
 main() {
 	if ! [[ -d $DSTROOT ]]; then
 		echo >&2 "Destination root not a directory: $DSTROOT" 
@@ -91,7 +87,7 @@
 		(pass)
 			setup-gpg-agent
 			;;
-		(ff-*-audio|mpd)
+		(rcm-browser|te2000-browser|recombee-browser|mpd|void-*-browser|void-mpd)
 			setup-sndio
 			;;
 		(alpine-recombee)
@@ -102,12 +98,6 @@
 			setup-gpg-agent
 			setup-pass-show smtp:/te2000.cz/ccx smtp:/disroot.org/ccx
 			;;
-		(weechat)
-			setup-pass-show weechat/P14s-gen2
-			;;
-		(bzr)
-			setup-ssh-exec ccx@saturnin ccx@eva {ccx,www}@www_te2000
-			;;
 	esac
 	return 0
 }

=== renamed file 'xpra-skel/homedir/bin/start-xpra-for-container' => 'xpra-skel/homedir/bin/run-in-container-xpra'
=== modified file 'xsession-skel/homedir/bin/run-in-container-xpra'
--- old/xsession-skel/homedir/bin/run-in-container-xpra	2024-04-23 21:15:55 +0000
+++ new/xsession-skel/homedir/bin/run-in-container-xpra	2024-04-17 00:59:47 +0000
@@ -15,7 +15,7 @@
   s6-sudo /run/cmd.s link xsession.$display.$USER xpra.$USER tmp/.X11-unix/X$display || exit $?
 
   local -a xpra
-  xpra=( $(s6-sudo /run/inbox/xpra.ccx/run/exec/x11 $display $xsession_cookie start-xpra-for-container $container) )
+  xpra=( $(s6-sudo /run/inbox/xpra.ccx/run/exec/x11 $display $xsession_cookie run-in-container-xpra recombee-browser.ccx) )
   (($#xpra == 2)) || exit 1
 
   s6-sudo /run/cmd.s link xpra.$USER $container tmp/.X11-unix/X$xpra[1] || exit $?

=== modified file 'xsession-skel/homedir/bin/xkb'
--- old/xsession-skel/homedir/bin/xkb	2024-04-23 21:15:55 +0000
+++ new/xsession-skel/homedir/bin/xkb	2021-01-07 14:25:02 +0000
@@ -1,16 +1,4 @@
 #!/bin/sh
-
-# xmodmap not packaged? use xpra container instead
-set_via_container() {
-  display=${DISPLAY#:}
-  xsession_cookie="$(xauth list $DISPLAY)" || exit $?
-  xsession_cookie=${xsession_cookie##* } || exit $?
-  s6-sudo /run/cmd.s link xsession.$display.$USER xpra.$USER tmp/.X11-unix/X$display || exit $?
-  exec s6-sudo /run/inbox/xpra.$USER/run/exec/x11 "$display" "$xsession_cookie" xkb
-}
-
-set_via_container
-
 setxkbmap \
 	-model thinkpad \
 	-option terminate:ctrl_alt_bksp \