From 23557cf4090c3a914c6ddba23430b858cdd5e5bf Mon Sep 17 00:00:00 2001
From: Andrew Tomaka <atomaka@gmail.com>
Date: Mon, 20 Feb 2017 10:02:49 -0500
Subject: [PATCH] Updates for GPG

---
 gitconfig | 41 +++++++++++++++++++++--------------------
 zshrc     |  3 +++
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/gitconfig b/gitconfig
index 633793d..36c3095 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,11 +1,12 @@
 [user]
-    name = Andrew Tomaka
-    email = atomaka@gmail.com
+  name = Andrew Tomaka
+  email = atomaka@gmail.com
+	signingkey = 582BAC86
 [github]
-    user = atomaka
+  user = atomaka
 
 [apply]
-    whitespace = fix
+  whitespace = fix
 [alias]
   hist = log --graph --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
   hist-details = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
@@ -15,24 +16,24 @@
 [color]
     ui = auto
 [color "branch"]
-    current = yellow reverse
-    local = yellow
-    remote = green
+  current = yellow reverse
+  local = yellow
+  remote = green
 [color "diff"]
-    meta = yellow bold
-    frag = magenta
-    old = red
-    new = green
+  meta = yellow bold
+  frag = magenta
+  old = red
+  new = green
 [color "status"]
-    added = yellow
-    changed = green
-    untracked = cyan
+  added = yellow
+  changed = green
+  untracked = cyan
 [core]
-    excludesfile = ~/.gitignore_global
-    autocrlf = input
-    editor = vim
-    filemode = false
+  excludesfile = ~/.gitignore_global
+  autocrlf = input
+  editor = vim
+  filemode = false
 [merge]
-    tool = vimdiff
+  tool = vimdiff
 [push]
-    default = upstream
+  default = upstream
diff --git a/zshrc b/zshrc
index 29dd2a7..d7f8038 100644
--- a/zshrc
+++ b/zshrc
@@ -1,6 +1,9 @@
 [[ -d "$GNU_TOOLS_PATH" ]] && PATH="$GNU_TOOLS_PATH:$PATH"
 [[ -d "$GNU_TOOLS_MAN_PATH" ]] && MANPATH="$GNU_TOOLS_MAN_PATH:$MANPATH"
 
+GPG_TTY=$(tty)
+export GPG_TTY
+
 # clean up duplicate paths
 typeset -U PATH