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=508381d5a4182627e89db0afd72c98c0ab8c3d55;p=max%2Fdotfiles.git

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

diff --git a/makelinks.sh b/makelinks.sh
index d715584..cda2546 100755
--- a/makelinks.sh
+++ b/makelinks.sh
@@ -8,7 +8,7 @@
 
 dir=~/etc/dotfiles                    
 olddir=~/etc/dotfiles.bak             
-files="vimrc bashrc xsession Xresources gitconfig zprofile zshenv zshrc xinitrc"
+files="vimrc bashrc Xresources gitconfig zprofile zshenv zshrc xinitrc"
 
 ##########
 
diff --git a/vimrc b/vimrc
index 4f6659b..4dcc958 100644
--- a/vimrc
+++ b/vimrc
@@ -55,6 +55,10 @@ let g:syntastic_check_on_open = 0
 let g:syntastic_check_on_wq = 0
 let g:syntastic_javascript_checkers = ['eslint']
 
+" Syntastic C++11
+let g:syntastic_cpp_compiler = 'g++'
+let g:syntastic_cpp_compiler_options = '-std=c++11'
+
 set laststatus=2
 " Set this to 1 if powerline fonts are installed.
 let g:airline_powerline_fonts = 0
diff --git a/xinitrc b/xinitrc
index 038a914..6a2e74c 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # ~/.xinitrc
 #
@@ -14,7 +14,8 @@ fi
 
 
 # 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
diff --git a/xsession b/xsession
deleted file mode 100644
index a84af3b..0000000
--- a/xsession
+++ /dev/null
@@ -1,20 +0,0 @@
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-
-# Load .Xresources
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
-
-# Set caps lock as control to avoid emacs pinky
-setxkbmap -option ctrl:nocaps
-
-# Set java font option
-export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
-
-feh --bg-scale ~/Pictures/background.jpg
-
-exec qtile