Merge branch 'work'

x/Xresources

@@ -1,12 +1,10 @@
 Xcursor.theme: Vanilla-DMZ
 
 URxvt.scrollBar: false
-
-URxvt.font: xft:Inconsolata:size=9
+URxvt.font: xft:Inconsolata:size=10
 URxvt.letterSpace: -1
 
 URxvt.perl-ext-common: default,matcher,selection-to-clipboard
-
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.matcher.button: 1
 URxvt.saveLines: 10000
@@ -60,4 +58,3 @@ URxvt.fading: 15
 ! white
 *.color7:       #f8f8f2
 *.color15:      #f9f8f5
-

x/xinitrc

@@ -6,7 +6,6 @@ log() {
     echo "[$(date +%FT%T)] $*" >> "$LOGFILE"
 }
 
-
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
   for f in /etc/X11/xinit/xinitrc.d/*; do
     [ -x "$f" ] && . "$f"
@@ -22,18 +21,5 @@ start_wm() {
     exec i3 -c "$HOME/.i3/config" >> "$LOGDIR/i3/i3.log"
 }
 
-autostart() {
-    if [[ -d "$HOME/.autostart" ]] ; then
-        log "Looking for autostart files."
-        for f in "$HOME/.autostart/"*.sh ; do
-            if [[ -x "$f" ]] ; then
-                log "Executing autostart file \"$f\""
-                "$f"
-            fi
-        done
-    fi
-}
-
-autostart
 
 start_wm