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

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