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

diff --git a/makelinks.sh b/makelinks.sh
index d71558450b775b02b4bd3f620b8ff8642a10c22e..cda25466675c4ac40df7de98cc5c96be19048908 100755 (executable)
--- 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 4f6659b9533a3a7cda72b54e40fc26866f8774f5..4dcc958837f70061098f711481ff2d0521ca09c7 100644 (file)
--- 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 038a91443a966df376242581c901d1b898829efe..6a2e74cd24f4da1b2be7ecbc01d88f7a8d4f4790 100644 (file)
--- 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 (file)
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