reenable sidebar merge

diff --cc shell/.local/bin/update
index a25812b,0000000..086ef27
mode 100644,000000..100755
--- 1/shell/.local/bin/update
--- /dev/null
+++ b/shell/.local/bin/update
@@@ -1,16 -1,0 +1,17 @@@
- sudo sh -c "$(cmd)"
- sh -c 'offlineimap -u ttyui && vdirsyncer sync && khal && khard'
 +#!/bin/sh
 +DV=/etc/debian_version
++NUL='>/dev/null 2>&1'
 +
 +cmd() {
 +      if [ -f $DV ]
 +      then
 +              echo -n 'apt-get update && apt-get dist-upgrade -y '
 +              [ `head -c 1 $DV` -ge 9 ] && echo -n '--' || -n '&& apt-get '
 +              echo -n 'autoremove --purge && apt-get clean && apt-get autoclean'
 +      else
 +              echo -n 'pacman -Syu && pacman -R `pacman -Qdtq`'
 +      fi
 +}
 +
++sudo sh -c "`cmd`"
++sh -c "offlineimap -u ttyui && vdirsyncer sync && khal $NUL && khard $NUL"

diff --cc vim/.vim/spell/en.utf-8.add
index f82bc52,b61c651..97ca7c2
--- 1/vim/.vim/spell/en.utf-8.add
--- 2/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@@ -6,4 -6,5 +6,5 @@@ disfluencie
  cepstral
  diphone
  SDS
 -Berenzweig
 +Microcontrollers
+ tonotopic

diff --cc x/.config/i3/config
Simple merge