diff options
| author | David Runge <dave@sleepmap.de> | 2015-10-22 23:47:55 +0200 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2015-10-22 23:47:55 +0200 |
| commit | 3d7be9b249ddaff33cf363846578d429cfefd60a (patch) | |
| tree | a1d39dae5186d35beaee389e9508260d315686d9 /.zsh.after | |
| parent | 3fd1308ec86aa941bbed02c299ab5d57a48ee404 (diff) | |
| parent | 995892dc2105fa5c89b7f7ae32db46104b5c9e56 (diff) | |
| download | dotfiles-3d7be9b249ddaff33cf363846578d429cfefd60a.tar.gz dotfiles-3d7be9b249ddaff33cf363846578d429cfefd60a.tar.bz2 dotfiles-3d7be9b249ddaff33cf363846578d429cfefd60a.tar.xz dotfiles-3d7be9b249ddaff33cf363846578d429cfefd60a.zip | |
Merge branch 'master' of sleepmap.de:dotfiles
* 'master' of sleepmap.de:dotfiles:
.tmux.conf: Adding tmux > 2.1 mouse scrolling options.
.gitignore: Adding make/ folder to the list of ignored folder.
.gitignore: Adding bin/pass2offlineimapc, as it will be re-generated upon usage.
.gitignore: Adding .mutt/gpg-auto.rc, as it will have to be re-generated via script before useage of mutt.
bin/generate_pgp_auto: Adding script to generate mutt send-hooks for mail addresses with valid gpg keys, to be able to automatically send encrypted mail.
.mutt/gpg.rc: Updating correct settings for gpg.
.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.
.config/khal/khal.conf, .vdirsyncer/config: Changing name of calendar.
.mutt/gpg.rc: Updating pgp settings to be compliant with gnupg > 2.1.
.local/share/applications/pd.desktop: Shifting from pd-extended to pd.
.tmux.conf: Adding new (post 2.1) mouse mode
Diffstat (limited to '.zsh.after')
| -rw-r--r-- | .zsh.after/export.zsh | 32 |
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 |