From: Ben Beltran Date: Tue, 23 Apr 2013 13:47:31 +0000 (-0500) Subject: Consolidate configurations X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/2d3861e9b4d00a775b18a64a1b100b4bf5c185d9?ds=sidebyside Consolidate configurations --- diff --git a/tmux.conf b/tmux.conf index cd64511..ad09b55 100644 --- 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 -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 diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim index be5842a..6ddbfe2 160000 --- 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 bf76925..1f5dea3 100755 --- a/vimrc +++ b/vimrc @@ -161,7 +161,7 @@ set nofoldenable 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