Cleaning

.bashrc

@@ -58,15 +58,6 @@ alias git-count='git shortlog -s -n'
 alias tag='git tag -l | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n'
 alias cipm='git ci . -m '
 
-# rails aliases
-alias z='zeus '
-alias zc='z console '
-alias zs='z server '
-alias zd='z dbconsole '
-alias zz='reset; rm -rf .zeus.sock ; z start '
-
-alias mutt='cd ~/Downloads/ ; mutt'
-
 alias update_tags='ctags -R --languages=ruby --exclude=.git --exclude=log . $(bundle list --paths)'
 alias update_ctags='ctags -R --languages=ruby --exclude=.git --exclude=log . $(bundle list --paths)'
 

.pryrc

@@ -1,2 +1,5 @@
+require "awesome_print"
+AwesomePrint.pry!
 
 --no-line-numbers
+

.tigrc

@@ -1,8 +1,15 @@
 set mouse = true
 set vertical-split = false
+set line-graphics = utf-8
 
 bind status P !git push origin
 
 # color cursor			white	default	bold
 
 # source : https://raw.githubusercontent.com/jonas/tig/master/tigrc
+
+
+set main-view	= line-number:no,interval=5 id:no date:short author:abbreviated commit-title:yes,graph,refs,overflow=no
+
+
+

.vim/bundles.vim

@@ -4,7 +4,7 @@ call vundle#rc()
 
 " git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle/
 Bundle 'gmarik/vundle'
-Bundle 'ddollar/nerdcommenter'
+Bundle 'scrooloose/nerdcommenter'
   map <leader>ff :NERDTreeFind<cr>
 
 Bundle 'tpope/vim-surround'
@@ -17,12 +17,11 @@ Bundle 'vim-scripts/ack.vim'
 " Bundle 'tsaleh/vim-matchit'
 silent! runtime macros/matchit.vim
 
-Bundle 'kien/ctrlp.vim'
+Bundle 'ctrlpvim/ctrlp.vim'
   set wildignore+=*.pyc
+  let g:ctrlp_match_window = 'bottom,order:btt,min:1,max:50,results:30'
   let g:ctrlp_map = '<leader>t'
   map <leader>b :CtrlPBuffer<cr>
-  " Python specific
-  map <leader>fh  :CtrlPClearCache<cr>\|:CtrlP src/hoist<cr>
   " Rails specific
   map <leader>fa  :CtrlPClearCache<cr>\|:CtrlP app<cr>
   map <leader>fc  :CtrlPClearCache<cr>\|:CtrlP app/controllers<cr>
@@ -35,6 +34,7 @@ Bundle 'kien/ctrlp.vim'
   map <leader>ft  :CtrlPClearCache<cr>\|:CtrlP spec<cr>
   map <leader>fcc :CtrlPClearCache<cr>\|:CtrlP config<cr>
   map <leader>tt  :CtrlPTag<cr>
+  map <leader>.   :CtrlPTag<cr>
 
 Bundle 'msanders/snipmate.vim'
   let g:snippets_dir="~/.vim/snippets/"
@@ -62,7 +62,8 @@ Bundle 'ricardovaleriano/vim-github-theme'
 Bundle 'reedes/vim-colors-pencil'
 Bundle 'altercation/vim-colors-solarized'
 Bundle 'jonathanfilip/lucius'
-colorscheme peachpuff
+" colorscheme peachpuff
+colorscheme github
 
 " Bundle 'klen/python-mode'
 " let g:pymode_virtualenv = 1

.vim/extra.vim

@@ -30,6 +30,9 @@ au FileType make set noexpandtab
 " add jbuilder syntax highlighting
 au BufNewFile,BufRead *.json.jbuilder set ft=ruby
 
+" add ruby syntax highlighting to cap files
+au BufNewFile,BufRead *.cap set ft=ruby
+
 " to hide the code of method
 " function! FoldEndBlock()
 "   let spec_idx = line('.')

.vim/snippets/eruby.snippets

@@ -9,6 +9,6 @@ snippet yaml
 snippet pry
 	require 'pry'; binding.pry;
 snippet >>
-	<%= ${1} %>
+	<%= ${1} %> ${2}
 snippet >>>
-	<% ${1} %>
+	<% ${1} %> ${2}