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

.Xresources

@@ -0,0 +1,31 @@
+URxvt.scrollBar: false
+urxvt.font: xft:DejavuSansMono:pixelsize=9
+URxvt.letterSpace: -1
+
+! tangoesque scheme
+*background: #111111
+*foreground: #eeeeee
+! Black (not tango) + DarkGrey
+*color0:  #000000
+*color8:  #444743
+! DarkRed + Red
+*color1:  #ff6565
+*color9:  #ff8d8d
+! DarkGreen + Green
+*color2:  #93e44f
+*color10: #c8e7a8
+! DarkYellow + Yellow
+*color3:  #eab93d
+*color11: #ffc123
+! DarkBlue + Blue
+*color4:  #204ad4
+*color12: #3465a4
+! DarkMagenta + Magenta
+*color5:  #ce5c00
+*color13: #f57900
+!DarkCyan + Cyan (both not tango)
+*color6:  #89b6e2
+*color14: #46a4ff
+! LightGrey + White
+*color7:  #cccccc
+*color15: #ffffff

.zshrc

@@ -28,7 +28,6 @@ alias fuck='sudo $(history -p \!\!)'
 alias grep='grep --color=auto'
 alias hidden='ls -a | grep "^\..*"'
 alias killz='killall -9 '
-alias ls="ls --color=always"
 alias m='ncmpcpp'
 alias math='rlwrap MathKernel'
 alias ocaml='rlwrap ocaml'
@@ -39,6 +38,15 @@ alias sml='rlwrap sml'
 alias style='clang-format-3.5 -style=Google'
 alias telnet='rlwrap telnet'
 
+# Enable color support of ls and also add handy aliases
+# Mac OS doesn't support --color flag for ls, needs -G instead.
+if [[ `uname` = "Darwin" ]]
+then
+  alias ls='ls -G'
+else
+  alias ls='ls --color=auto'
+fi
+
 # Turn off the ability for other people to message your terminal using wall
 mesg n
 

install.sh

@@ -4,5 +4,3 @@ git submodule sync;
 git submodule update;
 
 rsync --exclude ".git/" --exclude ".git*" --exclude "install.sh" --exclude "py3status" -avhE  --no-perms . ~;
-
-source ~/.bashrc