Permalink
Browse files

pairing

  • Loading branch information...
1 parent 178d166 commit 2850c1c3d3ceab77acd42b7767819dfaec8cb5ec @spacekat spacekat committed with lanej May 14, 2013
Showing with 23 additions and 7 deletions.
  1. +5 −3 ack/ackrc
  2. +5 −0 bash/alias
  3. +13 −4 vim/vimrc
View
8 ack/ackrc
@@ -1,12 +1,14 @@
--color
--follow
--ignore-dir=coverage
---ignore-dirs=log
---ignore-dirs=tmp
---ignore-dirs=gems
+--ignore-dir=log
+--ignore-dir=tmp
+--ignore-dir=gems
+--ignore-dir=bundle
--sort-files
--type-add=css=.rake
--type-add=css=.sass
+--type-add=css=.scss
--type-add=ruby=Rakefile
--type-add=ruby=.feature
--type-add=ruby=.gemspec
View
5 bash/alias
@@ -63,4 +63,9 @@ alias gi='gem install'
alias pg-start='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
alias pg-stop='pg_ctl -D /usr/local/var/postgres stop -s -m fast'
alias v='vagrant'
+
alias tfl='tail -Fn30 log/*.log'
+alias gmf='git merge --ff-only'
+alias gslp='git log --stat -p'
+alias gdc='git diff --cached'
+alias c="clear"
View
17 vim/vimrc
@@ -66,6 +66,9 @@ set nobackup
set statusline=%F%m%r%h%w\ [f:%{&ff}\ t:%Y]\ [A:\%03.3b\ H:\%02.2B]\ [P:%04l,%04v][%p%%]\ [LEN=%L]\ %{fugitive#statusline()}
set laststatus=2
+" use bash so that rvm works
+set shell=bash
+
" NT bindings
map <leader>n :NERDTreeToggle<CR>
map <leader>ntm :NERDTreeMirror<CR>
@@ -76,6 +79,8 @@ map <leader>ntf :NERDTreeFind<CR>
" map <leader>a= to :Align = (rather than :Align := )
map <leader>a= :Align =<CR>
map <leader>ah :Align =><CR>
+map <leader>a# :Align #<CR>
+map <leader>A :Align [A-Z].*<CR>:'<,'>s/\s*$//<CR><C-l>
map <leader>= ggVG=<CR>
map <leader>ct :set et <bar> retab<CR>
@@ -103,8 +108,12 @@ set guioptions-=r
set guioptions-=L
" Movement
-nnoremap <C-j> 25j
-nnoremap <C-k> 25k
+nnoremap <A-h> <C-w>h
+nnoremap <A-j> <C-w>j
+nnoremap <A-k> <C-w>k
+nnoremap <A-l> <C-w>l
+nnoremap <A-s> <C-w>s
+nnoremap <A-q> <C-w>q
" grep
map <leader>a :Ack<space>
@@ -113,9 +122,10 @@ set grepprg=ack
set grepformat=%f:%l:%m
" ctrlp
-set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.log,.git
+set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.log,.git,*/bundle/*
let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$'
map <leader>f :CtrlP<CR>
+map <leader>g :CtrlPBuffer<CR>
map <leader>cf :CtrlPClearCache<CR>
" fuckups
@@ -128,4 +138,3 @@ set shell=bash
" Save files when vim loses focus
au FocusLost * :wa
-

0 comments on commit 2850c1c

Please sign in to comment.