aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2015-10-22 12:54:02 +0200
committerDavid Runge <dave@sleepmap.de>2015-10-22 12:54:02 +0200
commit0f16cd2fae6fa6b40cdb15948f2d4fcd5e2b26f3 (patch)
treeebf14aee93388a0f35e7d05cb4667a8a93a774b5
parent9cd9a37f5a94084ee87e993c38fc825d2187b3d6 (diff)
downloaddotfiles-0f16cd2fae6fa6b40cdb15948f2d4fcd5e2b26f3.tar.gz
dotfiles-0f16cd2fae6fa6b40cdb15948f2d4fcd5e2b26f3.tar.bz2
dotfiles-0f16cd2fae6fa6b40cdb15948f2d4fcd5e2b26f3.tar.xz
dotfiles-0f16cd2fae6fa6b40cdb15948f2d4fcd5e2b26f3.zip
.zsh.after/export.zsh: Fixing some typos and adding additional comments. Adding XDG_RUNTIME_DIR for tmux's TMUX_TMPDIR. Moving SSH_AUTH_SOCK to XDG_RUNTIME_DIR. Separating ssh-agent and gpg-agent again. Setting GPG_TTY to current tty. Setting GPG_AGENT_INFO to empty string, so gpg-agent can be found.
-rw-r--r--.zsh.after/export.zsh32
1 files changed, 11 insertions, 21 deletions
diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh
index 33774c1..865277f 100644
--- a/.zsh.after/export.zsh
+++ b/.zsh.after/export.zsh
@@ -1,5 +1,3 @@
-# using termite now
-
# use xterm-color anywhere. Sane default for color and termite
if [[ -n $TMUX ]];then
export TERM="screen-256color"
@@ -9,7 +7,7 @@ fi
# use de_DE.UTF-8 to get 24h format
export LC_TIME=de_DE.UTF-8
-
+# browser
export BROWSER=firefox
export REPORTTIME=5
@@ -22,31 +20,23 @@ fi
export GREP_COLOR="1;33"
-## let RVM ignore global ruby
+# let RVM ignore global ruby
export rvm_ignore_gemrc_issues=1
-
-#Java font settings/ renderings
+# Java
+# font settings/ renderings
export _JAVA_OPTIONS='-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true'
-
-# Java non-reparenting windows
-_JAVA_AWT_WM_NONREPARENTING=1; export _JAVA_AWT_WM_NONREPARENTING
+# non-reparenting windows
+export _JAVA_AWT_WM_NONREPARENTING=1
# GnuPG
export GPG_TTY=$(tty)
+export GPG_AGENT_INFO=""
-if [[ "$(uname -v)" != *Debian* ]]; then
- # ssh-agent setting for use with gpg-agent
- unset SSH_AGENT_PID
- if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
- export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh"
- fi
- # Explicitely starting gpg-agent in the background
- gpgconf --launch gpg-agent
-else
- eval $(keychain --eval --agents gpg,ssh -Q --quiet ~/.ssh/id_rsa)
-fi
+# ssh-agent
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+# tmux
if [[ $UID -ne 0 ]]; then
- export TMUX_TMPDIR="/run/user/$UID/tmux/"
+ export TMUX_TMPDIR="$XDG_RUNTIME_DIR/tmux/"
fi