=== modified file 'home/container-setup' --- old/home/container-setup 2023-01-10 19:16:35 +0000 +++ new/home/container-setup 2022-10-13 13:29:52 +0000 @@ -25,7 +25,6 @@ } setup-gpg-agent() { - s6-rc -v2 -u -l /run/user/${UID}/s6-rc change fdholder ln -fv /run/user/$UID/gpg-agent-ssh.sock $DSTROOT/inbox/ || exit $? ln -fv /run/user/$UID/gpg-agent.sock $DSTROOT/inbox/ || exit $? } === modified file 'xsession-skel/homedir/.Xdefaults' --- old/xsession-skel/homedir/.Xdefaults 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/.Xdefaults 2021-06-21 19:09:33 +0000 @@ -6,10 +6,10 @@ 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 */ +/* lang=cs-CZ is here because otherwise the latin1-only variant is preffered, instead of the full unicode one */ 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.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 @@ -24,16 +24,16 @@ 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: -searchable-scrollback,url-select,unbracket-paste */ URxvt.perl-ext: -searchable-scrollback,-url-select,unbracket-paste -URxvt.perl-ext-common: +/* 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 */ +/* Rxvt.keysym.Return: \033 */ +/* Rxvt.keysym.BackSpace: \033 */ MagicCube4D.nframes180: 90 MagicCube4D.nframes120: 60 @@ -59,8 +59,10 @@ dmenu.selforeground: #FFFFFF dmenu.selbackground: #535d6c -# /* i3wm.focused_border: #33aa00 */ -# /* i3wm.focused_background: #227700 */ i3wm.focused_border: #4c7899 i3wm.focused_background: #285577 i3wm.focused_text: #ffffff +/* +i3wm.focused_border: #33aa00 +i3wm.focused_background: #227700 +*/ === modified file 'xsession-skel/homedir/.zshrc' --- old/xsession-skel/homedir/.zshrc 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/.zshrc 2022-05-30 23:09:09 +0000 @@ -1,7 +1,7 @@ # Lines configured by zsh-newuser-install HISTFILE=~/.zsh-history -HISTSIZE=800000 -SAVEHIST=400000 +HISTSIZE=2000 +SAVEHIST=1000 # End of lines configured by zsh-newuser-install # The following lines were added by compinstall zstyle :compinstall filename '/home/ccx/.zshrc' === modified file 'xsession-skel/homedir/bin/autoxrandr' --- old/xsession-skel/homedir/bin/autoxrandr 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/bin/autoxrandr 2022-10-12 17:31:26 +0000 @@ -22,8 +22,7 @@ # TE2000, MultiSync E223W ("DP1 connected 00ffffffffffff0038a3ef680000000031170104a52f1e78e23cf5a4554c9b250e5054bfef8081c0814081808bc095009040b300714f21399030621a274068b03600da281100001c000000fd00384b1f5311000a202020202020000000fc0045323233570a20202020202020000000ff00335a33303038363854420a202000fa") - #xrandr --output ${1%% *} --right-of LVDS1 --auto --rotate left - xrandr --output ${1%% *} --above LVDS1 --auto --rotate normal + xrandr --output ${1%% *} --right-of LVDS1 --auto --rotate left ;; # Recombee, Samsung, backend === removed file 'xsession-skel/homedir/bin/exitwrapper' --- old/xsession-skel/homedir/bin/exitwrapper 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/bin/exitwrapper 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ -#!/usr/bin/execlineb -piperw 3 4 -background { - fdclose 4 - fdmove 0 3 - s6-setsid -b - foreground { cat } - runblock 1 -} -fdclose 3 -if { - fdclose 4 - runblock -r 1 -} === removed file 'xsession-skel/homedir/bin/i3-pom' --- old/xsession-skel/homedir/bin/i3-pom 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/bin/i3-pom 1970-01-01 00:00:00 +0000 @@ -1,20 +0,0 @@ -#!/usr/bin/execlineb -S0 -exitwrapper { - foreground { - importas -i HOME HOME - xrdb -merge ${HOME}/.Xdefaults - } - i3-msg reload -} -if { - pipeline { - printf "%s\n" - "i3wm.focused_border: #33aa00" - "i3wm.focused_background: #227700" - } - xrdb -merge -} -if { - i3-msg reload -} -$@ === removed file 'xsession-skel/homedir/bin/i3-pom.zsh' --- old/xsession-skel/homedir/bin/i3-pom.zsh 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/bin/i3-pom.zsh 1970-01-01 00:00:00 +0000 @@ -1,13 +0,0 @@ -#!/bin/zsh -setopt no_unset -res_active=" -i3wm.focused_border: #33aa00 -i3wm.focused_background: #227700 -" -res_default=$(xrdb -query | grep '^i3wm') || exit $? -xrdb -merge <<<$res_active -i3-msg reload || exit $? -#tmux-pom "$@" -"$@" -xrdb -merge <<<$res_default -i3-msg reload === modified file 'xsession-skel/homedir/bin/xpra-client' --- old/xsession-skel/homedir/bin/xpra-client 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/bin/xpra-client 2022-02-18 14:01:51 +0000 @@ -7,7 +7,6 @@ --opengl=no --title="/:${xpra_display}/ @title@ wid:@windowid@" --dpi=96 - --pixel-depth=24 --notifications=no --cursors=yes @@ -24,20 +23,7 @@ --microphone=off --modal-windows=no + --keyboard-raw=yes --tray=no - - --keyboard-raw=yes - - #--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. -( - export DISPLAY=:$xpra_display - until xmodmap -pke | grep -q 'keycode \+37 = Control'; do sleep 0.5 || break; done - until xkb; do sleep 0.5 || break; done -) &! exec xpra attach "$args[@]" "$@" :$xpra_display === modified file 'xsession-skel/homedir/bin/xpra-launch-xorg' --- old/xsession-skel/homedir/bin/xpra-launch-xorg 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/bin/xpra-launch-xorg 2021-01-20 13:55:49 +0000 @@ -2,5 +2,4 @@ if { test -d ${1}/supervise } if { s6-dumpenv ${1}/env } if { s6-svc -wU -T 5000 -o $1 } -foreground { xkb } s6-svwait -d -t 15000 $1 === modified file 'xsession-skel/homedir/bin/xpra-server' --- old/xsession-skel/homedir/bin/xpra-server 2023-01-10 19:16:35 +0000 +++ new/xsession-skel/homedir/bin/xpra-server 2021-01-20 13:54:47 +0000 @@ -33,7 +33,6 @@ --dbus-proxy=no --dbus-control=no --forward-xdg-open=False - --keyboard-raw=yes #--xvfb="$server" --xvfb="xpra-launch-xorg /run/service/xpra-xorg.$xpra_display" )