From ac11748360bf25c02ea0f8ce171ba019bf9ef45b Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 13 Apr 2014 21:31:17 +0200
Subject: gitconfig: add new alias; xinitrc: misc

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .gitconfig | 3 ++-
 .xinitrc   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 8eebcf8..206f95e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,8 +16,9 @@
 	b = branch -vv
 	sup = log --all --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b'
 	sp = show --stat -p
-	mff = merge
+	mff = merge --ff-only
 	refl = reflog --date=relative
+	mnf = merge --no-ff
 [merge]
 	tool = vimdiff
 	conflictstyle = diff3
diff --git a/.xinitrc b/.xinitrc
index 9eb1942..879e5c8 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -10,19 +10,20 @@ xrandr --output DVI-D-0 --left-of DVI-I-1
 dash $HOME/.bg &
 
 numlockx
+xset -dpms
 xset r rate 250 50 &
 source $HOME/bin/gpg-agent.sh
 
 # autostart entries
 setxkbmap de nodeadkeys
-xbindkeys &
+(sleep 4; xbindkeys) &
 xkbcomp ~/.xkbmap $DISPLAY &
 xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 10 &
 pulseaudio --start &
 remote-notify-client.sh &
 compton -bfzCG --backend glx --vsync opengl-swc --paint-on-overlay -D2
 #xflux  -l 48.190  -g 15.62 -k 4200
-redshift -l 48.190:15.62 -t 5700:3400 -m randr &
+redshift -l 48.190:15.62 -t 5700:4200 -m randr &
 
 autostart () {
   #urxvt -g 125x+45+1041+0 -e ssh mistral &
-- 
cgit v1.2.3-24-g4f1b