Consolidate configurations

diff --git a/tmux.conf b/tmux.conf
index cd64511881a11a6dd405de5b05bb4d1cf8611cec..ad09b55d337212ac257929e5515ea41034eade2f 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -23,7 +23,8 @@ bind - split-window -v
 # set -g status-right '#[fg=black]#[bg=white]#(uptime)'
 # set -g status-right-length 70
 
 # set -g status-right '#[fg=black]#[bg=white]#(uptime)'
 # set -g status-right-length 70
 

-source /Users/benbeltran/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf
+# Powerline
+source ~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf

 
 #Set Activity monitoring.
 setw -g monitor-activity on
 
 #Set Activity monitoring.
 setw -g monitor-activity on

diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim
index be5842a376f16c16c5dc4cc1879d7168a074f7de..6ddbfe2cc00a7eeb2a4450552b78276488a2e2c9 160000 (submodule)
--- a/vim/bundle/ctrlp.vim
+++ b/vim/bundle/ctrlp.vim
@@ -1 +1 @@
-Subproject commit be5842a376f16c16c5dc4cc1879d7168a074f7de
+Subproject commit 6ddbfe2cc00a7eeb2a4450552b78276488a2e2c9

diff --git a/vimrc b/vimrc
index bf769250d4d985c6400a0b508006f5bfe6c45465..1f5dea34fc3bd67dc7c14d97dc7e47f72d2d6b81 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -161,7 +161,7 @@ set nofoldenable
 set foldlevel=1
 
 " powerline stuff
 set foldlevel=1
 
 " powerline stuff

-set rtp+=/Users/benbeltran/Library/Python/2.7/lib/python/site-packages/powerline/bindings/vim
+set rtp+=~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/vim

 
 " Fix CtrlP root folder and add some ignores
 let g:ctrlp_working_path_mode = 0
 
 " Fix CtrlP root folder and add some ignores
 let g:ctrlp_working_path_mode = 0