=== removed file 'xsession-skel/home/ccx/.Xdefaults' --- old/xsession-skel/home/ccx/.Xdefaults 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/.Xdefaults 1970-01-01 00:00:00 +0000 @@ -1,66 +0,0 @@ -URxvt.depth: 32 -URxvt.background: [75]black -URxvt.foreground: gray -URxvt.color4: #5555ff -URxvt.color12: #8080ff -URxvt.colorBD: white -URxvt.colorIT: yellow -URxvt.cursorColor: yellow -/* 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.boldFont: -URxvt.italicFont: -URxvt.scrollBar_right: True -URxvt.inheritPixmap: False -URxvt.shading: 40 -URxvt.fading: 20 -URxvt.scrollColor: #535d6c -URxvt.scrollstyle: plain -URxvt.saveLines: 4096 -URxvt.modifier: Mod1 -URxvt.visualBell: False -URxvt.urgentOnBell: True - -URxvt.perl-lib: /home/ccx/.urxvt-perl:/home/ccx/bzr/urxmux/urxvt-perl -/* URxvt.perl-ext: -searchable-scrollback,url-select,unbracket-paste */ -URxvt.perl-ext: -URxvt.perl-ext-common: -URxvt.keysym.M-u: perl:url-select:select_next -URxvt.underlineURLs: true -URxvt.urlLauncher: /home/ccx/bin/urlopen - -/* Rxvt.keysym.Return: \033 */ -/* Rxvt.keysym.BackSpace: \033 */ - -MagicCube4D.nframes180: 90 -MagicCube4D.nframes120: 60 -MagicCube4D.nframes90: 45 - -XTerm.termName: xterm-256color -XTerm*allowBoldFonts: false -XTerm*altSendsEscape: true -XTerm*metaSendsEscape: true -XTerm*eightBitInput: false -XTerm*bellIsUrgent: true -*.Background: black -*.Foreground: gray -*.background: black -*.foreground: gray -*Font: -*-*-medium-r-semicondensed-*-13-*-*-*-*-*-*-* -Ghostscript*background: black -Ghostscript*foreground: gray - -dmenu.font: Fixed:SemiCondensed:pixelsize=12 -dmenu.foreground: #AAAAAA -dmenu.background: #222222 -dmenu.selforeground: #FFFFFF -dmenu.selbackground: #535d6c - -i3wm.focused_border: #4c7899 -i3wm.focused_background: #285577 -i3wm.focused_text: #ffffff -/* -i3wm.focused_border: #33aa00 -i3wm.focused_background: #227700 -*/ === removed file 'xsession-skel/home/ccx/.config/ccx.xmodmap' --- old/xsession-skel/home/ccx/.config/ccx.xmodmap 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/.config/ccx.xmodmap 1970-01-01 00:00:00 +0000 @@ -1,83 +0,0 @@ -! xmodmap for the dead keys stolen from Colemak layout. - -clear lock -add lock = XF86Calculator - -!! left ctrl as compose key -!keysym Control_L = Multi_key Multi_key -!keycode 37 = Multi_key Multi_key - -!keysym Control_L = Mode_switch Mode_switch -keycode 37 = Mode_switch Mode_switch - -!! right win key as second modifier -!keysym Super_R = Mode_switch Mode_switch - -!! the split shift key -!keycode 94 = Shift_L Shift_L Shift_L Shift_L -keycode 94 = Shift_L ISO_Prev_Group Shift_L ISO_Prev_Group -!add shift = Shift_L - -!! menu key -keysym Menu = backslash bar grave asciitilde - -keysym Up = Up NoSymbol uparrow intersection -keysym Left = Left NoSymbol leftarrow ifonlyif -keysym Right = Right NoSymbol rightarrow implies -keysym Down = Down NoSymbol downarrow union - -keycode 49 = grave asciitilde dead_tilde trademark -keycode 10 = 1 exclam exclamdown onesuperior -keycode 11 = 2 at masculine twosuperior -keycode 12 = 3 numbersign ordfeminine threesuperior -keycode 13 = 4 dollar cent sterling -keycode 14 = 5 percent EuroSign yen -keycode 15 = 6 asciicircum hstroke Hstroke -keycode 16 = 7 ampersand eth ETH -keycode 17 = 8 asterisk thorn THORN -keycode 18 = 9 parenleft leftsinglequotemark leftdoublequotemark -keycode 19 = 0 parenright rightsinglequotemark rightdoublequotemark -keycode 20 = minus underscore endash emdash -keycode 21 = equal plus multiply division -keycode 51 = backslash bar notequal approximate - -keycode 24 = q Q adiaeresis Adiaeresis -keycode 25 = w W ecaron Ecaron -keycode 26 = e E eacute Eacute -keycode 27 = r R rcaron Rcaron -keycode 28 = t T dead_acute dead_doubleacute -!keycode 29 = y Y udiaeresis Udiaeresis -keycode 29 = y Y yacute Yacute -keycode 30 = u U uacute Uacute -keycode 31 = i I iacute Iacute -keycode 32 = o O oacute Oacute -keycode 33 = p P oslash Ooblique -keycode 34 = bracketleft braceleft bracketleft U2200 -keycode 35 = bracketright braceright bracketright U2203 -!keycode 36 = Return NoSymbol Return -!keycode 37 = Control_L NoSymbol Control_L - -keycode 38 = a A aacute Aacute -keycode 39 = s S scaron Scaron -keycode 40 = d D dead_diaeresis degree -keycode 41 = f F atilde Atilde -keycode 42 = g G dead_ogonek infinity -keycode 43 = h H dead_caron copyright -keycode 44 = j J dstroke Dstroke -keycode 45 = k K dead_abovering asciitilde -keycode 46 = l L lstroke Lstroke -!keycode 47 = semicolon colon odiaeresis Odiaeresis -keycode 47 = semicolon colon uring Uring -keycode 48 = apostrophe quotedbl grave doublelowquotemark -!keycode 48 = apostrophe quotedbl ssharp registered - -keycode 52 = z Z zcaron Zcaron -keycode 53 = x X dead_circumflex asciitilde -keycode 54 = c C ccaron Ccaron -keycode 55 = v V dead_grave registered -keycode 56 = b B dead_breve asciitilde -keycode 57 = n N ncaron Ncaron -keycode 58 = m M dead_macron mu -keycode 59 = comma less dead_cedilla lessthanequal -keycode 60 = period greater dead_abovedot greaterthanequal -keycode 61 = slash question questiondown asciitilde === removed directory 'xsession-skel/home/ccx/.config/containers' === removed file 'xsession-skel/home/ccx/.config/containers/list' --- old/xsession-skel/home/ccx/.config/containers/list 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/.config/containers/list 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -alpine-dev.ccx -alpine-browsers.ccx -alpine-games.ccx === modified file 'xsession-skel/home/ccx/.config/i3/config' --- old/xsession-skel/home/ccx/.config/i3/config 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/.config/i3/config 2019-05-30 00:37:48 +0000 @@ -13,8 +13,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 "Fixed SemiCondensed 12px" +font pango:Fixed SemiCondensed 12px # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod @@ -46,9 +45,7 @@ #bindsym $mod+b exec zenv urxvt-launch w3m -B #bindsym $mod+i exec zenv urxvt-launch ipython -#bindsym $mod+Shift+O exec xscreensaver-command -lock -bindsym $mod+Shift+O exec powerbox-plumb lock -bindsym $mod+grave exec powerbox-menu +bindsym $mod+Shift+O exec xscreensaver-command -lock bindsym $mod+Shift+G exec wswitch bindsym $mod+Control+t exec mpc toggle bindsym $mod+Control+Up exec amixer set PCM 2dB+ === removed file 'xsession-skel/home/ccx/.zsh-history' --- old/xsession-skel/home/ccx/.zsh-history 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/.zsh-history 1970-01-01 00:00:00 +0000 @@ -1,26 +0,0 @@ -xpra start --dbus-launch= --systemd-run=no --daemon=no --file-transfer=no --open-files=no --open-url=no --printing=no --mdns=no --dbus-proxy=no --dbus-control=no --forward-xdg-open=False :601 -mkdir -p /run/user/1000 -killall Xorg -xpra start --dbus-launch= --systemd-run=no --daemon=no --file-transfer=no --open-files=no --open-url=no --printing=no --mdns=no --dbus-proxy=no --dbus-control=no --forward-xdg-open=False :601 -xpra showconfig --dbus-launch= --systemd-run=no --daemon=no --file-transfer=no --open-files=no --open-url=no --printing=no --mdns=no --dbus-proxy=no --dbus-control=no --forward-xdg-open=False -XAUTHORITY=/run/Xauthority.601 xpra start --dbus-launch= --systemd-run=no --daemon=no --file-transfer=no --open-files=no --open-url=no --printing=no --mdns=no --dbus-proxy=no --dbus-control=no --forward-xdg-open=False --xvfb='/usr/libexec/Xorg -noreset -novtswitch -nolisten tcp +extension RANDR +extension RENDER -auth /run/Xauthority.601 -logfile ${XPRA_LOG_DIR}/Xorg.${DISPLAY}.log -configdir ${XDG_RUNTIME_DIR}/xpra/xorg.conf.d/$PID -config /home/ccx/xpra.xorg.conf' :601 -XAUTHORITY=/run/Xauthority.601 xpra start --dbus-launch= --systemd-run=no --daemon=no --file-transfer=no --open-files=no --open-url=no --printing=no --mdns=no --dbus-proxy=no --dbus-control=no --forward-xdg-open=False --xvfb='/usr/libexec/Xorg -noreset -novtswitch -nolisten tcp +extension RANDR +extension RENDER -auth /run/Xauthority.601 -logfile ${XPRA_LOG_DIR}/Xorg.${DISPLAY}.log -configdir ${XDG_RUNTIME_DIR}/xpra/xorg.conf.d/$PID -config /home/ccx/xpra.xorg.conf' :601 -killall Xorg -killall Xorg -XAUTHORITY=/run/Xauthority.601 xpra start --dbus-launch= --systemd-run=no --daemon=no --file-transfer=no --open-files=no --open-url=no --printing=no --mdns=no --dbus-proxy=no --dbus-control=no --forward-xdg-open=False --xvfb='/usr/libexec/Xorg -noreset -novtswitch -nolisten tcp +extension RANDR +extension RENDER -auth /run/Xauthority.601 -logfile ${XPRA_LOG_DIR}/Xorg.${DISPLAY}.log -configdir ${XDG_RUNTIME_DIR}/xpra/xorg.conf.d/$PID -config /home/ccx/xpra.xorg.conf' :601 -killall Xorg -killall Xorg -XAUTHORITY=/run/Xauthority.601 xpra start --dbus-launch= --systemd-run=no --daemon=no --file-transfer=no --open-files=no --open-url=no --printing=no --mdns=no --dbus-proxy=no --dbus-control=no --forward-xdg-open=False --xvfb='/usr/libexec/Xorg -noreset -novtswitch -nolisten tcp +extension RANDR +extension RENDER -auth /run/Xauthority.601 -logfile ${XPRA_LOG_DIR}/Xorg.${DISPLAY}.log -configdir ${XDG_RUNTIME_DIR}/xpra/xorg.conf.d/$PID -config /home/ccx/xpra.xorg.conf' :601 -killall Xorg -. ./.zshrc -XAUTHORITY=/run/Xauthority.601 xpra start --dbus-launch= --systemd-run=no --daemon=no --file-transfer=no --open-files=no --open-url=no --printing=no --mdns=no --dbus-proxy=no --dbus-control=no --forward-xdg-open=False --xvfb='/usr/libexec/Xorg -noreset -novtswitch -nolisten tcp +extension RANDR +extension RENDER -auth /run/Xauthority.601 -logfile ${XPRA_LOG_DIR}/Xorg.${DISPLAY}.log -configdir ${XDG_RUNTIME_DIR}/xpra/xorg.conf.d/$PID -config /home/ccx/xpra.xorg.conf' :601 -xpra attach --daemon=no --opengl=no --title='/:601/ @title@ wid:@wid@' :601 -xpra attach --daemon=no --opengl=no --title='/:601/ @title@ wid:@windowid@' :601 -xpra attach --daemon=no --opengl=no --title='/:601/ @title@ wid:@windowid@' :601 -. ./.zshrc -xpra attach --daemon=no --opengl=no --title='/:601/ @title@ wid:@windowid@' :601 -vi .zshrc -. ./.zshrc -ls -ls -lA -cat .zsh-history === removed file 'xsession-skel/home/ccx/.zshrc' --- old/xsession-skel/home/ccx/.zshrc 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/.zshrc 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ -# Lines configured by zsh-newuser-install -HISTFILE=~/.zsh-history -HISTSIZE=1000 -SAVEHIST=1000 -# End of lines configured by zsh-newuser-install -# The following lines were added by compinstall -zstyle :compinstall filename '/home/ccx/.zshrc' - -autoload -Uz compinit -compinit -# End of lines added by compinstall -autoload -Uz promptinit -promptinit -prompt suse -setopt inc_append_history === removed directory 'xsession-skel/home/ccx/bin' === removed file 'xsession-skel/home/ccx/bin/abduco-container' --- old/xsession-skel/home/ccx/bin/abduco-container 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/bin/abduco-container 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -#!/bin/zsh -setopt no_unset - -container=$1 -session=$2 -shift 2 || exit 100 -[[ $container == */* ]] && exit 100 - -powerbox-plumb "abduco!$container!$session!$( for arg in "$@"; do s6-quote -- "$arg"; done )" === removed file 'xsession-skel/home/ccx/bin/fakeplumb' --- old/xsession-skel/home/ccx/bin/fakeplumb 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/bin/fakeplumb 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -#!/bin/zsh -setopt no_unset warn_create_global no_multibyte # count bytes in argv[1] -zmodload zsh/zutil - -typeset -ga plumb_src plumb_dst plumb_wdir plumb_type plumb_attr - -zparseopts -D -E s:=plumb_src d:=plumb_dst w:=plumb_wdir t:=plumb_type a:=plumb_attr || exit $? - -printf "%s\n%s\n%s\n%s\n%s\n%d\n%s" "${plumb_src:-fakeplumb}" "$plumb_dst" "$plumb_wdir" "${plumb_type:-text}" "${plumb_attr}" "$#1" "$1" === removed file 'xsession-skel/home/ccx/bin/powerbox-menu' --- old/xsession-skel/home/ccx/bin/powerbox-menu 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/bin/powerbox-menu 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ -#!/bin/zsh -setopt no_unset -cmds=( - lock - show-inbox - root-terminal - terminal-wpa_cli - exit -) -cmds+=( "${(f@)"$( - sed 's|.*|abduco!&!shell!zsh -li|' ~/.config/containers/list -)"}" ) -cmds+=( 'ssh!dorje' ) -choice=$( dmenu <<<${(F)cmds} ) -[[ -n $choice ]] && exec powerbox-plumb "$choice" === removed file 'xsession-skel/home/ccx/bin/powerbox-plumb' --- old/xsession-skel/home/ccx/bin/powerbox-plumb 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/bin/powerbox-plumb 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -#!/bin/sh -exec fakeplumb >/run/plumber_fifo "$@" === removed file 'xsession-skel/home/ccx/bin/run-in-container-xpra' --- old/xsession-skel/home/ccx/bin/run-in-container-xpra 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/bin/run-in-container-xpra 1970-01-01 00:00:00 +0000 @@ -1,80 +0,0 @@ -#!/bin/zsh -setopt no_unset -zmodload zsh/system - -container=$1 -shift || exit 100 -[[ $container == */* ]] && exit 100 - -display='' -#$(( ${${DISPLAY#}%%.*} * 100 )) -#(( $display > 0 )) || exit 111 - -map=/run/display-container-map -mkdir -p $map || exit $? -touch $map/.lock || exit $? -zsystem flock -f lockfd $map/.lock || exit $? - -running=( $map/*=$container(N) ) - -if ! (($#running)); then - # spawn a new Xpra session this container. - all=( $map/*=*(N) ) - all=( ${${all:t}%%=*} ) - for n in {${${DISPLAY%%.*}#:}00..${${DISPLAY%%.*}#:}99}; do - if (( $all[(I)n] == 0 )); then - display=$n - touch $map/$display=$container - break - fi - done - if [[ -z $display ]]; then - exit 2 # All 999 displays occupier?! - fi -else - display=${${running[1]:t}%%=*} -fi - -typeset -gA svc_extra -mksvcdir(){ - local name tmpsv f data - name=$1 - shift - mkdir -p /run/tmp/service || exit $? - tmpsv=/run/tmp/service/$name - mkdir $tmpsv || exit $? - touch $tmpsv/run || exit $? - printf '%s\n' "$@" >$tmpsv/run || exit $? - chmod +x $tmpsv/run || exit $? - svc_extra=( ) - mv $tmpsv /run/service/ || exit $? - s6-svscanctl -a /run/service || exit $? -} - -if ! [[ -d /run/service/xpra-server.$display ]]; then - mksvcdir xpra-server.$display \ - '#!/bin/execlineb -P' \ - xpra-server $display --displayfd=3 - echo 3 >/run/service/xpra-server.$display/notification-fd -fi - -if ! [[ -d /run/service/xpra-client.$display ]]; then - mksvcdir xpra-client.$display \ - '#!/bin/execlineb -P' \ - xpra-client "$display" \ - "--title=\"[${container}:${display}] @title@ wid:@windowid@\"" -fi - -zsystem flock -u $lockfd - -s6-svc -wU -T 5000 -o /run/service/xpra-server.$display || exit $? -s6-svc -o /run/service/xpra-client.$display || exit $? - -# Obtain authentication cookie -cookies=( $(xauth -f /run/Xauthority.$display list :$display ) ) -(( $#cookies == 3 )) || exit 1 -[[ $cookies[2] == MIT-MAGIC-COOKIE-1 ]] || exit 1 -cookie=$cookies[3] - - -powerbox-plumb "x11!$container!$display!$cookie!$( for arg in "$@"; do s6-quote -- "$arg"; done )" === removed file 'xsession-skel/home/ccx/bin/xkb' --- old/xsession-skel/home/ccx/bin/xkb 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/bin/xkb 1970-01-01 00:00:00 +0000 @@ -1,10 +0,0 @@ -#!/bin/sh -setxkbmap \ - -model thinkpad \ - -option terminate:ctrl_alt_bksp \ - -option caps:ctrl_modifier \ - -option compose:ralt \ - -option grp:shift_toggle \ - -option grp_led:scroll \ - us,cz ,qwerty -xmodmap ~/.config/ccx.xmodmap === removed file 'xsession-skel/home/ccx/bin/xpra-client' --- old/xsession-skel/home/ccx/bin/xpra-client 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/bin/xpra-client 1970-01-01 00:00:00 +0000 @@ -1,21 +0,0 @@ -#!/bin/zsh -setopt no_unset -xpra_display=${1#:} -shift -args=( - --daemon=no - --opengl=no - --title="/:${xpra_display}/ @title@ wid:@windowid@" - - --notifications=no - --cursors=yes - --xsettings=yes - --system-tray=no - --bell=yes - - --opengl=no - --mmap=yes - --clipboard=yes - --pulseaudio=no -) -exec xpra attach "$args[@]" "$@" :$xpra_display === removed file 'xsession-skel/home/ccx/bin/xpra-server' --- old/xsession-skel/home/ccx/bin/xpra-server 2021-01-07 14:25:02 +0000 +++ new/xsession-skel/home/ccx/bin/xpra-server 1970-01-01 00:00:00 +0000 @@ -1,38 +0,0 @@ -#!/bin/zsh -setopt no_unset -xpra_display=${1#:} -shift - -export XAUTHORITY=/run/Xauthority.$xpra_display -truncate -s 0 $XAUTHORITY || exit $? -{ printf "add :%d . " $1; xxd -p -l 16