=== removed directory 'adhoc-skel' === removed file 'adhoc-skel/.zshrc' --- old/adhoc-skel/.zshrc 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/.zshrc 1970-01-01 00:00:00 +0000 @@ -1,225 +0,0 @@ -autoload -Uz promptinit compinit -compinit -promptinit -prompt suse - -################## -# shell features # -################## - -setopt equals -setopt extendedglob -setopt interactivecomments -setopt autopushd - -HISTSIZE=100000 -SAVEHIST=100000 -HISTFILE=~/.zsh-history -setopt INC_APPEND_HISTORY - -############### -# keybindings # -############### - -autoload -U edit-command-line -zle -N edit-command-line - -## Superseded by bracketed paste mode: -# autoload -Uz url-quote-magic -# zle -N self-insert url-quote-magic - -bindboth() { - bindkey -M viins "$@" - bindkey -M vicmd "$@" -} - -# redefine history widgets to drop into cmd mode -widget-vicmd() { - local cur=$CURSOR - zle .${WIDGET%-vicmd} - zle vi-cmd-mode - CURSOR=$cur -} -for W in up-line-or-history down-line-or-history \ - history-beginning-search-backward history-beginning-search-forward -do - zle -N ${W}-vicmd widget-vicmd -done - -# insert -bindboth "^[[2~" overwrite-mode -# delete -bindboth "^[[3~" delete-char -bindboth "^[3~" delete-char - -# home -bindboth "^[[7~" beginning-of-line -bindboth "^[[1~" beginning-of-line -bindboth "^[[H" beginning-of-line -bindboth "^[OH" beginning-of-line -# end -bindboth "^[[8~" end-of-line -bindboth "^[[4~" end-of-line -bindboth "^[[F" end-of-line -bindboth "^[OF" end-of-line - -# page up -bindboth "^[[5~" history-beginning-search-backward -# page down -bindboth "^[[6~" history-beginning-search-forward - -bindkey -M vicmd n history-beginning-search-backward -bindkey -M vicmd N history-beginning-search-forward -bindboth "^[n" history-beginning-search-backward-vicmd -bindboth "^[N" history-beginning-search-forward-vicmd -bindboth "^N" down-line-or-history-vicmd -bindboth "^P" up-line-or-history-vicmd - -# ctrl-z -#bindkey '^z' edit-command-line -bindkey -M vicmd "^V" edit-command-line -bindkey -M vicmd 'v' edit-command-line - -# ctrl-e -#bindkey -M viins '^E' menu-expand-or-complete -bindboth -M viins '^A' beginning-of-line -bindboth -M viins '^E' end-of-line - -# tab -bindkey -M viins '^I' complete-word - -# no escape timeout viins -#bindkey -M viins '^C' vi-cmd-mode -bindkey -M viins '^F' vi-cmd-mode -bindkey -M vicmd '^F' vi-cmd-mode -#bindkey -M vicmd ^F send-break - -# no escape timeout vicmd -#bindkey -rpM vicmd '^C' - -# consider / a word break, for ctrl-w -WORDCHARS=${WORDCHARS//\/} - -autoload forward-word-match; zle -N forward-word-match -autoload backward-word-match; zle -N backward-word-match -autoload transpose-words-match; zle -N transpose-words-match -autoload select-word-style - -select-word-style shell -zstyle ':zle:*kill*' word-style normal - -transpose-words-match-left() { - zle backward-word-match - zle transpose-words-match - zle backward-word-match -} -zle -N transpose-words-match-left - -transpose-words-match-right() { - zle backward-word-match - zle forward-word-match - zle transpose-words-match -} -zle -N transpose-words-match-right - -# VIM-style i_CTRL-V_digit input for character codes -bindkey -M viins '^V0' viins-ctrl-v-digit -bindkey -M viins '^V1' viins-ctrl-v-digit -bindkey -M viins '^V2' viins-ctrl-v-digit -bindkey -M viins '^Vo' viins-ctrl-v-octal -bindkey -M viins '^VO' viins-ctrl-v-octal -bindkey -M viins '^Vx' viins-ctrl-v-hex -bindkey -M viins '^VX' viins-ctrl-v-hex -bindkey -M viins '^Vu' viins-ctrl-v-hex -bindkey -M viins '^VU' viins-ctrl-v-hex - -zle -N viins-ctrl-v-digit _viins_escape_decimal -zle -N viins-ctrl-v-octal _viins_escape_octal -zle -N viins-ctrl-v-hex _viins_escape_hex - -function _viins_escape_decimal() { - IFS= read -srk 2 - REPLY='10#'$KEYS[2]${REPLY//[^0-9]/} - LBUFFER+=${(#)REPLY} -} - -function _viins_escape_octal() { - IFS= read -srk 3 - REPLY='8#'${REPLY//[^0-7]/} - LBUFFER+=${(#)REPLY} -} - -function _viins_escape_hex() { - case $KEYS[2] in - (u) IFS= read -srk 4;; - (U) IFS= read -srk 8;; - (*) IFS= read -srk 2;; - esac - REPLY='16#'${REPLY//[^0-9a-fA-F]/} - LBUFFER+=${(#)REPLY} -} - -# arrow movements -bindboth "^[OC" vi-forward-word -bindboth "^[OD" vi-backward-word -bindboth "^[^[OC" forward-word-match -bindboth "^[^[OD" backward-word-match -bindboth "^[^[[C" transpose-words-match-right -bindboth "^[^[[D" transpose-words-match-left - -# arrows: up down right left -# ^[[A ^[[B ^[[C ^[[D -# alt ^[^[[A ^[^[[B ^[^[[C ^[^[[D -# ctrl ^[OA ^[OB ^[OC ^[OD -# ctrl+alt ^[^[OA ^[^[OB ^[^[OC ^[^[OD - -bindboth '^[h' vi-backward-char -bindboth "^[H" backward-word-match -bindboth '^[l' vi-forward-char -bindboth "^[L" forward-word-match - -bindboth '^[j' beginning-of-line -bindboth '^[k' end-of-line - -bindboth '^[J' transpose-words-match-left -bindboth '^[K' transpose-words-match-right - -widget-tmux-previous-prompt() { - tmux copy-mode \; send-keys $(print -P '?%n@%m ') C-m n j -} -zle -N widget-tmux-previous-prompt -bindboth '^K' widget-tmux-previous-prompt - -widget-tmux-pageup-prompt() { - tmux copy-mode \; send-keys $LINES k $(print -P '?%n@%m ') C-m -} -zle -N widget-tmux-pageup-prompt -bindboth '^U' widget-tmux-pageup-prompt -if ((${+functions[zaw-register-src]})); then - bindkey -M filterselect '^U' widget-tmux-pageup-prompt - - # zaw - - bindboth '^X^X' zaw-tmux-word - bindboth '^Xt' zaw-tmux-word - bindboth '^Xl' zaw-tmux-line - - bindboth '^XT' zaw-tmux-word-all - bindboth '^XL' zaw-tmux-line-all - - bindboth '^[q' zaw-zmuch-saved-search - bindboth '^[Q' zaw-zmuch-saved-search-all - bindboth '^[m' zaw-zmuch-message-unread - bindboth '^[M' zaw-zmuch-message - bindboth '^[t' zaw-zmuch-thread-unread - bindboth '^[T' zaw-zmuch-thread - - mark-and-move-next() { - zle set-mark-command - zle down-line-or-history - } - zle -N mark-and-move-next - bindkey -M filterselect '^X' mark-and-move-next -fi - -# vim: ft=zsh noet === removed directory 'adhoc-skel/home' === removed directory 'adhoc-skel/home/ccx' === removed directory 'adhoc-skel/home/ccx/.config' === removed directory 'adhoc-skel/home/ccx/.config/i3' === removed file 'adhoc-skel/home/ccx/.config/i3/config' --- old/adhoc-skel/home/ccx/.config/i3/config 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/.config/i3/config 1970-01-01 00:00:00 +0000 @@ -1,292 +0,0 @@ -# This file has been auto-generated by i3-config-wizard(1). -# It will not be overwritten, so edit it as you like. -# -# Should you change your keyboard layout somewhen, delete -# this file and re-run i3-config-wizard(1). -# - -# i3 config file (v4) -# -# Please see http://i3wm.org/docs/userguide.html for a complete reference! - -set $mod Mod4 - -# 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 - -# Use Mouse+$mod to drag floating windows to their wanted position -floating_modifier $mod - -default_orientation auto -workspace_layout stacking -hide_edge_borders both -force_focus_wrapping no -workspace_auto_back_and_forth yes -show_marks yes - -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_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 - -client.background #ffffff - -# start a terminal -#bindsym $mod+Return exec /home/ccx/bin/zenv urxvt-launch -bindsym $mod+Return exec urxvt -#bindsym $mod+Shift+Return exec zenv urxvtc -e su - - -#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+G exec wswitch -bindsym $mod+Control+t exec mpc toggle -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 -bindsym $mod+Control+space move scratchpad -bindsym $mod+Tab scratchpad show - -bindsym $mod+Control+1 mark --toggle 1 -bindsym $mod+Control+2 mark --toggle 2 -bindsym $mod+Control+3 mark --toggle 3 -bindsym $mod+Control+4 mark --toggle 4 -bindsym $mod+Control+5 mark --toggle 5 -bindsym $mod+Control+6 mark --toggle 6 -bindsym $mod+Control+7 mark --toggle 7 -bindsym $mod+Control+8 mark --toggle 8 -bindsym $mod+Control+9 mark --toggle 9 -bindsym $mod+Control+0 mark --toggle 0 - -bindsym $mod+Control+Shift+exclam move window to mark 1 -bindsym $mod+Control+Shift+at move window to mark 2 -bindsym $mod+Control+Shift+numbersign move window to mark 3 -bindsym $mod+Control+Shift+dollar move window to mark 4 -bindsym $mod+Control+Shift+percent move window to mark 5 -bindsym $mod+Control+Shift+asciicircum move window to mark 6 -bindsym $mod+Control+Shift+ampersand move window to mark 7 -bindsym $mod+Control+Shift+asterisk move window to mark 8 -bindsym $mod+Control+Shift+parenleft move window to mark 9 -bindsym $mod+Control+Shift+parenright move window to mark 0 - -# kill focused window -bindsym $mod+Shift+C kill - -# start dmenu (a program launcher) -bindsym $mod+p exec dmenu_run -#bindsym $mod+y exec zenv dmenu_run_xpra -bindsym $mod+y exec xterm - -# password manager -bindsym $mod+Shift+p exec xpass - -# change focus -bindsym $mod+h focus left -bindsym $mod+j focus down -bindsym $mod+k focus up -bindsym $mod+l focus right - -# alternatively, you can use the cursor keys: -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# move focused window -bindsym $mod+Shift+H move left -bindsym $mod+Shift+J move down -bindsym $mod+Shift+K move up -bindsym $mod+Shift+L move right - -# alternatively, you can use the cursor keys: -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# move workspaces around outputs -bindsym $mod+Control+h move workspace to output left -bindsym $mod+Control+j move workspace to output down -bindsym $mod+Control+k move workspace to output up -bindsym $mod+Control+l move workspace to output right - -# split in horizontal orientation -bindsym $mod+Shift+quotedbl split v - -# split in vertical orientation -bindsym $mod+apostrophe split h - -# enter fullscreen mode for the focused container -bindsym $mod+f fullscreen - -# change container layout (stacked, tabbed, default) -#bindsym $mod+g layout stacking -#bindsym $mod+t layout tabbed -#bindsym $mod+z layout default - -# zenv unnecessary here, remove after I fix dmenu font in env -bindsym $mod+g exec zenv goa - -# toggle tiling / floating -bindsym $mod+Shift+space floating toggle - -# change focus between tiling / floating windows -bindsym $mod+space focus mode_toggle - -# focus the parent container -bindsym $mod+semicolon focus parent -bindsym $mod+Shift+colon focus child - -# focus the child container -#bindcode $mod+d focus child - -# switch to workspace -bindsym $mod+1 workspace 1 -bindsym $mod+2 workspace 2 -bindsym $mod+3 workspace 3 -bindsym $mod+4 workspace 4 -bindsym $mod+5 workspace 5 -bindsym $mod+6 workspace 6 -bindsym $mod+7 workspace 7 -bindsym $mod+8 workspace 8 -bindsym $mod+9 workspace 9 -bindsym $mod+0 workspace 10 -bindsym $mod+q workspace 11:Q -bindsym $mod+w workspace 12:W -bindsym $mod+e workspace 13:E -bindsym $mod+a workspace 14:A -bindsym $mod+s workspace 15:S -bindsym $mod+d workspace 16:D - -# move focused container to workspace -bindsym $mod+Shift+exclam move workspace 1 -bindsym $mod+Shift+at move workspace 2 -bindsym $mod+Shift+numbersign move workspace 3 -bindsym $mod+Shift+dollar move workspace 4 -bindsym $mod+Shift+percent move workspace 5 -bindsym $mod+Shift+asciicircum move workspace 6 -bindsym $mod+Shift+ampersand move workspace 7 -bindsym $mod+Shift+asterisk move workspace 8 -bindsym $mod+Shift+parenleft move workspace 9 -bindsym $mod+Shift+parenright move workspace 10 -bindsym $mod+Shift+Q move workspace 11:Q -bindsym $mod+Shift+W move workspace 12:W -bindsym $mod+Shift+E move workspace 13:E -bindsym $mod+Shift+A move workspace 14:A -bindsym $mod+Shift+S move workspace 15:S -bindsym $mod+Shift+D move workspace 16:D - -#exec --no-startup-id "exec $HOME/bin/x" - -# Workspace -> Output map -# Old setup was : DVI-0 HDMI-0 | DVI-1 -# From left to right: DVI-0 HDMI-0 | DisplayPort-0 -workspace 1 output DVI-1 -workspace 2 output HDMI-0 -workspace 3 output DVI-0 -workspace 4 output HDMI-0 -workspace 5 output DVI-0 -workspace 6 output HDMI-0 -workspace 7 output HDMI-0 -workspace 8 output HDMI-0 -workspace 9 output HDMI-0 -workspace 10 output HDMI-0 -workspace 11:Q output DVI-0 -workspace 12:W output DVI-0 -workspace 13:E output HDMI-0 -workspace 14:A output DVI-0 -workspace 15:S output DVI-1 -workspace 16:D output DisplayPort-0 - -# reload the configuration file -bindsym $mod+x reload -# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) -bindsym $mod+Shift+R restart -# exit i3 (logs you out of your X session) -bindsym $mod+Shift+X exit - -bindsym $mod+Control+w mode "layout" - -mode "layout" { -bindsym t layout tabbed ; mode "default" -bindsym s layout stacking ; mode "default" -bindsym g layout stacking ; mode "default" -bindsym d layout default ; mode "default" -bindsym v layout splith ; mode "default" -bindsym h layout splitv ; mode "default" - -bindsym $mod+t splith; layout tabbed ; mode "default" -bindsym $mod+s splith; layout stacking ; mode "default" -bindsym $mod+g splith; layout stacking ; mode "default" -bindsym $mod+d splith; layout default ; mode "default" -bindsym $mod+v splith; mode "default" -bindsym $mod+h splitv; mode "default" - - # back to normal: Enter or Escape -bindsym Return mode "default" -bindsym Escape mode "default" -bindsym space mode "default" -bindsym q mode "default" -} - -# resize window (you can also use the mouse for that) -mode "resize" { - # These bindings trigger as soon as you enter the resize mode - - # They resize the border in the direction you pressed, e.g. - # when pressing left, the window is resized so that it has - # more space on its left - -bindsym h resize shrink left 10 px or 5 ppt -bindsym Shift+H resize grow left 10 px or 5 ppt - -bindsym j resize shrink down 10 px or 5 ppt -bindsym Shift+J resize grow down 10 px or 5 ppt - -bindsym k resize shrink up 10 px or 5 ppt -bindsym Shift+K resize grow up 10 px or 5 ppt - -bindsym l resize shrink right 10 px or 5 ppt -bindsym Shift+L resize grow right 10 px or 5 ppt - - # same bindings, but for the arrow keys -bindsym Left resize shrink left 10 px or 5 ppt -bindsym Shift+Left resize grow left 10 px or 5 ppt - -bindsym Down resize shrink down 10 px or 5 ppt -bindsym Shift+Down resize grow down 10 px or 5 ppt - -bindsym Up resize shrink up 10 px or 5 ppt -bindsym Shift+Up resize grow up 10 px or 5 ppt - -bindsym Right resize shrink right 10 px or 5 ppt -bindsym Shift+Right resize grow right 10 px or 5 ppt - - # back to normal: Enter or Escape -bindsym Return mode "default" -bindsym Escape mode "default" -bindsym space mode "default" -bindsym q mode "default" -} - -bindsym $mod+r mode "resize" - -# Start i3bar to display a workspace bar (plus the system information i3status -# finds out, if available) -bar { - position top - status_command s6-ipcclient /run/i3status.s s6-ioconnect -67 - strip_workspace_numbers yes - colors { - focused_workspace $f_border $f_background $f_text - } -} === removed directory 'adhoc-skel/home/ccx/exec' === removed file 'adhoc-skel/home/ccx/exec/run' --- old/adhoc-skel/home/ccx/exec/run 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/exec/run 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -#!/bin/execlineb -cd /home/ccx -env TERM= HOME=/home/ccx USER=ccx SHELL=/bin/zsh LANG=C.UTF-8 s6-ipcserver -a 0700 -- ./exec/socket s6-sudod /bin/exec === removed directory 'adhoc-skel/home/ccx/run' === removed directory 'adhoc-skel/home/ccx/run/env' === removed file 'adhoc-skel/home/ccx/run/env/CHARSET' --- old/adhoc-skel/home/ccx/run/env/CHARSET 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/run/env/CHARSET 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -UTF-8 \ No newline at end of file === removed file 'adhoc-skel/home/ccx/run/env/HOME' --- old/adhoc-skel/home/ccx/run/env/HOME 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/run/env/HOME 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -/home/ccx \ No newline at end of file === removed file 'adhoc-skel/home/ccx/run/env/LANG' --- old/adhoc-skel/home/ccx/run/env/LANG 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/run/env/LANG 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -C.UTF-8 \ No newline at end of file === removed file 'adhoc-skel/home/ccx/run/env/SHELL' --- old/adhoc-skel/home/ccx/run/env/SHELL 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/run/env/SHELL 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -/bin/zsh \ No newline at end of file === removed file 'adhoc-skel/home/ccx/run/init' --- old/adhoc-skel/home/ccx/run/init 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/run/init 1970-01-01 00:00:00 +0000 @@ -1,27 +0,0 @@ -#!/bin/execlineb -P - -/bin/export PATH "/command:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -/bin/cd / -s6-setsid -qb -- -umask 022 -if { s6-echo -n -- "\n* user container init: " } -foreground { uname -n } -# if { s6-mount -nwt tmpfs -o mode=0755 tmpfs "/run" } -#foreground { rm -rf /run/service /run/s6-rc } -#if { strace s6-hiercopy "/home/ccx/run/s6-linux-init"/run-image "/run" } -#if { s6-hiercopy "/home/ccx/run/s6-linux-init"/run-image/service "/run"/service } -#if { s6-hiercopy "/home/ccx/run/s6-linux-init"/run-image/uncaught-logs "/run"/uncaught-logs } -s6-envdir -I -- "/home/ccx/run/"/env -redirfd -r 0 /dev/null -redirfd -wnb 1 "/run"/service/s6-svscan-log/fifo -background -{ - s6-setsid -- - redirfd -w 1 "/run"/service/s6-svscan-log/fifo - fdmove -c 1 2 - "/home/ccx/run/rc.init" -} -unexport ! -cd "/run"/service -fdmove -c 2 1 -s6-svscan -st0 === removed file 'adhoc-skel/home/ccx/run/rc.init' --- old/adhoc-skel/home/ccx/run/rc.init 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/run/rc.init 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ -#!/bin/execlineb -P - -# Initialize the service manager -if { - if -n -t { s6-test -e /home/ccx/s6-rc/compiled } - /home/ccx/s6-rc/compile -} - -if { s6-rc-init -c /home/ccx/s6-rc/compiled -d /run/service } - -# Run the service manager. -# Call it twice because the first time may spuriously "timeout" -# due to the clock jumping forward. - -if -nt { s6-rc -t 600000 -- change ok-all } -s6-rc -t 600000 -- change ok-all === removed file 'adhoc-skel/home/ccx/run/rc.shutdown' --- old/adhoc-skel/home/ccx/run/rc.shutdown 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/run/rc.shutdown 1970-01-01 00:00:00 +0000 @@ -1,26 +0,0 @@ -#!/bin/execlineb -P - -#redirfd -w 1 /dev/console -#fdmove -c 2 1 - -foreground -{ - s6-echo "/etc/rc.shutdown called" -} - -# Write a message to /var/log/syslogd - -foreground -{ - s6-ipcclient -l0 /dev/log - fdmove 1 7 - s6-echo "/etc/rc.shutdown: shutdown requested" -} - -# foreground { /sbin/openrc shutdown } - -# Shut down all services - -if -n { s6-rc -da change } -foreground { s6-echo "`s6-rc -da change` failed" } -foreground { sleep 2s } === removed directory 'adhoc-skel/home/ccx/s6-rc' === removed file 'adhoc-skel/home/ccx/s6-rc/compile' --- old/adhoc-skel/home/ccx/s6-rc/compile 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/s6-rc/compile 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -#!/bin/zsh -zmodload zsh/stat || exit $? -zmodload zsh/datetime || exit $? -set -x -cd $0:h || exit $? -dst=./versions/compiled.$EPOCHSECONDS -s6-rc-compile $dst.new source || exit $? -s6-rename $dst.new $dst || exit $? -exec s6-ln -s -f -n $dst compiled === removed directory 'adhoc-skel/home/ccx/s6-rc/source' === removed directory 'adhoc-skel/home/ccx/s6-rc/source/exec' === removed file 'adhoc-skel/home/ccx/s6-rc/source/exec/run' --- old/adhoc-skel/home/ccx/s6-rc/source/exec/run 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/s6-rc/source/exec/run 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -#!/bin/execlineb -cd /home/ccx -env TERM= HOME=/home/ccx USER=ccx SHELL=/bin/zsh LANG=C.UTF-8 -s6-ipcserver -a 0700 -- ./exec/socket -s6-sudod -flock -n -s /run/termination.lock -if -nt { s6-rc -t 600000 -- change terminator } -/bin/exec === removed file 'adhoc-skel/home/ccx/s6-rc/source/exec/type' --- old/adhoc-skel/home/ccx/s6-rc/source/exec/type 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/s6-rc/source/exec/type 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -longrun === removed directory 'adhoc-skel/home/ccx/s6-rc/source/ok-all' === removed file 'adhoc-skel/home/ccx/s6-rc/source/ok-all/contents' --- old/adhoc-skel/home/ccx/s6-rc/source/ok-all/contents 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/s6-rc/source/ok-all/contents 1970-01-01 00:00:00 +0000 @@ -1,5 +0,0 @@ -xauthority -i3 -redshift -xkb -exec === removed file 'adhoc-skel/home/ccx/s6-rc/source/ok-all/type' --- old/adhoc-skel/home/ccx/s6-rc/source/ok-all/type 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/s6-rc/source/ok-all/type 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -bundle === removed directory 'adhoc-skel/home/ccx/s6-rc/source/terminator' === removed file 'adhoc-skel/home/ccx/s6-rc/source/terminator/run' --- old/adhoc-skel/home/ccx/s6-rc/source/terminator/run 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/s6-rc/source/terminator/run 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -#!/bin/execlineb -cd /home/ccx -flock -x /run/termination.lock -s6-svscanctl -h /run/service === removed file 'adhoc-skel/home/ccx/s6-rc/source/terminator/type' --- old/adhoc-skel/home/ccx/s6-rc/source/terminator/type 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/s6-rc/source/terminator/type 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -longrun === removed file 'adhoc-skel/home/ccx/s6-rc/update' --- old/adhoc-skel/home/ccx/s6-rc/update 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/home/ccx/s6-rc/update 1970-01-01 00:00:00 +0000 @@ -1,11 +0,0 @@ -#!/bin/zsh -zmodload zsh/stat || exit $? -zmodload zsh/datetime || exit $? -set -x -cd $0:h || exit $? -dst=./versions/compiled.$EPOCHSECONDS -s6-rc-compile $dst.new source || exit $? -s6-rename $dst.new $dst || exit $? -s6-rc-update -v 2 $(realpath $dst) || exit $? -s6-rc -u change ok-all || exit $? -exec s6-ln -s -f -n $dst compiled === removed directory 'adhoc-skel/home/ccx/s6-rc/versions' === removed directory 'adhoc-skel/run' === removed symlink 'adhoc-skel/run/init' === target was '../home/ccx/run/init' === removed directory 'adhoc-skel/run/service' === removed directory 'adhoc-skel/run/service/.s6-svscan' === removed file 'adhoc-skel/run/service/.s6-svscan/SIGHUP' --- old/adhoc-skel/run/service/.s6-svscan/SIGHUP 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/.s6-svscan/SIGHUP 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -#!/bin/execlineb -P - -foreground { redirfd -w 1 "/run"/file\ created\ by\ s6-linux-init,\ storing\ a\ container's\ exit\ code s6-echo -- 0 } -s6-svscanctl -b "/run"/service === removed file 'adhoc-skel/run/service/.s6-svscan/SIGINT' --- old/adhoc-skel/run/service/.s6-svscan/SIGINT 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/.s6-svscan/SIGINT 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -#!/bin/execlineb -P - -foreground { redirfd -w 1 "/run"/file\ created\ by\ s6-linux-init,\ storing\ a\ container's\ exit\ code s6-echo -- 1 } -s6-svscanctl -b "/run"/service === removed file 'adhoc-skel/run/service/.s6-svscan/SIGQUIT' --- old/adhoc-skel/run/service/.s6-svscan/SIGQUIT 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/.s6-svscan/SIGQUIT 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -#!/bin/execlineb -P - -foreground { "/etc/rc.shutdown" } -s6-svscanctl -q -- "/run"/service === removed file 'adhoc-skel/run/service/.s6-svscan/SIGTERM' --- old/adhoc-skel/run/service/.s6-svscan/SIGTERM 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/.s6-svscan/SIGTERM 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -#!/bin/execlineb -P - -foreground { "/etc/rc.shutdown" } -s6-svscanctl -t -- "/run"/service === removed file 'adhoc-skel/run/service/.s6-svscan/SIGUSR1' --- old/adhoc-skel/run/service/.s6-svscan/SIGUSR1 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/.s6-svscan/SIGUSR1 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -#!/bin/execlineb -P - -foreground { "/etc/rc.shutdown" } -s6-svscanctl -7 -- "/run"/service === removed file 'adhoc-skel/run/service/.s6-svscan/SIGUSR2' --- old/adhoc-skel/run/service/.s6-svscan/SIGUSR2 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/.s6-svscan/SIGUSR2 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -#!/bin/execlineb -P - -foreground { "/etc/rc.shutdown" } -s6-svscanctl -0 -- "/run"/service === removed file 'adhoc-skel/run/service/.s6-svscan/crash' --- old/adhoc-skel/run/service/.s6-svscan/crash 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/.s6-svscan/crash 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -#!/bin/execlineb -P - -#redirfd -r 0 /dev/console -#redirfd -w 1 /dev/console -#fdmove -c 2 1 -#foreground { s6-echo -- "s6-svscan crashed. Dropping to an interactive shell." } -#/bin/sh -i -/bin/false === removed file 'adhoc-skel/run/service/.s6-svscan/finish' --- old/adhoc-skel/run/service/.s6-svscan/finish 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/.s6-svscan/finish 1970-01-01 00:00:00 +0000 @@ -1,22 +0,0 @@ -#!/bin/execlineb -S0 - -ifelse { redirfd -w 2 /dev/null redirfd -r 0 "/run"/file\ created\ by\ s6-linux-init,\ storing\ a\ container's\ exit\ code exit 0 } -{ redirfd -r 0 "/run"/file\ created\ by\ s6-linux-init,\ storing\ a\ container's\ exit\ code withstdinas -in CODE foreground { s6-rmrf "/run"/file\ created\ by\ s6-linux-init,\ storing\ a\ container's\ exit\ code } importas -ui CODE CODE exit ${CODE} } -cd / -#redirfd -w 2 /dev/console -#fdmove -c 1 2 -foreground { s6-svc -X -- "/run"/service/s6-svscan-log } -unexport ? -wait -r -- { } -foreground { s6-echo "Syncing disks." } -foreground { s6-sync } -foreground { s6-echo "Sending all processes the TERM signal." } -foreground { s6-nuke -th } -s6-sleep -m -- 2000 -foreground { s6-echo "Sending all processes the KILL signal." } -foreground { s6-nuke -k } -wait { } -foreground { s6-echo "Unmounting disks." } -foreground { s6-umount -a } -foreground { s6-mount -ro remount /dev/root / } -s6-${1} -f === removed directory 'adhoc-skel/run/service/s6-svscan-log' === removed file 'adhoc-skel/run/service/s6-svscan-log/run' --- old/adhoc-skel/run/service/s6-svscan-log/run 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/s6-svscan-log/run 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ -#!/bin/execlineb -P - -#redirfd -w 2 /dev/console -#redirfd -w 1 /dev/null -redirfd -rnb 0 fifo -s6-log -b -- t "/run"/uncaught-logs === removed directory 'adhoc-skel/run/service/screen-locker' === removed file 'adhoc-skel/run/service/screen-locker/down' === removed file 'adhoc-skel/run/service/screen-locker/run' --- old/adhoc-skel/run/service/screen-locker/run 2019-06-28 17:18:05 +0000 +++ new/adhoc-skel/run/service/screen-locker/run 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -#!/bin/execlineb -P -i3lock -n -p default -c 000000 === removed directory 'adhoc-skel/run/uncaught-logs' === removed directory 'adhoc-skel/tmp' === removed directory 'adhoc-skel/tmp/.X11-unix' === removed file 'home/adhoc-setup' --- old/home/adhoc-setup 2019-06-28 17:18:05 +0000 +++ new/home/adhoc-setup 1970-01-01 00:00:00 +0000 @@ -1,46 +0,0 @@ -#!/bin/zsh -setopt no_unset extended_glob warn_create_global -typeset -g DSTROOT DISPLAYNUM -#set -x -DSTROOT=$1 -DISPLAYNUM=$2 - -copy-skel() { - local skel - for skel in $HOME/xsession-skel/*/*(DN); do - s6-hiercopy $skel $DSTROOT/$skel:h:t/$skel:t || exit $? - done -} - -setup-x11() { - s6-svwait /run/service/X$DISPLAYNUM || exit $? - - ln -f /run/Xauthority.$DISPLAYNUM $DSTROOT/run/Xauthority.$DISPLAYNUM || exit $? - printf '%s' >$DSTROOT/home/ccx/run/env/XAUTHORITY /run/Xauthority.$DISPLAYNUM || exit $? - - ln -f /run/X11/X$DISPLAYNUM $DSTROOT/tmp/.X11-unix/X$DISPLAYNUM || exit $? - printf '%s' >$DSTROOT/home/ccx/run/env/DISPLAY :$DISPLAYNUM || exit $? -} - -setup-i3status() { - s6-rc -l /run/user/ccx/s6-rc -u change i3status || exit $? - ln -f /run/user/ccx/service/i3status/s $DSTROOT/run/i3status.s || exit $? -} - -main() { - if ! [[ -d $DSTROOT ]]; then - echo >&2 "Destination root not a directory: $DSTROOT" - exit 2 - fi - - if [[ $DISPLAYNUM != [0-9] ]]; then - echo >&2 "Invalid display number: $DISPLAYNUM" - exit 3 - fi - - copy-skel - setup-x11 - setup-i3status -} - -main === renamed file 'home/xsession-setup' => 'xsession-setup'