Permalink
Browse files

new living social changes plus some vim stuff

  • Loading branch information...
1 parent 2871ca7 commit 3eca83ce31c454c9b8fadf92d8e1593fe9307634 @mmrobins committed Apr 12, 2012
Showing with 47 additions and 16 deletions.
  1. +10 −0 .ackrc
  2. +1 −3 .gitconfig
  3. +6 −0 .gitmodules
  4. +10 −1 .shrc
  5. +1 −0 .vim/bundle/handlebars
  6. +1 −0 .vim/bundle/vim-indent-guides
  7. +18 −12 .vimrc
View
@@ -15,3 +15,13 @@ sass=scss
--type-set
puppet=pp
+
+--type-set
+handlebars=handlebars
+
+--type-set
+cucumber=feature
+
+--ignore-dir=cache
+--type=nojs
+--ignore-dir=node_modules
View
@@ -1,6 +1,6 @@
[user]
name = Matt Robinson
- email = matt@puppetlabs.com
+ email = matt@mattrobinson.net
[core]
excludesfile = ~/.gitignore
whitespace = trailing-space,space-before-tab
@@ -22,8 +22,6 @@
up-shared = submodule update --reference ~/work/shared
[diff]
renames = copy # makes the diff much shorter when moving or copying files
-[commit]
- template = ~/work/developer/util_src/git/.gitcommittemplate
[status]
submodulesummary = true
[rerere]
View
@@ -22,3 +22,9 @@
[submodule ".vim/bundle/vim-nerdtree"]
path = .vim/bundle/vim-nerdtree
url = git://github.com/scrooloose/nerdtree.git
+[submodule ".vim/bundle/vim-indent-guides"]
+ path = .vim/bundle/vim-indent-guides
+ url = git://github.com/nathanaelkane/vim-indent-guides.git
+[submodule ".vim/bundle/handlebars"]
+ path = .vim/bundle/handlebars
+ url = git://github.com/nono/vim-handlebars.git
View
@@ -1,3 +1,12 @@
export PATH=$HOME/work/mcollective-agent-debugger:/$HOME/bin:$HOME/work/facter/bin:$HOME/work/puppet/sbin:$HOME/work/puppet/bin:$HOME/work/puppet-module-tool/bin:/usr/local/bin:/usr/local/sbin:$PATH
-export RUBYLIB=$HOME/work/puppetlabs-cloud-provisioner/lib:$HOME/work/mcollective-test/lib:$HOME/work/facter/lib:$HOME/work/puppet/lib:$HOME/work/puppet-module-tool/lib:$RUBYLIB
+export RUBYLIB=$HOME/work/puppetlabs-cloud-provisioner/lib:$HOME/work/mcollective-test/lib:$HOME/work/facter/lib:$HOME/work/puppet/lib:$HOME/work/puppet-module-tool/lib:$HOME/work/git-rank/lib:$RUBYLIB
export RUBYOPT=rubygems
+export ARCHFLAGS='-arch x86_64' export CC=/usr/bin/gcc-4.2
+export SBT_OPTS="-Xms2048M -Xmx4096M -XX:MaxPermSize=512m"
+
+# REE for LivingSocial
+export RUBY_HEAP_FREE_MIN=1024
+export RUBY_HEAP_MIN_SLOTS=4000000
+export RUBY_HEAP_SLOTS_INCREMENT=250000
+export RUBY_GC_MALLOC_LIMIT=500000000
+export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
Submodule handlebars added at 5a6786
View
@@ -2,6 +2,19 @@
call pathogen#runtime_append_all_bundles()
exe "set path=".expand("$PATH")
+" :echo g:colors_name to find out current color scheme
+colorscheme desert256
+" I like these colors better but the visual highlighting mode is terrible
+" colors wombat
+" colors zenburn
+"
+" When using non-terminal vim this proved necessary and can't hurt to have anyway
+set background=dark
+
+let g:indent_guides_auto_colors = 0
+autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=red ctermbg=3
+autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=green ctermbg=4
+
set nocompatible " We're running Vim, not Vi!
syntax on " Enable syntax highlighting
filetype plugin indent on " Enable filetype-specific indenting and plugins
@@ -12,18 +25,9 @@ runtime! macros/matchit.vim
" history for vim
set viminfo='100,\"50,<500,:100 " 100 files, 50 registers, 500 lines in registers, 100 command history
-" :echo g:colors_name to find out current color scheme
-colors desert
-" I like these colors better but the visual highlighting mode is terrible
-" colors wombat
-" colors zenburn
-
" remember buffers between sessions - strange, didnt need this until using mac
:exec 'set viminfo=%,' . &viminfo
-" When using non-terminal vim this proved necessary and can't hurt to have anyway
-set background=dark
-
" Tab spacing
set shiftwidth=2 "number of space characters inserted for indentation
set tabstop=2 "number of space characters for tab key
@@ -41,7 +45,7 @@ set list listchars=tab:>-,trail:.,extends:>,precedes:<
" file name completion
set wildmenu
-set wildmode=longest,list
+set wildmode=list,full
" Status Line
set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [ASCII=\%03.3b]\ [HEX=\%02.2B]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]
@@ -121,7 +125,7 @@ set grepprg=ack\ -a\ --nobinary\ --sort-files\ --color
"puppet test switching - may want to encapsulate this for other projects if I find I need that
function! GoToTheImplementation()
- if exists("b:rails_root") && filereadable(b:rails_root . "/script/spec")
+ if exists("b:rails_root") " && filereadable(b:rails_root . "/script/spec")
if match( expand("%:p"), "spec" ) > -1
exec(":A")
endif
@@ -139,7 +143,7 @@ function! GoToTheImplementation()
endfunc
function! GoToTheTest()
- if exists("b:rails_root") && filereadable(b:rails_root . "/script/spec")
+ if exists("b:rails_root") " && filereadable(b:rails_root . "/script/spec")
if match( expand("%:p"), "spec" ) <= 0
exec(":A")
endif
@@ -233,3 +237,5 @@ map <leader>f :call CdRoot()<CR>:FufFile<CR>
" Gblame
map <leader>gb :Gblame wCM<CR>
+
+cabbr <expr> %% expand('%:p:h')

0 comments on commit 3eca83c

Please sign in to comment.