Skip to content

Commit

Permalink
Few changes
Browse files Browse the repository at this point in the history
  • Loading branch information
indrekj committed May 31, 2013
1 parent 2d29ae1 commit f78ef34
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
[core]
editor = vim
autocrlf = input
excludesfile = /home/innu/.gitignore_global
[diff]
wordRegex = (, )?[^[:space:],().]+[push]
default = current
Expand Down
2 changes: 1 addition & 1 deletion .vim/bundle/vundle
Submodule vundle updated from 3dcb0c to 5dd478
14 changes: 7 additions & 7 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ set wildignore+=*.luac " Lua byte code
set wildignore+=migrations " Django migrations
set wildignore+=*.pyc " Python byte code
set wildignore+=classes
set wildignore+=lib
set wildignore+=log

set foldlevel=100
Expand Down Expand Up @@ -81,8 +80,14 @@ inoremap <silent> <A-k> <Esc>:m-2<CR>==gi
vnoremap <silent> <A-j> :m'>+<CR>gv=gv
vnoremap <silent> <A-k> :m-2<CR>gv=gv
" ; key repeats last search. bind it to ;; so we can use ; as a leader key
nmap ;; ;<cr>
let mapleader = ";"

let ruby_operators = 1 " hightlight ruby operators
let g:rubycomplete_buffer_loading = 1
let g:rubycomplete_classes_in_global = 1

" required by Vundle
filetype off
Expand Down Expand Up @@ -129,11 +134,6 @@ inoremap # X<BS>#
source $VIMRUNTIME/filetype.vim
source $VIMRUNTIME/macros/matchit.vim

autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete
autocmd FileType ruby,eruby let g:rubycomplete_buffer_loading = 1
autocmd FileType ruby,eruby let g:rubycomplete_rails = 1
autocmd FileType ruby,eruby let g:rubycomplete_classes_in_global = 1

autocmd BufEnter *.html set filetype=xhtml
autocmd BufEnter */nginx/*.conf* set filetype=nginx
autocmd BufEnter *.html.erb source $HOME/.vim/syntax/html5.vim
Expand All @@ -149,7 +149,7 @@ autocmd FileType text setlocal textwidth=78
let g:ctrlp_map = "<leader>t"

" Regenerate tags
map <leader>rt :!ctags --extra=+f --languages=-javascript --exclude=.git --exclude=log -R * `rvm gemdir`/gems/*
map <leader>rt :!find . -iname *.rb \| xargs ctags --extra=+f
"map <leader>rt :!ctags --extra=+f --languages=-javascript --exclude=.git --exclude=log -R * `rvm gemdir`/gems/*<CR><C-M>

" Edit another file in the same directory as the current file
Expand Down
2 changes: 2 additions & 0 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -359,3 +359,5 @@ export GOROOT=/usr/local/go
#export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true"

export GTK2_RC_FILES="$HOME/.gtkrc-2.0"

PATH=$PATH:$HOME/.cabal/bin

0 comments on commit f78ef34

Please sign in to comment.