diff --git a/bin/gpg-agent.sh b/bin/gpg-agent.sh deleted file mode 100755 index ec4ffed..0000000 --- a/bin/gpg-agent.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -envfile="${HOME}/.gnupg/gpg-agent.env" - -if test -f "$envfile" && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then - eval "$(cat "$envfile")" -else - eval "$(gpg-agent --daemon --write-env-file "$envfile")" -fi - -export GPG_AGENT_INFO # the env file does not contain the export statement diff --git a/zshrc b/zshrc index f370f45..3acb033 100644 --- a/zshrc +++ b/zshrc @@ -11,7 +11,7 @@ alias l="ls -la" alias tmux="tmux -2" alias ta="tmux attach -d" alias dustinswan="mosh dustinswan@dustinswan.org" -alias kill_offlienimap="ps aux | grep offlineimap | awk '{ print $2 }' | xargs kill -9" +alias kill_offlineimap="ps aux | grep offlineimap | awk '{ print $2 }' | xargs kill -9" export EDITOR=vim export TERM="screen-256color" export MOSH_TITLE_NOPREFIX=1 @@ -57,15 +57,6 @@ fi eval `keychain --eval id_rsa` -# GPG -#GPG_AGENT=$(which gpg-agent) -#GPG_TTY=`tty` -#export GPG_TTY - -#if [ -f ${GPG_AGENT} ]; then - #. ~/dotfiles/bin/gpg-agent.sh -#fi - #autoload predict-on #predict-on