merging uzi to ari

git/.gitconfig

@@ -27,11 +27,20 @@
 [color "diff"]
 	whitespace = red reverse
 [core]
-	whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
+    whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
+    pager = delta
 [alias]
     lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
 [push]
-	default = simple
+    default = simple
+
+[delta]
+    plus-color = "#012800"
+    minus-color = "#340001"
+    syntax-theme = Monokai Extended
+[interactive]
+    diffFilter = delta --color-only
+
 [commit]
     gpgsign = true
 [gpg]

zsh/.zsh/aliases.zsh

@@ -36,18 +36,3 @@ alias tm="tmux new-session -A -s main"
 # A crude speedtest with curl
 alias speedtest="curl -o /dev/null http://speedtest-nyc1.digitalocean.com/100mb.test"
 
-# blank-chrome
-function blank-chrome {
-    if [ "$@" ]; then
-        URL="$@"
-    else 
-        URL="https://duckduckgo.com"
-    fi
-    TMPDIR=`mktemp -d /tmp/chrome-XXXXX`
-    if [ $IS_MAC ]; then
-        /Applications/Chromium.app/Contents/MacOS/Chromium --user-data-dir=$TMPDIR --no-first-run --no-make-default-browser "$URL"
-    else
-        chromium-browser --user-data-dir=$TMPDIR --no-first-run --no-make-default-browser "$URL"
-    fi
-    rm -rf $TMPDIR
-}

zsh/.zsh/completion.zsh

@@ -53,3 +53,10 @@ zstyle ':completion:*:ssh:*' tag-order users 'hosts:-host hosts:-domain:domain h
 zstyle ':completion:*:ssh:*' group-order hosts-domain hosts-host users hosts-ipaddr
 zstyle '*' single-ignored show
 
+# include homebrew completions if available
+if type brew &>/dev/null; then
+  FPATH=$(brew --prefix)/share/zsh/site-functions:$FPATH
+
+  autoload -Uz compinit
+  compinit
+fi

zsh/.zsh/functions.zsh

@@ -35,4 +35,32 @@ extract() {
 }
 
 
+# create an archive of a list of files, compress the archive, and encrypt the compressed archive 
+function archive-and-encrypt {
+    echo -n "Enter desired output filename: "
+    read filename
+    tar cJ $1 | \
+    gpg -q -r andrew@amdavidson.com -s -e -o "$filename.tar.xz.gpg"
+}
+
+# run mosh and tmux to a specific host
+function mt {
+    mosh $1 -- tmux new-session -A -s main
+}
+
+# blank-chrome
+function blank-chrome {
+    if [ "$@" ]; then
+        URL="$@"
+    else 
+        URL="https://duckduckgo.com"
+    fi
+    TMPDIR=`mktemp -d /tmp/chrome-XXXXX`
+    if [ $IS_MAC ]; then
+        /Applications/Chromium.app/Contents/MacOS/Chromium --user-data-dir=$TMPDIR --no-first-run --no-make-default-browser "$URL"
+    else
+        chromium-browser --user-data-dir=$TMPDIR --no-first-run --no-make-default-browser "$URL"
+    fi
+    rm -rf $TMPDIR
+}