diff --git a/.Xdefaults b/.Xdefaults deleted file mode 100644 index ec58583..0000000 --- a/.Xdefaults +++ /dev/null @@ -1,27 +0,0 @@ -! colors -*color0: #3F3F3F -*color8: #709080 - -*color1: #705050 -*color9: #DCA3A3 - -*color2: #60B48A -*color10: #72D5A3 - -*color3: #DFAF8F -*color11: #F0DFAF - -*color4: #9AB8D7 -*color12: #94BFF3 - -*color5: #DC8CC3 -*color13: #EC93D3 - -*color6: #8CD0D3 -*color14: #93E0E3 - -*color7: #DCDCCC -*color15: #FFFFFF - -*background: #2C2C2C -*foreground: #DCDCCC diff --git a/Xresources b/Xresources index 12dbc45..a05881b 100644 --- a/Xresources +++ b/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 diff --git a/git/gitconfig b/git/gitconfig index 1fd6906..7fe7287 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -1,7 +1,9 @@ [core] - excludesfile = /home/backup/.gitignore_global + excludesfile = ~/.gitignore_global [user] email = anund@gmail.com name = Anund [push] default = simple +[merge] + tool = vimdiff diff --git a/init b/init new file mode 100755 index 0000000..263fd2b --- /dev/null +++ b/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