From f65dc7f1e1d200c4f8b406d791d627688eda8cee Mon Sep 17 00:00:00 2001
From: Logan Saunders <timandmoby@gmail.com>
Date: Sat, 16 May 2015 13:09:03 -0700
Subject: [PATCH] Added powerline font support

---
 README.md |  3 +++
 tmux.conf | 11 ++++-------
 vimrc     |  7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ffead28..c1712ba 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,6 @@
 ![Setup Preview](https://i.imgur.com/Mf0If2Q.png)
 
 This repo includes my tmux.conf and vimrc along with the scripts used in said tmux.conf. **Note:** my vimrc is using [vundle](https://github.com/gmarik/Vundle.vim) so don't just copy and paste it without installing vundle (also directly copying a vimrc is usually not a good idea).
+
+##Fonts
+The vimrc and tmux.conf files require patched fonts in order to be displayed correctly. I recommend [DejaVu Sans Mono for Powerline](https://github.com/powerline/fonts/tree/master/DejaVuSansMono) but you can find patched versions of many more fonts in that repository.
diff --git a/tmux.conf b/tmux.conf
index c580c73..d1f0f3d 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,5 +1,5 @@
 # This tmux statusbar config was created by tmuxline.vim
-# on Thu, 16 Apr 2015
+# on Sat, 16 May 2015
 # Credit for the appearance of this config goes to the creator of tmuxline, Evgeni Kolev.
 
 ######Behavior######
@@ -38,10 +38,7 @@ setw -g window-status-separator ""
 setw -g window-status-bg "colour238"
 
 ######Status Bar######
-set -g status-left "#[fg=colour236,bg=colour150] #S #[fg=colour150,bg=colour238,nobold,nounderscore,noitalics]>"
-set -g status-right "#[fg=colour237,bg=colour238,nobold,nounderscore,noitalics] #[fg=colour249,bg=colour237] #(~/.scripts/battery.sh) #(~/.scripts/mpd.sh)  %m/%e/%y %I:%m %p #[fg=colour150,bg=colour237,nobold,nounderscore,noitalics] #[fg=colour236,bg=colour150] #h "
-set -g status-utf8 on
-
-######Window Status######
+set -g status-left "#[fg=colour236,bg=colour150] #S #[fg=colour150,bg=colour238,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #(~/.scripts/battery.sh) #(~/.scripts/mpd.sh) #[fg=colour249,bg=colour237] %m/%d/%y  %l:%M %p #[fg=colour150,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour236,bg=colour150] #h "
 setw -g window-status-format "#[fg=colour150,bg=colour238] #I #[fg=colour150,bg=colour238] #W "
-setw -g window-status-current-format "#[fg=colour238,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #I #[fg=colour249,bg=colour237] #W #[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]"
+setw -g window-status-current-format "#[fg=colour238,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #I #[fg=colour249,bg=colour237] #W #[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]"
diff --git a/vimrc b/vimrc
index fcecc31..e352bb3 100644
--- a/vimrc
+++ b/vimrc
@@ -9,6 +9,7 @@ set hlsearch ignorecase
 "Auto indent
 filetype indent on
 set autoindent
+set smartindent
 "Tab
 set tabstop=2 shiftwidth=0 expandtab
 set pastetoggle=<F2>
@@ -37,6 +38,9 @@ Plugin 'bling/vim-airline'
 Plugin 'Townk/vim-autoclose'
 Plugin 'godlygeek/tabular'
 Plugin 'plasticboy/vim-markdown'
+Plugin 'kchmck/vim-coffee-script'
+Plugin 'pangloss/vim-javascript'
+Bundle 'kien/ctrlp.vim'
 Bundle 'mattn/webapi-vim'
 Bundle 'mattn/gist-vim'
 Bundle 'vim-ruby/vim-ruby'
@@ -49,6 +53,7 @@ filetype plugin indent on    " required
 
 """"""""Setup Airline""""""""
 let g:airline_theme= 'bubblegum'
+let g:airline_powerline_fonts = 1
 
 """"""""Setup GitGutter""""""""
 let g:gitgutter_enabled = 1
@@ -75,7 +80,7 @@ let g:ctrlp_cmd = 'CtrlP'
 """"""Remap split movement""""""
 nmap <c-j> <c-w>j
 nmap <c-k> <c-w>k
-nmap <c-y> <c-w>h
+nmap <c-b> <c-w>h
 nmap <c-l> <c-w>l
 
 """"""Improve indent in visual mode""""""