diff --git a/.bash_aliases b/.bash_aliases index 4038dfb..74596b7 100755 --- a/.bash_aliases +++ b/.bash_aliases @@ -1,3 +1,5 @@ +# vim: set ft=sh + alias pd="pushd $1" alias cdp="cd -" diff --git a/.bashrc b/.bashrc index 9a57160..6b6f5a7 100755 --- a/.bashrc +++ b/.bashrc @@ -1,5 +1,3 @@ - - # vim: set ft=sh # https://github.com/smerrell/dotfiles # diff --git a/.gitconfig b/.gitconfig index 720339e..beb5c6d 100644 --- a/.gitconfig +++ b/.gitconfig @@ -103,6 +103,9 @@ [push] default = current +[pull] + default = current + [user] email = adamveld12@gmail.com name = Adam Veldhousen diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f185b9d --- /dev/null +++ b/.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 diff --git a/.tmux.conf b/.tmux.conf index bfc1135..cd21950 100755 --- a/.tmux.conf +++ b/.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 # # # diff --git a/.vimrc b/.vimrc index 545661c..b5c6ebc 100755 --- a/.vimrc +++ b/.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 = '' + +let g:ctrlp_map = '' let g:ctrlp_working_path_mode = 2 map :noh @@ -38,6 +39,8 @@ map h map j map k map l + +map map + map - map > @@ -53,19 +56,20 @@ map nmap n :NERDTreeToggle %:p:h nmap m :NERDTreeClose:NERDTreeFind nmap t :TlistToggle -map T 0f -cmap ;\ \(\) +" Save a file as root (,W) +noremap W :w !sudo tee % > /dev/null 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 @@ -74,16 +78,16 @@ let g:airline_detect_modified=1 let g:airline_detect_paste=1 " enable iminsert detection > - let g:airline_detect_iminsert=1 +let g:airline_detect_iminsert=1 " determine whether inactive windows should have the left section collapsed to only the filename of that buffer. let g:airline_inactive_collapse=1 " enable/disable csv integration for displaying the current column. - let g:airline#extensions#csv#enabled = 1 +let g:airline#extensions#csv#enabled = 1 " customize the whitespace symbol. > - let g:airline#extensions#whitespace#symbol = '.' +let g:airline#extensions#whitespace#symbol = '.' " themes are automatically selected based on the matching colorscheme. this can be overridden by defining a value. " let g:airline_theme= @@ -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 ss :call StripWhitespace() -" Save a file as root (,W) -noremap W :w !sudo tee % > /dev/null - -" 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' \ No newline at end of file diff --git a/Tools/modules/powerline-fonts b/Tools/modules/powerline-fonts new file mode 160000 index 0000000..99be848 --- /dev/null +++ b/Tools/modules/powerline-fonts @@ -0,0 +1 @@ +Subproject commit 99be8480bb39f2b9daa52f03a22941a45cd1b8cf diff --git a/Tools/modules/tmux-MacOSX-pasteboard b/Tools/modules/tmux-MacOSX-pasteboard new file mode 160000 index 0000000..98f3238 --- /dev/null +++ b/Tools/modules/tmux-MacOSX-pasteboard @@ -0,0 +1 @@ +Subproject commit 98f32381182c5850a40ed60abec0c1320b7be270 diff --git a/rakefile b/rakefile index 1ef3ad5..2800362 100755 --- a/rakefile +++ b/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}...."