From e39cf061f513980ae88a8d561b1d20f59d09b132 Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Wed, 3 Feb 2016 10:11:18 -0500
Subject: [PATCH 1/6] Update ls alias for os x and zsh

---
 .zshrc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.zshrc b/.zshrc
index d68a570..d9817a2 100644
--- a/.zshrc
+++ b/.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
 

From b7367f5ce91092d5bc7ac95b51f208656833f75d Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Thu, 25 Feb 2016 14:50:56 -0500
Subject: [PATCH 2/6] Add .Xresources

---
 .Xresources | 31 +++++++++++++++++++++++++++++++
 install.sh  |  2 --
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 .Xresources

diff --git a/.Xresources b/.Xresources
new file mode 100644
index 0000000..251baf8
--- /dev/null
+++ b/.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
diff --git a/install.sh b/install.sh
index 5bde887..f2525d9 100755
--- a/install.sh
+++ b/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

From 5e8624908696f0288a6eb51efbfaac243e5e2f7b Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Sun, 28 Feb 2016 18:31:42 -0500
Subject: [PATCH 3/6] Add gaps to i3

---
 .i3/config | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.i3/config b/.i3/config
index 3066c48..547cf45 100644
--- a/.i3/config
+++ b/.i3/config
@@ -11,6 +11,11 @@
 
 set $mod Mod1
 
+# Comment out for non-i3 gaps
+gaps inner 20
+for_window [class="^.*"] border pixel 1
+smart_gaps on
+
 # font for window titles. ISO 10646 = Unicode
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 font pango:DejaVu Sans Mono 10

From 9f1f409760d6196d09dca22bac118932b5c1f918 Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Wed, 2 Mar 2016 17:41:56 -0500
Subject: [PATCH 4/6] fix py3status include directory

---
 .i3/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.i3/config b/.i3/config
index 547cf45..6bafd1e 100644
--- a/.i3/config
+++ b/.i3/config
@@ -215,7 +215,7 @@ set $bold_text #FFDECF
 # finds out, if available)
 bar {
 # Laptop Screen
-	status_command py3status
+	status_command py3status -i ~/.dotfiles/py3status/
 	colors {
 		background $base
 		statusline $base_text

From 65db3d32da7ab94b3b701a9028fe9d338a126cc8 Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Wed, 2 Mar 2016 17:42:12 -0500
Subject: [PATCH 5/6] Remove ctrlp.vim

---
 .vim/bundle/ctrlp.vim | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 .vim/bundle/ctrlp.vim

diff --git a/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim
deleted file mode 160000
index b5d3fe6..0000000
--- a/.vim/bundle/ctrlp.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f

From 57080392f703c6005a1dd16ede070ce7d603f852 Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <gutierrez.aaron.m@gmail.com>
Date: Wed, 2 Mar 2016 21:16:17 -0500
Subject: [PATCH 6/6] Revert "Remove ctrlp.vim"

This reverts commit 65db3d32da7ab94b3b701a9028fe9d338a126cc8.
---
 .vim/bundle/ctrlp.vim | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 .vim/bundle/ctrlp.vim

diff --git a/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim
new file mode 160000
index 0000000..b5d3fe6
--- /dev/null
+++ b/.vim/bundle/ctrlp.vim
@@ -0,0 +1 @@
+Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f