=== modified file 'home/container-setup'
--- old/home/container-setup	2024-07-27 01:48:41 +0000
+++ new/home/container-setup	2024-07-23 21:43:18 +0000
@@ -113,9 +113,6 @@
 			to-current-inbox $CONTAINER_NAME-net.$USER run/exec/sync-mail
 			setup-gpg-agent
 			;;
-		(profanity)
-			setup-pass-show xmpp:/blesmrt.net/ccx
-			;;
 		(weechat)
 			setup-pass-show weechat/P14s-gen2
 			;;
@@ -130,10 +127,6 @@
 		(socials)
 			to-current-inbox tor.$USER run/tor/socks
 			;;
-		(x11-dev)
-			to-current-inbox tinyproxy.$USER run/http_proxy/pypi
-			to-current-inbox git.$USER run/git/ro.github.com
-			;;
 		(ssrn-master-dev)
 			to-current-inbox tinyproxy.$USER run/http_proxy/pypi
 			;;

=== modified file 'xpra-skel/homedir/bin/clip'
--- old/xpra-skel/homedir/bin/clip	2024-07-27 01:48:41 +0000
+++ new/xpra-skel/homedir/bin/clip	2024-05-07 20:36:32 +0000
@@ -6,11 +6,8 @@
 
 get-clip() {
 	local sel out name=$1
-	local -a env=( env )
-	[[ -f /run/Xauthority.${DISPLAY#:} ]] && \
-		env+=( XAUTHORITY=/run/Xauthority.${DISPLAY#:} )
 	for sel in CLIPBOARD PRIMARY; do
-		out=$( $env xclip -o -sel $sel ) && \
+		out=$( xclip -o -sel $sel ) && \
 			[[ -n $out ]] &&
 			clipboards[${sel:l}@$name]=$out
 	done

=== modified file 'xpra-skel/homedir/bin/start-xpra-for-container'
--- old/xpra-skel/homedir/bin/start-xpra-for-container	2024-07-27 01:48:41 +0000
+++ new/xpra-skel/homedir/bin/start-xpra-for-container	2024-07-24 14:44:33 +0000
@@ -242,7 +242,7 @@
   - sv_el_script run \
     's6-envdir env' \
     xpra-client "$display" \
-    "--title=\"[${container}] @title@ «s=@server-machine@ c=@client-machine@ d=$display w=@xid@\""
+    "--title=\"[${container}] @title@ «s=@server-machine@ c=@client-machine@ d=@hostinfo@ w=@xid@\""
   - sv_common_finish
   - sv_env DISPLAY $DISPLAY
   - sv_end

=== modified file 'xpra-skel/homedir/bin/xkb'
--- old/xpra-skel/homedir/bin/xkb	2024-07-27 01:48:41 +0000
+++ new/xpra-skel/homedir/bin/xkb	2024-04-17 00:59:47 +0000
@@ -1,11 +1,10 @@
 #!/bin/sh
-set -e
 setxkbmap \
-	-model pc105 \
+	-model thinkpad \
 	-option terminate:ctrl_alt_bksp \
 	-option caps:ctrl_modifier \
 	-option compose:ralt \
+	-option grp:shift_toggle \
 	-option grp_led:scroll \
-	us,us #,cz ,qwerty
-	#-option grp:shift_toggle \
+	us,cz ,qwerty
 xmodmap ~/.config/ccx.xmodmap

=== modified file 'xpra-skel/homedir/bin/xkb-all'
--- old/xpra-skel/homedir/bin/xkb-all	2024-07-27 01:48:41 +0000
+++ new/xpra-skel/homedir/bin/xkb-all	2024-07-24 14:44:33 +0000
@@ -1,5 +1,4 @@
 #!/bin/sh
-set -x
 for sock in /tmp/.X11-unix/X*; do
 	if [[ -e /run/Xauthority.${sock##*/X} ]]; then
 		env XAUTHORITY=/run/Xauthority.${sock##*/X} DISPLAY=:${sock##*/X} xkb

=== modified file 'xpra-skel/homedir/bin/xpra-client'
--- old/xpra-skel/homedir/bin/xpra-client	2024-07-27 01:48:41 +0000
+++ new/xpra-skel/homedir/bin/xpra-client	2024-07-24 14:44:33 +0000
@@ -3,19 +3,12 @@
 xpra_display=${1#:}
 shift
 args=(
-	--splash=no
 	--daemon=no
 	--opengl=no
+	--title="/:${xpra_display}/ @title@ wid:@windowid@"
 	--dpi=96
 	--pixel-depth=24
 
-	# try to prevent invisible windows
-	--border=$(hsl-to-rgb $(( (xpra_display*0.27460512339682597)%1 )) 1 $((2./3)) ),2
-	--min-size=32x32
-	# --max-size=
-	--modal-windows=no
-
-	--minimal=yes
         --notifications=no
         --cursors=yes
         --xsettings=yes
@@ -29,15 +22,16 @@
 	--webcam=no
 	--speaker=off
 	--microphone=off
+	--modal-windows=no
 
 	--tray=no
 
 	--keyboard-raw=yes
 	
-	##--keyboard-model thinkpad
-	--keyboard-options=terminate:ctrl_alt_bksp,caps:ctrl_modifier,compose:ralt
-	--keyboard-layouts=us
-	--keyboard-variants=
+	#--keyboard-model thinkpad
+	--keyboard-options=terminate:ctrl_alt_bksp,caps:ctrl_modifier,compose:ralt,grp:shift_toggle,grp_led:scroll
+	--keyboard-layouts=us,cz 
+	--keyboard-variants=,qwerty
 )
 
 # Hacky hack. Wait until xpra client resets the layout and then set the actual one.

=== modified file 'xpra-skel/homedir/bin/xpra-server'
--- old/xpra-skel/homedir/bin/xpra-server	2024-07-27 01:48:41 +0000
+++ new/xpra-skel/homedir/bin/xpra-server	2024-07-23 21:42:18 +0000
@@ -7,9 +7,21 @@
 truncate -s 0 $XAUTHORITY || exit $?
 { printf "add :%d . " $xpra_display; busybox xxd -p -l 16 </dev/urandom } | xauth -f $XAUTHORITY || exit $?
 
+server=(
+	/usr/libexec/Xorg
+	-noreset
+	-novtswitch
+	-nolisten tcp
+	+extension RANDR
+	+extension RENDER
+	-auth /run/Xauthority.$xpra_display
+	-logfile '${XPRA_LOG_DIR}/Xorg.${DISPLAY}.log'
+	-configdir '${XDG_RUNTIME_DIR}/xpra/xorg.conf.d/$PID'
+	-config /home/ccx/xpra.xorg.conf
+)
+
 args=(
 	--attach=no
-	--minimal=yes
 	--audio=no
 	--bell=yes
 	--clipboard=no
@@ -27,5 +39,6 @@
 	--printing=no
 	--systemd-run=no
 	--xvfb="${commands[xpra-launch-xorg]} /run/service/xpra-xorg.$xpra_display"
+	# --xvfb="$server"
 )
 exec xpra start "$args[@]" "$@" :$xpra_display

=== modified file 'xsession-skel/homedir/.config/i3/config'
--- old/xsession-skel/homedir/.config/i3/config	2024-07-27 01:48:41 +0000
+++ new/xsession-skel/homedir/.config/i3/config	2024-05-24 21:52:30 +0000
@@ -27,17 +27,16 @@
 show_marks yes
 
 for_window [all] title_format "%instance» %title"
-for_window [all] title_window_icon padding 3
 
 for_window [title="Media viewer" class="TelegramDesktop"] floating enable, fullscreen enable
 
-set_from_resource $f_bord i3wm.focused_border #4c7899
-set_from_resource $f_back i3wm.focused_background #285577
+set_from_resource $f_border i3wm.focused_border #4c7899
+set_from_resource $f_background i3wm.focused_background #285577
 set_from_resource $f_text i3wm.focused_text #ffffff
 
 # class                 border  backgr. text    indicator child_border
-client.focused          $f_bord $f_back $f_text #2e9ef4   #666666
-client.focused_inactive #333333 #5f676a #ffffff #484e50   #333333
+client.focused          $f_border $f_background $f_text #2e9ef4   $f_background
+client.focused_inactive #333333 #5f676a #ffffff #484e50   #5f676a
 client.unfocused        #333333 #222222 #888888 #292d2e   #222222
 client.urgent           #2f343a #900000 #ffffff #900000   #900000
 client.placeholder      #000000 #0c0c0c #ffffff #000000   #0c0c0c
@@ -298,6 +297,6 @@
         status_command s6-ipcclient /run/i3status.s s6-ioconnect -67
         strip_workspace_numbers yes
         colors {
-                focused_workspace $f_bord $f_back $f_text
+                focused_workspace $f_border $f_background $f_text
         }
 }

=== modified file 'xsession-skel/homedir/bin/clip'
--- old/xsession-skel/homedir/bin/clip	2024-07-27 01:48:41 +0000
+++ new/xsession-skel/homedir/bin/clip	2024-05-07 20:36:32 +0000
@@ -2,9 +2,7 @@
 setopt no_unset extended_glob # warn_create_global
 typeset -gA clipboards
 set -x
-s6-sudo /run/cmd.s link xpra.$USER xsession.${DISPLAY#:}.$USER run/exec/exec || exit $?
 clipboards=( ${(0)"$(s6-sudo /run/inbox/xpra.ccx/run/exec/exec clip -0)"} )
-#clipboards=( ${(0)"$(c.exec xpra.$USER clip -0)"} )
 choice=$(printf '%s » %s\n' ${(kv)clipboards//$'\n'/»} | dmenu -l 8 -fn Terminus)
 choice=${choice%% » *}
 printf "%s\n" $clipboards[$choice]

=== modified file 'xsession-skel/homedir/bin/shiftinsert'
--- old/xsession-skel/homedir/bin/shiftinsert	2024-07-27 01:48:41 +0000
+++ new/xsession-skel/homedir/bin/shiftinsert	2024-05-07 20:36:32 +0000
@@ -15,9 +15,9 @@
 [[ -n $win_meta[w] && -n $win_meta[d] ]] || exit 3 
 
 #s6-sudo /run/inbox/xpra.ccx/run/exec/exec export DISPLAY $win_meta[d] xdotool getwindowname $win_meta[w]
-s6-sudo /run/inbox/xpra.ccx/run/exec/exec in-xpra $win_meta[d] wmctrl -l
+s6-sudo /run/inbox/xpra.ccx/run/exec/exec export DISPLAY $win_meta[d] wmctrl -l
 
 clip | IFS= read -r -d '' clip
 [[ -n $clip ]] || exit $?
-s6-sudo /run/inbox/xpra.ccx/run/exec/exec in-xpra $win_meta[d] xclip -i -sel CLIPBOARD <<<$clip || exit $?
+s6-sudo /run/inbox/xpra.ccx/run/exec/exec export DISPLAY $win_meta[d] xclip -i -sel CLIPBOARD <<<$clip || exit $?
 xdotool windowfocus $wid key --clearmodifiers --window $wid 'Shift+Insert'