Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

new living social changes plus some vim stuff

  • Loading branch information...
commit 3eca83ce31c454c9b8fadf92d8e1593fe9307634 1 parent 2871ca7
authored April 12, 2012
10  .ackrc
@@ -15,3 +15,13 @@ sass=scss
15 15
 
16 16
 --type-set
17 17
 puppet=pp
  18
+
  19
+--type-set
  20
+handlebars=handlebars
  21
+
  22
+--type-set
  23
+cucumber=feature
  24
+
  25
+--ignore-dir=cache
  26
+--type=nojs
  27
+--ignore-dir=node_modules
4  .gitconfig
... ...
@@ -1,6 +1,6 @@
1 1
 [user]
2 2
     name = Matt Robinson
3  
-    email = matt@puppetlabs.com
  3
+    email = matt@mattrobinson.net
4 4
 [core]
5 5
     excludesfile = ~/.gitignore
6 6
     whitespace = trailing-space,space-before-tab
@@ -22,8 +22,6 @@
22 22
     up-shared = submodule update --reference ~/work/shared
23 23
 [diff]
24 24
     renames = copy # makes the diff much shorter when moving or copying files
25  
-[commit]
26  
-    template = ~/work/developer/util_src/git/.gitcommittemplate
27 25
 [status]
28 26
     submodulesummary = true
29 27
 [rerere]
6  .gitmodules
@@ -22,3 +22,9 @@
22 22
 [submodule ".vim/bundle/vim-nerdtree"]
23 23
 	path = .vim/bundle/vim-nerdtree
24 24
 	url = git://github.com/scrooloose/nerdtree.git
  25
+[submodule ".vim/bundle/vim-indent-guides"]
  26
+	path = .vim/bundle/vim-indent-guides
  27
+	url = git://github.com/nathanaelkane/vim-indent-guides.git
  28
+[submodule ".vim/bundle/handlebars"]
  29
+	path = .vim/bundle/handlebars
  30
+	url = git://github.com/nono/vim-handlebars.git
11  .shrc
... ...
@@ -1,3 +1,12 @@
1 1
 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
2  
-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
  2
+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
3 3
 export RUBYOPT=rubygems
  4
+export ARCHFLAGS='-arch x86_64' export CC=/usr/bin/gcc-4.2
  5
+export SBT_OPTS="-Xms2048M -Xmx4096M -XX:MaxPermSize=512m"
  6
+
  7
+# REE for LivingSocial
  8
+export RUBY_HEAP_FREE_MIN=1024
  9
+export RUBY_HEAP_MIN_SLOTS=4000000
  10
+export RUBY_HEAP_SLOTS_INCREMENT=250000
  11
+export RUBY_GC_MALLOC_LIMIT=500000000
  12
+export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
1  .vim/bundle/handlebars
... ...
@@ -0,0 +1 @@
  1
+Subproject commit 5a678612502d2e981dc2c9a60f8b630e33a45848
1  .vim/bundle/vim-indent-guides
... ...
@@ -0,0 +1 @@
  1
+Subproject commit cf6f4d46614ffd968b80f876b618ee77c5ccc8b3
30  .vimrc
@@ -2,6 +2,19 @@
2 2
 call pathogen#runtime_append_all_bundles()
3 3
 exe "set path=".expand("$PATH")
4 4
 
  5
+" :echo g:colors_name to find out current color scheme
  6
+colorscheme desert256
  7
+" I like these colors better but the visual highlighting mode is terrible
  8
+" colors wombat
  9
+" colors zenburn
  10
+"
  11
+" When using non-terminal vim this proved necessary and can't hurt to have anyway
  12
+set background=dark
  13
+
  14
+let g:indent_guides_auto_colors = 0
  15
+autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd  guibg=red   ctermbg=3
  16
+autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=green ctermbg=4
  17
+
5 18
 set nocompatible          " We're running Vim, not Vi!
6 19
 syntax on                 " Enable syntax highlighting
7 20
 filetype plugin indent on " Enable filetype-specific indenting and plugins
@@ -12,18 +25,9 @@ runtime! macros/matchit.vim
12 25
 " history for vim
13 26
 set viminfo='100,\"50,<500,:100 " 100 files, 50 registers, 500 lines in registers, 100 command history
14 27
 
15  
-" :echo g:colors_name to find out current color scheme
16  
-colors desert
17  
-" I like these colors better but the visual highlighting mode is terrible
18  
-" colors wombat
19  
-" colors zenburn
20  
-
21 28
 " remember buffers between sessions - strange, didnt need this until using mac
22 29
 :exec 'set viminfo=%,' . &viminfo
23 30
 
24  
-" When using non-terminal vim this proved necessary and can't hurt to have anyway
25  
-set background=dark
26  
-
27 31
 " Tab spacing
28 32
 set shiftwidth=2 "number of space characters inserted for indentation
29 33
 set tabstop=2 "number of space characters for tab key
@@ -41,7 +45,7 @@ set list listchars=tab:>-,trail:.,extends:>,precedes:<
41 45
 
42 46
 " file name completion
43 47
 set wildmenu
44  
-set wildmode=longest,list
  48
+set wildmode=list,full
45 49
 
46 50
 " Status Line
47 51
 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
121 125
 
122 126
 "puppet test switching - may want to encapsulate this for other projects if I find I need that
123 127
 function! GoToTheImplementation()
124  
-    if exists("b:rails_root") && filereadable(b:rails_root . "/script/spec")
  128
+    if exists("b:rails_root") " && filereadable(b:rails_root . "/script/spec")
125 129
       if match( expand("%:p"), "spec" ) > -1
126 130
         exec(":A")
127 131
       endif
@@ -139,7 +143,7 @@ function! GoToTheImplementation()
139 143
 endfunc
140 144
 
141 145
 function! GoToTheTest()
142  
-    if exists("b:rails_root") && filereadable(b:rails_root . "/script/spec")
  146
+    if exists("b:rails_root") " && filereadable(b:rails_root . "/script/spec")
143 147
       if match( expand("%:p"), "spec" ) <= 0
144 148
         exec(":A")
145 149
       endif
@@ -233,3 +237,5 @@ map <leader>f :call CdRoot()<CR>:FufFile<CR>
233 237
 
234 238
 " Gblame
235 239
 map <leader>gb :Gblame wCM<CR>
  240
+
  241
+cabbr <expr> %% expand('%:p:h')

0 notes on commit 3eca83c

Please sign in to comment.
Something went wrong with that request. Please try again.