Permalink
Browse files

Added tons of stuff

  • Loading branch information...
Fran Casas
Fran Casas committed Jan 28, 2014
1 parent 8d3f863 commit 3314c67ce8d6c607e5e6e3501a9aeb88a103c91b
Showing with 22 additions and 9 deletions.
  1. +1 −0 git/gitignore
  2. +1 −1 gvimrc/gvimrc
  3. +16 −5 gvimrc/vimrc
  4. +4 −3 zsh/zshrc
View
@@ -4,3 +4,4 @@
.*.swp
*_test
*_test2
+.ruby-version
View
@@ -2,5 +2,5 @@ if has("gui_macvim")
" set the vim windows size
set lines=55 columns=150
" Set the macvim font
- set guifont=Inconsolata:h18
+ set guifont=Inconsolata\ for\ Powerline:h18
endif
View
@@ -44,6 +44,8 @@ NeoBundle 'tpope/vim-git'
NeoBundle 'tpope/vim-fugitive'
NeoBundle 'gregsexton/gitv'
NeoBundle 'mhinz/vim-signify'
+NeoBundle 'junkblocker/patchreview-vim'
+NeoBundle 'codegram/vim-codereview'
NeoBundle 'tpope/vim-surround'
NeoBundle 'tpope/vim-ragtag'
@@ -85,12 +87,12 @@ let g:unite_source_grep_command = 'ack'
let g:unite_source_grep_default_opts = '--no-heading --no-color -H'
let g:unite_source_grep_recursive_opt = ''
let g:unite_source_history_yank_enable = 1
-let g:unite_source_file_rec_max_cache_files = 0
-call unite#custom#source('file_mru,file_rec,file_rec/async,grepocate',
- \ 'max_candidates', 0)
+call unite#filters#matcher_default#use(['matcher_fuzzy'])
+" call unite#custom#source('file_mru,file_rec,file_rec/async,grepocate',
+" \ 'max_candidates', 0)
-nnoremap ff :Unite -start-insert file_rec/async:!<CR>
-nnoremap fa :Unite grep:.<cr>
+nnoremap ff :Unite -start-insert -no-split file_rec/async:!<CR>
+nnoremap fa :Unite -auto-preview grep:.<cr>
nnoremap fy :<C-u>Unite history/yank<CR>
nnoremap fb :Unite -quick-match buffer<cr>
@@ -102,6 +104,7 @@ let g:solarized_termcolors = 16
colorscheme solarized
set number
+set relativenumber
set cursorline
set colorcolumn=81
set list
@@ -179,6 +182,10 @@ au BufRead,BufNewFile *.md setlocal textwidth=80
" Open netrw when no argument specified
autocmd VimEnter * if !argc() | Explore | endif
+" Set relativenumbers on normal mode an relatives on insert mode
+autocmd InsertEnter * :set norelativenumber
+autocmd InsertLeave * :set relativenumber
+
" netrw config
let g:netrw_banner = 0
let g:netrw_keepdir = 0
@@ -205,6 +212,8 @@ let g:easytags_auto_highlight = 0
" Airline config
let g:airline_powerline_fonts = 1
let g:airline_theme='solarized'
+let g:airline_left_sep=''
+let g:airline_right_sep=''
let g:airline#extensions#tabline#enabled = 1
let ttimeoutlen=50
@@ -251,6 +260,8 @@ nmap <silent> ,a, :Tabularize /,<CR>
vmap <silent> ,a, :Tabularize /,<CR>
nmap <silent> ,a<Bar> :Tabularize /<Bar><CR>
vmap <silent> ,a<Bar> :Tabularize /<Bar><CR>
+nmap <silent> ,a{ :Tabularize /{<CR>
+vmap <silent> ,a{ :Tabularize /{<CR>
" Removes all traililing whitespaces from the buffer
function! s:FixWhitespace(line1,line2)
View
@@ -4,12 +4,12 @@ export DISABLE_AUTO_TITLE=true
# Set Vim as the default editor
export EDITOR='vim'
-plugins=(git github gem rails3 bundler rbenv vundle vi-mode)
+plugins=(git github gem rails bundler rbenv vundle vi-mode)
source $ZSH/oh-my-zsh.sh
# if [[ -z $TMUX ]]; then
- export PATH="$HOME/bin:/usr/local/bin/:$PATH"
+ export PATH="$HOME/bin:/usr/local/bin:$PATH"
eval "$(rbenv init -)"
### Added by the Heroku Toolbelt
export PATH="/usr/local/heroku/bin:$PATH"
@@ -36,7 +36,8 @@ alias rspec='bundle exec rspec'
if hash ack-grep 2>/dev/null; then
alias ack='ack-grep'
fi
+alias goto='teamocil --here'
-export HIPCHAT_USER="Francisco J. Casas"
+export HIPCHAT_USER="Fran Casas"
bindkey "^R" history-incremental-pattern-search-backward

0 comments on commit 3314c67

Please sign in to comment.