=== modified file 'home/container-setup' (properties changed: -x to +x)
--- old/home/container-setup	2024-04-05 18:32:10 +0000
+++ new/home/container-setup	2024-04-05 18:18:31 +0000
@@ -47,15 +47,6 @@
 	done
 }
 
-setup-pass() {
-	local -a svc_names
-	local s
-	svc_names=( "${@//\//!}" )
-	for s in $svc_names; do
-		to-current-inbox pass.$USER run/pass/$s || exit $?
-	done
-}
-
 main() {
 	if ! [[ -d $DSTROOT ]]; then
 		echo >&2 "Destination root not a directory: $DSTROOT" 

=== modified file 'home/xsession-setup'
--- old/home/xsession-setup	2024-04-05 18:32:10 +0000
+++ new/home/xsession-setup	2024-04-05 18:18:31 +0000
@@ -53,16 +53,6 @@
 	ln -f /run/user/$USER/service/pass-list/s $DSTROOT/run/pass-list.s || exit $?
 }
 
-setup-powerbox-menu-list() {
-	s6-rc -l /run/user/ccx/s6-rc -u change powerbox-menu-list || exit $?
-	ln -f /run/user/ccx/service/powerbox-menu-list/s $DSTROOT/run/powerbox-menu-list.s || exit $?
-}
-
-setup-svstat() {
-	s6-rc -l /run/user/ccx/s6-rc -u change svstat || exit $?
-	ln -f /run/user/ccx/service/svstat/s $DSTROOT/run/svstat.s || exit $?
-}
-
 setup-init() {
 	ln -sf /home/$USER/run $DSTROOT/run/user-run || exit $?
 	ln -sf user-run/init $DSTROOT/run/init || exit $?
@@ -70,12 +60,12 @@
 
 main() {
 	if ! [[ -d $DSTROOT ]]; then
-		echo >&2 "Destination root not a directory: $DSTROOT"
+		echo >&2 "Destination root not a directory: $DSTROOT" 
 		exit 2
 	fi
 
 	if [[ $DISPLAYNUM != [0-9] ]]; then
-		echo >&2 "Invalid display number: $DISPLAYNUM"
+		echo >&2 "Invalid display number: $DISPLAYNUM" 
 		exit 3
 	fi
 
@@ -84,8 +74,6 @@
 	setup-x11
 	setup-i3status
 	setup-pass-list
-	setup-powerbox-menu-list
-	setup-svstat
 	setup-init
 }
 

=== modified file 'xsession-skel/homedir/.Xdefaults'
--- old/xsession-skel/homedir/.Xdefaults	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/.Xdefaults	2023-01-10 19:16:35 +0000
@@ -9,7 +9,7 @@
 # /* lang=cs-CZ is here because otherwise the latin1-only variant is preffered, instead of the full unicode one */
 # /* URxvt.font: -*-*-medium-r-semicondensed-*-13-*-*-*-*-*-*-*,xft:Fixed:semicondensed:pixelsize=13:lang=cs-CZ */
 # /* URxvt.font: xft:Fixed:semicondensed:pixelsize=13,-*-*-medium-r-semicondensed-*-13-*-*-*-*-*-*-*,xft:Terminus,xft:unifont,xft:Symbola */
-URxvt.font: xft:Misc Fixed:style=SemiCondensed:pixelsize=13px:lang=cs,xft:UW ttyp0:antialias=False:pixelsize=12,xft:Fairfax:antialias=False:pixelsize=12,xft:mplus fxd,xft:Noto Sans Mono
+URxvt.font: xft:Fixed:style=SemiCondensed:pixelsize=13px:lang=cs,xft:UW ttyp0:antialias=False:pixelsize=12,xft:Fairfax:antialias=False:pixelsize=12,xft:mplus fxd,xft:Noto Sans Mono
 URxvt.boldFont:
 URxvt.italicFont:
 URxvt.scrollBar_right: True
@@ -53,7 +53,7 @@
 Ghostscript*background: black
 Ghostscript*foreground: gray
 
-dmenu.font: Misc Fixed:SemiCondensed:pixelsize=12
+dmenu.font: Fixed:SemiCondensed:pixelsize=12
 dmenu.foreground: #AAAAAA
 dmenu.background: #222222
 dmenu.selforeground: #FFFFFF

=== modified file 'xsession-skel/homedir/.config/i3/config'
--- old/xsession-skel/homedir/.config/i3/config	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/.config/i3/config	2021-01-07 14:25:02 +0000
@@ -14,7 +14,7 @@
 # font for window titles. ISO 10646 = Unicode
 #font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 #font pango:Fixed SemiCondensed 12px
-font "Misc Fixed SemiCondensed 12px"
+font "Fixed SemiCondensed 12px"
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -51,8 +51,8 @@
 bindsym $mod+grave exec powerbox-menu
 bindsym $mod+Shift+G exec wswitch
 bindsym $mod+Control+t exec mpc toggle
-bindsym $mod+Control+Up exec powerbox-plumb "amixer/set PCM 2dB+"
-bindsym $mod+Control+Down exec powerbox-plumb "amixer/set PCM 2dB-"
+bindsym $mod+Control+Up exec amixer set PCM 2dB+
+bindsym $mod+Control+Down exec amixer set PCM 2dB-
 
 # bindsym $mod+space mark --toggle M
 # bindsym $mod+Shift+space move window to mark M

=== modified file 'xsession-skel/homedir/bin/autoxrandr'
--- old/xsession-skel/homedir/bin/autoxrandr	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/bin/autoxrandr	2023-01-10 19:16:35 +0000
@@ -17,7 +17,7 @@
 
 		# Doma, ViewSonic
 		("HDMI1 connected 00ffffffffffff005a635120010101010312010380311d782ee525a65444a125145054bfef80b300a94081808140714f01010101010121399030621a274068b03600ef231100001c000000ff005154533038303330353833320a000000fd00324b1e5211000a202020202020000000fc00564132323236772d330a2020200072")
-		xrandr --output ${1%% *} --above LVDS1 --auto
+		xrandr --output ${1%% *} --right-of LVDS1 --auto
 		;;
 
 		# TE2000, MultiSync E223W

=== removed file 'xsession-skel/homedir/bin/ff_te2000_sndio'
--- old/xsession-skel/homedir/bin/ff_te2000_sndio	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/bin/ff_te2000_sndio	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/usr/bin/execlineb -P
-run-in-container-xpra void-te2000-browser.ccx ./ff_with_sndio

=== removed file 'xsession-skel/homedir/bin/i3init'
--- old/xsession-skel/homedir/bin/i3init	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/bin/i3init	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-#!/bin/zsh
-workspaces=(
-	16:D
-	15:S
-	14:A
-	13:E
-	12:W
-	11:Q
-	10
-	9
-	8
-	7
-	6
-	5
-	4
-	3
-	2
-	1
-)
-
-for ws in $workspaces; do
-	layout=$HOME/.cache/i3/layout.$(tr -d '\n' <<<$ws | xxd -p).json
-	if [[ -e $layout ]] ; then
-		i3-msg "workspace \"$ws\" ; append_layout \"$layout\"" || exit $?
-	fi
-done
-
-svdir=$HOME/.local/share/xservice/${DISPLAY//:/@}
-tmux-autoattach
-sv once $svdir/xpra && sv check $svdir/xpra
-sv once $svdir/i3restore

=== removed file 'xsession-skel/homedir/bin/i3subscribe'
--- old/xsession-skel/homedir/bin/i3subscribe	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/bin/i3subscribe	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#!/usr/bin/env perl
-
-BEGIN { $| = 1 } # flush \n
-
-use strict;
-use warnings;
-use Data::Dumper;
-use AnyEvent::I3;
-use v5.10;
-
-my $i3 = i3();
-$i3->connect->recv or die "Error connecting to i3";
-
-sub subscribe {
-    my $ev = $_[0];
-    my $dump = $_[1];
-    if($i3->subscribe({
-        $ev => sub {
-            my ($msg) = @_;
-            say "$ev:$msg->{'change'}";
-            if($dump) {
-                print Dumper($msg);
-            }
-        }
-    })->recv->{success}) {
-        say "Successfully subscribed to $ev-event";
-    }
-}
-
-my $nextArg = shift;
-if(!$nextArg) {
-    say "Subscribe to i3-events";
-    say "Usage:   $0 workspace|output|mode|window|barconfig_update|binding [dump]";
-    say "Example: $0 workspace dump window binding dump";
-    exit 1;
-}
-while($nextArg) {
-    my $arg = $nextArg;
-    $nextArg = shift;
-    my $dump = 0;
-    if($nextArg and $nextArg eq "dump") {
-        $dump = 1;
-        $nextArg = shift;
-    }
-    subscribe("$arg", $dump);
-}
-AE::cv->recv;

=== modified file 'xsession-skel/homedir/bin/powerbox-menu'
--- old/xsession-skel/homedir/bin/powerbox-menu	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/bin/powerbox-menu	2023-02-06 12:59:20 +0000
@@ -7,8 +7,7 @@
 	terminal-wpa_cli
 	\!open-im
 	\!ff
-	\!ff_{recombee,te2000}_sndio
-	'!scrot -d 2 -u'
+	\!ff_recombee_sndio
 	exit
 	adjust-brightness/{1,2,3,4,5,6,7,8,9,10}0%
 )
@@ -24,27 +23,14 @@
 )"}" )
 
 cmds+=(
-	ssh{,2}/{dorje,hexusb,saturnin,daruma,ccx.blesmrt.net}
-)
-
-# --- new implementation
-
-cmds=( "${(f@)"$(
-	s6-ipcclient /run/powerbox-menu-list.s s6-ioconnect
-)"}" )
-
-cmds+=(
-	\!open-im
-	\!ff
-	\!ff_{recombee,te2000}_sndio
-	'!scrot -d 2 -u'
+	ssh{,2}/dorje
 )
 
 for sock in /run/vnc.59*(N); do
 	cmds+=( "!gvncviewer 127.0.0.1:${sock##*/vnc.59}" )
 done
 
-choice=$( dmenu -fn 'Misc Fixed:semicondensed:pixelsize=13:lang=cs' <<<${(F)cmds} )
+choice=$( dmenu -fn 'Fixed:semicondensed:pixelsize=13:lang=cs' <<<${(F)cmds} )
 case $choice in
 	('!'*) eval ${choice#!};;
 	('') exit 0;;

=== removed file 'xsession-skel/homedir/bin/x'
--- old/xsession-skel/homedir/bin/x	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/bin/x	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/zsh
-autoxrandr
-xkb
-for N in {00..10}; do
-	DISPLAY=$DISPLAY$N xkb
-done

=== modified file 'xsession-skel/homedir/bin/xpass'
--- old/xsession-skel/homedir/bin/xpass	2024-03-21 16:50:43 +0000
+++ new/xsession-skel/homedir/bin/xpass	2022-08-22 20:59:45 +0000
@@ -1,5 +1,5 @@
 #!/bin/zsh
 wid=$(xdotool getactivewindow) &&
-pass=$(s6-ipcclient /run/pass-list.s s6-ioconnect | dmenu -fn 'Misc Fixed:semicondensed:pixelsize=13:lang=cs' -p "$(xdotool getwindowname $wid)") &&
+pass=$(s6-ipcclient /run/pass-list.s s6-ioconnect | dmenu -fn 'Fixed:semicondensed:pixelsize=13:lang=cs' -p "$(xdotool getwindowname $wid)") &&
 powerbox-plumb "pass-input/wid:$wid/$pass"
 #pass show $pass | sed 's/.*/type --window '${wid}' "&"/;q' | xdotool -