From cb91c9a82c53c12399fb11f7d186f51ecc1fb9ea Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Wed, 29 Jun 2016 12:04:21 +0200 Subject: misc Signed-off-by: Florian Pritz --- .gitconfig | 4 +++- .xinitrc | 2 +- .zshrc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitconfig b/.gitconfig index 22b054f..6e2b555 100644 --- a/.gitconfig +++ b/.gitconfig @@ -24,7 +24,7 @@ p = push --follow-tags dw = diff --color-words [merge] - tool = vimdiff + tool = kdiff3 conflictstyle = diff3 [push] default = current @@ -59,3 +59,5 @@ show = /usr/share/git/diff-highlight/diff-highlight | less [grep] lineNumber = true +[tag] + sort = version:refname diff --git a/.xinitrc b/.xinitrc index 6ec4653..c12274c 100644 --- a/.xinitrc +++ b/.xinitrc @@ -4,7 +4,7 @@ cd $HOME export VDPAU_NVIDIA_NO_OVERLAY=1 #export SDL_AUDIODRIVER=alsa export SDL_AUDIODRIVER=pulse -export SSH_AUTH_SOCK=$HOME/.gnupg/S.gpg-agent.ssh +export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh export QT_QPA_PLATFORMTHEME="qt5ct" [[ -f ~/.nvidia-settings-rc ]] && nvidia-settings -l diff --git a/.zshrc b/.zshrc index 074a54e..38eb9b2 100644 --- a/.zshrc +++ b/.zshrc @@ -679,7 +679,7 @@ 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=$HOME/.gnupg/S.gpg-agent.ssh +export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh #if type keychain >/dev/null; then #eval $(keychain --eval -q) -- cgit v1.2.3-24-g4f1b