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

.gitignore

@@ -1,4 +1,5 @@
 installed-prefs
+.installed-prefs
 *.swp
 *~
 *.bak

dotfiles/zprezto_custom/jekyll/init.zsh

@@ -90,6 +90,7 @@ function jekyll {
       echo "  post                  Create a new post to publish immediately."
       echo "  publish               Publish a draft post by name."
       echo "  edit                  Edit a post."
+      echo "  dev                   Run local server with drafts and incremental."
       ;;
     draft)
       if [ -z "${SLUG}" ] ; then
@@ -139,6 +140,9 @@ function jekyll {
       fi
       ${EDITOR} "${FILENAME}"
       ;;
+    dev)
+      command jekyll serve -D -I "$@"
+      ;;
     *)
       command jekyll "$@"
       ;;

dotfiles/zshrc

@@ -33,9 +33,12 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 
-# Change defaults from prezto
+# Overrides to prezto
 unsetopt cdablevars
 
+# No groupings of completions
+ zstyle ':completion:*' format ''
+
 # .profile is universal
 # but after zprezto to use/override anything setup there
 . ~/.profile

install.sh

@@ -280,7 +280,11 @@ install_chrome() {
 
 read_saved_prefs() {
   # Can't use basedir here as we don't have it yet
-  local pref_file=`dirname $0`/installed-prefs
+  local old_pref_file=`dirname $0`/installed-prefs
+  local pref_file=`dirname $0`/.installed-prefs
+  if [ -f ${old_pref_file} -a ! -f ${pref_file} ] ; then
+    mv ${old_pref_file} ${pref_file}
+  fi
   if [ -f ${pref_file} ] ; then
     verbose "Loading saved skel preferences from ${pref_file}"
     # source is a bashism
@@ -290,7 +294,7 @@ read_saved_prefs() {
 
 save_prefs() {
   test $SAVE = 1 || return 0
-  local pref_file=${BASEDIR}/installed-prefs
+  local pref_file=${BASEDIR}/.installed-prefs
   (echo_pref BASEDIR
    echo_pref MINIMAL
    echo_pref INSTALL_KEYS