Merge branch 'upstream/master' into pr/zsh-config-files

.gitignore

@@ -6,5 +6,7 @@ atom.symlink/compile-cache/
 atom.symlink/packages
 atom.symlink/storage
 atom.symlink/themes
+atom.symlink/blob-store
+atom.symlink/recovery
 
 git/gitconfig.local.symlink

Brewfile

@@ -1,26 +1,30 @@
 cask_args appdir: '/Applications'
 
 tap 'homebrew/bundle'
+tap 'puma/puma'
 
 brew 'ack'
 brew 'coreutils'
 brew 'go'
 brew 'grc'
 brew 'imagemagick'
 brew 'jp2a'
+brew 'jq'
 brew 'libcaca', args: ['with-imlib2']
 brew 'libgit2'
 brew 'openssl'
 brew 'node'
 brew 'readline'
 brew 'postgresql'
+brew 'puma/puma/puma-dev'
 brew 'ruby-build'
 brew 'rbenv'
 brew 'roundup'
 brew 'spaceman-diff'
 brew 'spark'
 brew 'unrar'
 brew 'wget'
+brew 'yarn'
 brew 'youtube-dl'
 
 cask '1password'

README.md

@@ -69,6 +69,9 @@ There's a few special files in the hierarchy.
         - **topic/\*logout.zsh**: Any file ending in `logout.zsh` is
           loaded for login shells only and only when you exit/logout the
           shell.
+- **topic/install.sh**: Any file named `install.sh` is executed when you
+  run `script/install`. To avoid being loaded automatically, its
+  extension is `.sh`, not `.zsh`.
 - **topic/\*.symlink**: Any files ending in `*.symlink` get symlinked into
   your `$HOME`. This is so you can keep all of those versioned in your dotfiles
   but still keep those autoloaded files in your home directory. These get

atom.symlink/config.cson

@@ -21,11 +21,14 @@
     ]
   editor:
     fontFamily: "Menlo"
+    fontSize: 15
     invisibles: {}
     showIndentGuide: true
     softWrapAtPreferredLineLength: true
   "go-plus":
     goPath: "/Users/holman/Code/go"
+  "linter-eslint":
+    useGlobalEslint: true
   "release-notes":
     viewedVersion: "0.89.0"
   "spell-check":

bin/atom-package-backup

@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Usage: atom-package-backup
+#
+# Saves a list of your currently installed atom packages to
+# ~/.dotfiles/atom.symlink/packages.txt suitable for install
+# via atom-package-install
+
+set -e
+
+apm list --installed --bare > ~/.dotfiles/atom.symlink/packages.txt

bin/atom-package-install

@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# Usage: atom-package-install
+#
+# Installs the atom packages listed in your packages.txt file
+# located at ~/.dotfiles/atom.symlink/packages.txt
+#
+# You can generate a new list based on currently installed
+# packages via atom-package-backup
+
+set -e
+
+apm install --packages-file ~/.dotfiles/atom.symlink/packages.txt

bin/e

@@ -13,9 +13,4 @@
 #   $ e .
 #   $ e /usr/local
 #   # => opens the specified directory in your editor
-
-if [ "$1" = "" ] ; then
-  exec $EDITOR .
-else
-  exec $EDITOR "$1"
-fi
+exec "$EDITOR" "${1:-.}"

bin/search

@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# Quick search in a directory for a string ($1).
+# Quick search in a directory for a string ($@).
 #
 set -e
 
 # use -iru to search directories ack usually ignores (like .git)
 if [ -x /usr/bin/ack-grep ]; then
-    ack-grep -i $1
+    ack-grep -i "$@"
 else
-    ack -i $1
+    ack -i "$@"
 fi

docker/aliases.zsh

@@ -0,0 +1,2 @@
+alias d='docker $*'
+alias d-c='docker-compose $*'

git/aliases.zsh

@@ -10,7 +10,10 @@ fi
 alias gl='git pull --prune'
 alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
 alias gp='git push origin HEAD'
-alias gd='git diff'
+
+# Remove `+` and `-` from start of diff lines; just rely upon color.
+alias gd='git diff --color | sed "s/^\([^-+ ]*\)[-+ ]/\\1/" | less -r'
+
 alias gc='git commit'
 alias gca='git commit -a'
 alias gco='git checkout'

homebrew/install.sh

@@ -16,7 +16,7 @@ then
     ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
   elif test "$(expr substr $(uname -s) 1 5)" = "Linux"
   then
-    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/linuxbrew/go/install)"
+    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/install/master/install)"
   fi
 
 fi

yarn/path.zsh

@@ -0,0 +1,4 @@
+# sup yarn
+# https://yarnpkg.com
+
+export PATH="$HOME/.yarn/bin:$PATH"

zsh/config.zsh

@@ -1,9 +1,3 @@
-if [[ -n $SSH_CONNECTION ]]; then
-  export PS1='%m:%3~$(git_info_for_prompt)%# '
-else
-  export PS1='%3~$(git_info_for_prompt)%# '
-fi
-
 export LSCOLORS="exfxcxdxbxegedabagacad"
 export CLICOLOR=true
 
@@ -37,12 +31,9 @@ setopt HIST_REDUCE_BLANKS
 #   like: git comm-[tab]
 setopt complete_aliases
 
-zle -N newtab
-
 bindkey '^[^[[D' backward-word
 bindkey '^[^[[C' forward-word
 bindkey '^[[5D' beginning-of-line
 bindkey '^[[5C' end-of-line
 bindkey '^[[3~' delete-char
-bindkey '^[^N' newtab
 bindkey '^?' backward-delete-char