From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Wed, 11 Nov 2015 12:40:47 +0000 (+0000)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=a5b3bb51b5cd0584ac8597cf836ab508d142e2a6;hp=-c;p=max%2Fdotfiles.git

Merge branch 'master' of github.com:maxf130/dotfiles
---

a5b3bb51b5cd0584ac8597cf836ab508d142e2a6
diff --combined xinitrc
index 038a914,b936d6b..6a2e74c
--- a/xinitrc
+++ b/xinitrc
@@@ -1,4 -1,4 +1,4 @@@
- #!/bin/sh
+ #!/bin/bash
  #
  # ~/.xinitrc
  #
@@@ -14,7 -14,8 +14,8 @@@ f
  
  
  # Load .Xresources
- [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+ xrdb -merge ~/.Xresources &> /dev/null
+ 
  
  # Set caps lock as control to avoid emacs pinky
  setxkbmap -option ctrl:nocaps
@@@ -23,7 -24,6 +24,7 @@@
  export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
  
  
 +feh --bg-scale ~/Pictures/background.jpg&
  
  
  # exec gnome-session