added powerline fonts and tmux pasteboard

.bash_aliases

@@ -1,3 +1,5 @@
+# vim: set ft=sh
+
 alias pd="pushd $1"
 alias cdp="cd -"
 

.bashrc

@@ -1,5 +1,3 @@
-
-
 # vim: set ft=sh
 # https://github.com/smerrell/dotfiles
 #

.gitconfig

@@ -103,6 +103,9 @@
 
 [push]
 	default = current
+[pull]
+	default = current
+
 [user]
   email = adamveld12@gmail.com
   name = Adam Veldhousen

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "Tools/modules/tmux-MacOSX-pasteboard"]
+	path = Tools/modules/tmux-MacOSX-pasteboard
+	url = git://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard.git
+[submodule "Tools/modules/powerline-fonts"]
+	path = Tools/modules/powerline-fonts
+	url = git://github.com/Lokaltog/powerline-fonts.git

.tmux.conf

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------#
-# vi: set sw=4 ts=2 ai:                            ("set modeline" in ~/.exrc) #
+# vim:set ft=sh                                     ("set modeline" in ~/.exrc)#
 #------------------------------------------------------------------------------#
 # Config file  : ~/.tmux.conf                                                  #
 #                                                                              #

.vimrc

@@ -1,11 +1,13 @@
+
 " change runtime path
 set runtimepath=~/Tools/vim,$VIM/vimfiles,$VIMRUNTIME
 let g:ruby_path = ':C:\ruby193\bin'
 
-"call pathogen#runtime_append_all_bundles()
+"we don't want vi compatibility AKA Make Vim more useful
+set nocompatible 
+
 call pathogen#infect()
 call pathogen#helptags()
-
 colorscheme vividchalk
 "inkpot
 "jellybeans
@@ -17,15 +19,14 @@ colorscheme vividchalk
 "vividchalk
 "wombat256mod
 
-"we don't want vi compatibility AKA Make Vim more useful
-" set nocompatible 
 set noswapfile
 set autoread
 set selection=exclusive
 set ttimeoutlen=50
 
 let mapleader = ","
-let g:ctrlp_map = '<c-p>'
+
+let g:ctrlp_map = '<C-P>'
 let g:ctrlp_working_path_mode = 2
 
 map <Space> :noh<CR>
@@ -38,6 +39,8 @@ map <C-h> <C-w>h
 map <C-j> <C-w>j
 map <C-k> <C-w>k
 map <C-l> <C-w>l
+
+map <A-k> <C-+>
 map <A-k> <C-w>+
 map <A-j> <C-w>-
 map <A-l> <C-w>>
@@ -53,19 +56,20 @@ map <F1> <Nop>
 nmap <leader>n :NERDTreeToggle %:p:h<CR>
 nmap <leader>m :NERDTreeClose<CR>:NERDTreeFind<CR>
 nmap <leader>t :TlistToggle<CR>
-map <leader>T 0f<ca<
 
-noremap ;; :%s:::g<Left><Left><Left>
-cmap ;\ \(\)<Left><Left>
+" Save a file as root (,W)
+noremap <leader>W :w !sudo tee % > /dev/null<CR>
 
 syntax enable
 
 "airline config
+
+let g:airline#extensions#tabline#enabled = 1
 " the separator used on the left side >
-let g:airline_left_sep='>'
+"let g:airline_left_sep='>'
 
 " the separator used on the right side >
-let g:airline_right_sep='<'
+"let g:airline_right_sep='<'
 
 " enable modified detection >
 let g:airline_detect_modified=1
@@ -99,12 +103,9 @@ function! AirlineThemePatch(palette)
 endfunction
 
 " enable/disable automatic population of the `g:airline_symbols` dictionary with powerline symbols. 
-let g:airline_powerline_fonts=0
+let g:airline_powerline_fonts=1
 
 " define the set of text to display for each mode.  
-let g:airline_mode_map = {} " see source for the defaults
-
-  " or copy paste the following into your vimrc for shortform text
 let g:airline_mode_map = {
     \ '__' : '-',
     \ 'n'  : 'N',
@@ -122,7 +123,6 @@ let g:airline_mode_map = {
 " defines whether the preview window should be excluded from have its window statusline modified (may help with plugins which use the preview window heavily) >
 let g:airline_exclude_preview = 0
 
-
 " change the text for when no branch is detected >
 let g:airline#extensions#branch#empty_message = 'No Branch'
 
@@ -214,6 +214,28 @@ endif
 " Start scrolling three lines before the horizontal window border
 set scrolloff=3
 
+
+filetype on
+au BufRead,BufNewFile *.jade setfiletype jade
+au BufRead,BufNewFile *.xaml setfiletype xml
+au BufRead,BufNewFile *.markdown setfiletype markdown
+au BufRead,BufNewFile *.ps1 setfiletype ps1
+au BufRead,BufNewFile *.scala setfiletype scala
+au BufRead,BufNewFile *.less setfiletype css
+au BufRead,BufNewFile *.go setfiletype go
+
+au BufRead,BufNewFile *.aspx setfiletype htmldjango
+au BufRead,BufNewFile *.ascx setfiletype htmldjango
+au BufRead,BufNewFile *.spark setfiletype htmldjango
+au BufRead,BufNewFile *.html setfiletype htmldjango
+
+
+au BufNewFile,BufRead *.json setfiletype javascript
+au BufRead,BufNewFile *.js setfiletype javascript
+au BufRead,BufNewFile *.coffee setfiletype coffee
+au BufRead,BufNewFile *.iced setfiletype coffee
+au GUIEnter * set vb t_vb=
+
 " Strip trailing whitespace (,ss)
 function! StripWhitespace()
 	let save_cursor = getpos(".")
@@ -223,38 +245,13 @@ function! StripWhitespace()
 	call setreg('/', old_query)
 endfunction
 noremap <leader>ss :call StripWhitespace()<CR>
-" Save a file as root (,W)
-noremap <leader>W :w !sudo tee % > /dev/null<CR>
-
-" Automatic commands
-if has("autocmd")
-	" Enable file type detection
-	filetype on
-	" Treat .json files as .js
-	autocmd BufNewFile,BufRead *.json setfiletype json syntax=javascript
-endif
-
-
-au BufRead,BufNewFile *.jade setfiletype jade
-au BufRead,BufNewFile *.markdown setfiletype markdown
-au BufRead,BufNewFile *.xaml setfiletype xml
-au BufRead,BufNewFile *.spark setfiletype html
-au BufRead,BufNewFile *.ps1 setfiletype ps1
-au BufRead,BufNewFile *.scala setfiletype scala
-au BufRead,BufNewFile *.less setfiletype css
-au BufRead,BufNewFile *.go setfiletype go
-au BufRead,BufNewFile *.js setfiletype javascript
-au BufRead,BufNewFile *.coffee setfiletype coffee
-au BufRead,BufNewFile *.iced setfiletype coffee
-au BufRead,BufNewFile *.html setfiletype htmldjango
-au GUIEnter * set vb t_vb=
 
 if has('gui_running')
   set guioptions -=m
   set guioptions -=T
   set guioptions -=r
   set guioptions -=L
-  set guifont=Ubuntu\ Mono:h26,Consolas:h12
+  set guifont=Liberation\ Mono\ for\ Powerline:h12,Ubuntu\ Mono:h26,Consolas:h12,Courier:h12
 endif
 
 let g:ruby_path = ':C:\ruby193\bin'

Tools/modules/powerline-fonts

@@ -0,0 +1 @@
+Subproject commit 99be8480bb39f2b9daa52f03a22941a45cd1b8cf

Tools/modules/tmux-MacOSX-pasteboard

@@ -0,0 +1 @@
+Subproject commit 98f32381182c5850a40ed60abec0c1320b7be270

rakefile

@@ -1,7 +1,6 @@
 require 'rake/clean'
 require 'fileutils'
 
-
 vimFolder = "Tools/vim"
 bundles_dir = File.join(File.dirname(__FILE__), "#{vimFolder}/bundle/")
 pluginsFile = File.join(File.dirname(__FILE__), "#{vimFolder}/plugins.txt")
@@ -10,10 +9,10 @@ CLOBBER.include "#{bundles_dir}/*"
 
 task :default => ['clobber', 'vim:install']
 
+
 namespace :vim do
 
   directory "#{bundles_dir}"
-
   desc "installs vim plugins from #{vimFolder}/plugins.txt"
   task :install do
     puts "loading plugins into #{bundles_dir}..."
@@ -28,7 +27,7 @@ namespace :vim do
   end
 
   desc 'loads a vim plugin from a git repo'
-  task :installPlugin, [:source] => "#{vimFolder}/bundle" do |t, args|
+  task :installPlugin, [:source] => "#{bundles_dir}" do |t, args|
     raise "Must specify git repo to pull from." unless args.source not(nil)
     dir = gitName args.source
     puts "Installing #{dir}...."