diff --git a/home/.profile b/home/.profile index f09f943..d3691c3 100644 --- a/home/.profile +++ b/home/.profile @@ -20,3 +20,6 @@ export PATH="/usr/local/heroku/bin:$PATH" defaults write com.macromates.TextMate.preview volumeSettings '{ "/" = { extendedAttributes = 0; }; }' +if [[ -e "~/.profile.local" ]]; then + source ~/.profile.local +fi diff --git a/home/.vimrc b/home/.vimrc index a3b4186..849307f 100644 --- a/home/.vimrc +++ b/home/.vimrc @@ -18,66 +18,70 @@ call plug#end() " Execute Basic Setup Commands ######################################################################################### set background=dark -:colorscheme golden +colorscheme golden " abra alduin badwolf Benokai birds-of-paradise black-angus brogrammer bvemu cabin camo chlordane coffee corporation " dark-robin feral golden greens kellys liquidcarbon night_vision obsidian solarized " -:filetype plugin indent on -:hi ColorColumn ctermbg=8 -:syntax on +filetype plugin indent on +hi ColorColumn ctermbg=8 +syntax on " Configure Settings ################################################################################################### -:set autoindent -:set autowrite -:set autowriteall -:set backspace=indent,eol,start -:set cmdheight=2 -:set colorcolumn=120 -:set cursorline -:set expandtab -:set hlsearch -:set incsearch -:set laststatus=2 -:set modelines=2 -:set nofoldenable -:set nowrap -:set number -:set path=** -:set ruler -:set scrolloff=5 -:set shiftwidth=4 -:set showbreak="+++>" -:set showcmd -:set showmatch -:set smarttab -:set statusline=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P -:set t_Co=256 -:set tabstop=4 -:set textwidth=0 -:set virtualedit=block -:set visualbell -:set wildignore+=node_modules,log,build,dist -:set wildmode=longest,list +set autoindent +set autowrite +set autowriteall +set backspace=indent,eol,start +set cmdheight=2 +set colorcolumn=120 +set cursorline +set expandtab +set hlsearch +set incsearch +set laststatus=2 +set modelines=2 +set nofoldenable +set nowrap +set number +set path=** +set ruler +set scrolloff=5 +set shiftwidth=4 +set showbreak="+++>" +set showcmd +set showmatch +set smarttab +set statusline=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P +set t_Co=256 +set tabstop=4 +set textwidth=0 +set virtualedit=block +set visualbell +set wildignore+=node_modules,log,build,dist +set wildmode=longest,list + +if executable('ag') + set grepprg=ag\ --vimgrep\ -p\ .agignore + set grepformat=%f:%l:%c:%m +endif " Configure Plugins #################################################################################################### " ctrlpvim/ctrlp.vim -:let g:ctrlp_working_path_mode = 0 -:if !empty(glob(".find-ignore")) -: let g:ctrlp_user_command = 'find %s -type f | egrep -v "$(cat .find-ignore)"' -:else -: let g:ctrlp_user_command = 'find %s -type f' -:endif +let g:ctrlp_working_path_mode = 0 +if executable('ag') + let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' + let g:ctrlp_use_caching = 0 +endif " elzr/vim-json -:let g:vim_json_syntax_conceal = 0 +let g:vim_json_syntax_conceal = 0 " godlygeek/tabular -:nmap == :Tabularize /= -:nmap =: :Tabularize /[^:]*: -:nmap =or :Tabularize /or +nmap == :Tabularize /= +nmap =: :Tabularize /[^:]*: +nmap =or :Tabularize /or " nathanaelkane/vim-indent-guides -:let g:indent_guides_enable_on_vim_startup = 0 " :IndentGuidesToggle +let g:indent_guides_enable_on_vim_startup = 0 " :IndentGuidesToggle diff --git a/install.sh b/install.sh index f704a2a..00cedae 100755 --- a/install.sh +++ b/install.sh @@ -25,6 +25,7 @@ echo; echo; echo "Updating brew, one moment..." brew update echo; echo; echo "Installing standard brew packages..." +brew install ag brew install fswatch brew install macvim brew install node