summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2018-04-22 22:22:07 +0200
committerFlorian Pritz <bluewind@xinu.at>2018-04-22 22:22:07 +0200
commitbe0d9059f77799720891481975b9124e5de2992c (patch)
treeb9d3ccdbc97a19a3316cf9d02dfca3ef09b4a37d
parent817743df402d5a610da7a23002245075a701a123 (diff)
downloaddotfiles-be0d9059f77799720891481975b9124e5de2992c.tar.gz
dotfiles-be0d9059f77799720891481975b9124e5de2992c.tar.xz
zshrc: misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--.xinitrc5
-rw-r--r--.zshrc14
2 files changed, 13 insertions, 6 deletions
diff --git a/.xinitrc b/.xinitrc
index a0e5f79..c3f1813 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -4,7 +4,8 @@ cd "$HOME" || exit 1
export VDPAU_NVIDIA_NO_OVERLAY=1
#export SDL_AUDIODRIVER=alsa
export SDL_AUDIODRIVER=pulse
-export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
+#export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
+export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/keyring/ssh"
export QT_QPA_PLATFORMTHEME="qt5ct"
export LANG=en_US.UTF-8
@@ -28,7 +29,7 @@ xset r rate 250 50 &
systemctl --user import-environment DISPLAY XAUTHORITY
dbus-update-activation-environment DISPLAY XAUTHORITY
-eval "$(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets)"
+eval "$(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)"
export GNOME_KEYRING_CONTROL
export GNOME_KEYRING_PID
export DBUS_SESSION_BUS_ADDRESS
diff --git a/.zshrc b/.zshrc
index 48c45ba..2706434 100644
--- a/.zshrc
+++ b/.zshrc
@@ -8,8 +8,12 @@ ZDOTDIR="$HOME/.zsh"
export LANG=en_US.UTF-8
export TZ=Europe/Vienna
-# add extra dirs to path. allows to separate script bundles into dirs
-for _dir in $HOME/bin/extra/*(/N); do
+if [[ $TERM = "xterm-termite" ]]; then
+ export TERM=xterm-256color
+fi
+
+# add extra dirs/symlinks to path. allows to separate script bundles into dirs
+for _dir in $HOME/bin/extra/*(/N,@N); do
export PATH=$_dir:$PATH
done
@@ -403,7 +407,8 @@ hgrep() {
# }}}
# History {{{
-HISTFILE=~/.zsh/histfile
+HISTORYDIRECTORY=~/.zsh/history
+HISTFILE="$HISTORYDIRECTORY/histfile"
HISTSIZE=10000
SAVEHIST=10000000
# }}}
@@ -721,7 +726,8 @@ if [[ -e $HOME/git/dotfiles/.zsh/zsh-syntax-highlighting-git/zsh-syntax-highligh
source $HOME/git/dotfiles/.zsh/zsh-syntax-highlighting-git/zsh-syntax-highlighting.zsh
fi
-export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
+#export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
+export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/keyring/ssh"
if [[ -e ~/perl5 ]]; then
eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)