gimme

@@ -37,7 +37,7 @@ gimme_pkg() {
 			[[ -d "$HOME/homebrew" ]]  ||  (mkdir "$HOME/homebrew" 2>/dev/null  &&  curl -L "https://github.com/Homebrew/brew/tarball/master" | tar xz --strip 1 -C "$HOME/homebrew"  &&  "$HOME/homebrew/bin/brew" update)
 		fi
 		if [[ "$1" ]]; then
-			if brew cat --cask "$1" &>/dev/null; then
+			if brew info --cask "$1" &>/dev/null; then
 				if brew list --cask "$1" &>/dev/null; then
 					if [[ "$FORCE" ]]; then
 						brew reinstall --cask "$@"
@@ -47,7 +47,7 @@ gimme_pkg() {
 				else
 					brew install --cask "$@"
 				fi
-			elif brew cat "$1" &>/dev/null; then
+			elif brew info "$1" &>/dev/null; then
 				if brew list "$1" &>/dev/null; then
 					if [[ "$FORCE" ]]; then
 						brew upgrade "$@"  ||  echo "# WARN: forced upgrade failed (it may already be up to date)"

gimmes/git-extras

@@ -5,11 +5,15 @@ gimme git
 
 has git-alias  ||  gimme_pkg git-extras
 
-if ! [[ "$(git alias)" ]]; then
-	git alias br branch
-	git alias ci commit
-	git alias co checkout
-	git alias di diff
-	git alias st status
-	git alias sw switch
+if ! [[ "$(git alias --global)" ]]; then
+    echo "#INFO: Configuring git alias entries..."
+    git alias --global br branch
+    git alias --global ci commit
+    git alias --global co checkout
+    git alias --global di diff
+    git alias --global st status
+    git alias --global sw switch
+    git alias --global pi cherry-pick
+
+    git alias --global | sed 's/^/#    /'
 fi

gimmes/neovim

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -o errexit -o pipefail
+
+has nvim  ||  gimme_pkg nvim
+
+NVIM_DIR="$HOME/.config/nvim"
+NVIM_INIT="$NVIM_DIR/init.vim"
+if [ -f "$HOME/.vimrc" ] && ! [ -f "" ]; then
+    echo "# INFO: Configuring nvim to use vimrc in: $NVIM_INIT"
+    mkdir -p "$NVIM_DIR"
+    cat >"$NVIM_INIT" <<EOF
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath=&runtimepath
+source ~/.vimrc
+EOF
+fi

gimmes/nvim

@@ -0,0 +1 @@
+neovim

gimmes/tools/mergetool

@@ -2,7 +2,9 @@
 set -o errexit -o pipefail
 
 if [[ "$OS" = "Darwin" ]]; then
-	gimme sourcetree
+	gimme \
+        mergiraf \
+        --
 else
 	gimme meld
 fi