Merge branch 'master' of github.com:anund/.home

Xresources

@@ -34,11 +34,11 @@ Xft.hintstyle:  hintfull
 Xft.hinting: 1
 Xft.antialias: 1
 Xft.rgba: rgb
-URxvt.font: xft:Droid Sans Mono:size=18, \
-            xft:WenQuanYi Zen Hei Mono:size=18, \
+URxvt.font: \
+            xft:Droid Sans Mono:size=18, \
             xft:FreeSerif:style=Regular, \
-            xft:Unifont:style=Medium:antialias=false
-! URxvt.font: xft:Monaco:size=18
+            xft:Unifont:style=Medium:antialias=false, \
+            xft:WenQuanYi Zen Hei Mono:size=18
 
 ! Set scrollbar style to rxvt, plain, next or xterm.
 URxvt.scrollstyle: plain

git/gitconfig

@@ -1,7 +1,9 @@
 [core]
-	excludesfile = /home/backup/.gitignore_global
+	excludesfile = ~/.gitignore_global
 [user]
 	email = [email protected]
 	name = Anund
 [push]
 	default = simple
+[merge]
+	tool = vimdiff

init

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e -v -o pipefail
+
+cd ~
+
+# directories
+rm -rf .vim; ln -sf ~/.home/vim .vim
+
+# git
+ln -s ~/.home/git/gitconfig .gitconfig
+ln -s ~/.home/git/gitignore_global .gitignore_global
+
+# xmonad
+ln -s ~/.home/xmonad/xmobarrc .xmobarrc
+mkdir .xmonad
+ln -s ~/.home/xmonad/xmonad.hs .xmonad/xmonad.hs
+
+# uxrvt
+ln -s ~/.home/Xdefaults .Xdefaults
+ln -s ~/.home/Xresources .Xresources
+
+# X
+touch .startxmonad
+ln -sf ~/.home/xinitrc .xinitrc