From 1386dc49d09fed31a8410e4604f9c2f4524c29ed Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sat, 17 Mar 2018 16:59:37 -0700 Subject: [PATCH 1/3] Rename installed-prefs to .installed-prefs. --- .gitignore | 1 + install.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8a039c7..174cfde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ installed-prefs +.installed-prefs *.swp *~ *.bak diff --git a/install.sh b/install.sh index bce75e6..0f0b826 100755 --- a/install.sh +++ b/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 From 0b327577e7db38c8dc16df552a608da813c9b337 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Sun, 15 Apr 2018 17:45:02 -0700 Subject: [PATCH 2/3] Fixing completion. --- dotfiles/zshrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 0a31fe4..cb147b7 100755 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -33,6 +33,11 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" fi +# Overrides to prezto + +# No groupings of completions + zstyle ':completion:*' format '' + # .profile is universal # but after zprezto to use/override anything setup there . ~/.profile From 26685dfadbcb8f8fb45a87861f689dc04cd0cd4e Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 16 Apr 2018 11:59:39 -0700 Subject: [PATCH 3/3] Add jekyll dev command. --- dotfiles/zprezto_custom/jekyll/init.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dotfiles/zprezto_custom/jekyll/init.zsh b/dotfiles/zprezto_custom/jekyll/init.zsh index 2c3fb34..9e3425a 100644 --- a/dotfiles/zprezto_custom/jekyll/init.zsh +++ b/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 "$@" ;;