remove obsolete files for tridactyl, luakit

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 7a5982f2ee2e0fd45c9885ea097255c4df5c95de..46b0e662703896389e5ad0116e72992a6b9dff16 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -22,15 +22,23 @@ export XDG_RUNTIME_DIR=~/tmp
 ### applications
 export PYTHONSTARTUP=~/.pythonrc
 ## perl
 ### applications
 export PYTHONSTARTUP=~/.pythonrc
 ## perl

-eval $(perl -I $XDG_DATA_HOME/perl5/lib/perl5 -Mlocal::lib=$XDG_DATA_HOME/perl5)
+(( ${+commands[perl]} )) && eval $(perl -I $XDG_DATA_HOME/perl5/lib/perl5 -Mlocal::lib=$XDG_DATA_HOME/perl5)
+## gpg
+export GPG_TTY=$(tty)
+if [[ ! -v SSH_AUTH_SOCK ]] {
+       # set up SSH auth socket and start GPG agent
+       export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+}
+gpg-connect-agent updatestartuptty /bye >/dev/null

 
 ### freebsd
 
 ### freebsd

-if [[ "$OSTYPE" =~ "^freebsd" ]]; then
+if [[ "$OSTYPE" =~ "^freebsd" ]] {

        export CLICOLOR=
        export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
        export CLICOLOR=
        export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'

-fi
+}

 
 ### load site-specific
 
 ### load site-specific

-if [[ -f ~/.zshenv.local ]] {
+if [[ -f ~/.zshenv.local ]] && [[ ! -v _ZSHENV_LOADED ]] {
+       export _ZSHENV_LOADED=

        source ~/.zshenv.local
 }
        source ~/.zshenv.local
 }