Merge branch 'master' of https://github.com./Matir/skel

.gitmodules

@@ -30,3 +30,6 @@
 	path = dotfiles/tmux/tmux-logging
 	url = https://github.com/tmux-plugins/tmux-logging.git
 	fetchRecurseSubmodules = true
+[submodule "dotfiles/vim/pack/matir/start/syntastic"]
+	path = dotfiles/vim/pack/matir/start/syntastic
+	url = https://github.com/vim-syntastic/syntastic.git

dotfiles/sqliterc

@@ -0,0 +1,2 @@
+.header on
+.mode column

dotfiles/vimrc

@@ -45,8 +45,6 @@ if $TERM ==? 'rxvt-unicode-256color'
   let g:solarized_use16=1
 endif
 silent! colorscheme solarized8
-" Enable filetype support
-filetype plugin indent on
 " Default ASM syntax for ft support
 let asmsyntax="nasm"
 " Allow file modelines
@@ -142,3 +140,7 @@ command Unsmartquote %s/“\|”/"/g
 
 " Markdown options
 autocmd Filetype markdown set expandtab shiftwidth=4
+
+" Enable filetype support
+" Needs to be at end of vimrc
+filetype plugin indent on

dotfiles/zshrc

@@ -27,7 +27,7 @@ PS1="%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] %{%(!.$fg[red].$fg[green])%
 zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
 
 # Load prezto
-if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
+if [[ -z "${NO_ZPREZTO}" && -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 

dotfiles/zshrc.d/crouton.zsh

@@ -0,0 +1,7 @@
+if command -v xiwi >/dev/null 2>&1; then
+  function xiwibg {
+    local tmpf=$(mktemp)
+    echo Logging to ${tmpf}
+    nohup xiwi "$@" >!${tmpf} 2>&1 &
+  }
+fi

install.sh

@@ -2,6 +2,7 @@
 
 set -o nounset
 set -o errexit
+set -o shwordsplit 2>/dev/null || true  # Make zsh behave like bash
 
 case $(uname) in
   Linux)
@@ -48,17 +49,39 @@ prerequisites() {
 install_dotfile_dir() {
   local SRCDIR="${1}"
   local dotfile
+  local submodule_prune="$(git submodule status -- "${SRCDIR}" 2>/dev/null | \
+    awk '{print $2}' | \
+    while read submod ; do
+      echo -n " -o -path ${BASEDIR}/${submod}"
+    done)"
   find "${SRCDIR}" \( -name .git -o \
                     -path "${SRCDIR}/private_dotfiles" -o \
                     -name install.sh -o \
                     -name README.md -o \
-                    -name .gitignore \) \
+                    -name .gitignore \
+                    ${submodule_prune} \) \
       -prune -o ${FINDTYPE} f -print | \
     while read dotfile ; do
       local TARGET="${HOME}/.${dotfile#${SRCDIR}/}"
-      mkdir -p `dirname "${TARGET}"`
+      mkdir -p $(dirname "${TARGET}")
       ln -s -f "${dotfile}" "${TARGET}"
     done
+  git submodule status -- "${SRCDIR}" 2>/dev/null | \
+    awk '{print $2}' | \
+    while read submodule ; do
+      local FULLNAME="${BASEDIR}/${submodule}"
+      local TARGET="${HOME}/.${FULLNAME#${SRCDIR}/}"
+      mkdir -p $(dirname "${TARGET}")
+      if test -L "${TARGET}" ; then
+        if [ "$(readlink "${TARGET}")" != "${FULLNAME}" ] ; then
+          echo "${TARGET} points to $(readlink "${TARGET}") not ${FULLNAME}!" >/dev/stderr
+        fi
+      elif test -d "${TARGET}" ; then
+        echo "rm -rf ${TARGET}" >/dev/stderr
+      else
+        ln -s -f "${FULLNAME}" "${TARGET}"
+      fi
+    done
 }
 
 install_basic_dir() {