Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
lrvick committed Aug 9, 2014
2 parents 6b72f5f + 052b613 commit d0899e1
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 8 deletions.
9 changes: 6 additions & 3 deletions .gitmodules
Expand Up @@ -31,9 +31,6 @@ path = bundle/closetag
[submodule ".vim/bundle/syntastic"]
path = bundle/syntastic
url = https://github.com/scrooloose/syntastic.git
[submodule "bundle/Command-T"]
path = bundle/Command-T
url = https://github.com/vim-scripts/Command-T.git
[submodule "bundle/coffee-script"]
path = bundle/coffee-script
url = https://github.com/kchmck/vim-coffee-script
Expand All @@ -55,3 +52,9 @@ path = bundle/closetag
[submodule "bundle/editorconfig"]
path = bundle/editorconfig
url = git://github.com/editorconfig/editorconfig-vim.git
[submodule "bundle/fuzzyfinder"]
path = bundle/fuzzyfinder
url = https://github.com/vim-scripts/FuzzyFinder.git
[submodule "bundle/L9"]
path = bundle/L9
url = https://github.com/vim-scripts/L9.git
3 changes: 1 addition & 2 deletions README.md
Expand Up @@ -37,8 +37,7 @@ setup, is the only IDE I use. (Yes, I just called Vim an IDE. Deal.)

```bash
cd ~/.vim
git submodule init
git submodule update
git submodule update --init
```

3. Install dummy vimrc file
Expand Down
1 change: 0 additions & 1 deletion bundle/Command-T
Submodule Command-T deleted from 8df567
1 change: 1 addition & 0 deletions bundle/L9
Submodule L9 added at c822b0
1 change: 1 addition & 0 deletions bundle/fuzzyfinder
Submodule fuzzyfinder added at b9f165
4 changes: 4 additions & 0 deletions config/jshint.json
@@ -0,0 +1,4 @@
{
"laxbreak": true,
"laxcomma": true
}
36 changes: 34 additions & 2 deletions vimrc
Expand Up @@ -38,7 +38,9 @@ set listchars=trail:.
let g:syntastic_enable_signs=1
let g:syntastic_auto_jump=0
let g:syntastic_auto_loc_list=1
let g:syntastic_jsl_conf="~/.vim/config/jsl.conf"
"let g:syntastic_jsl_conf="~/.vim/config/jsl.conf"
let g:syntastic_javascript_checkers = ['jshint']
let g:syntastic_javascript_jshint_conf = '~/.vim/config/jshint.json'

"Solarized color scheme
set background=dark
Expand Down Expand Up @@ -67,17 +69,47 @@ let g:indent_guides_guide_size=1
let g:indent_guides_auto_colors = 0
hi IndentGuidesOdd ctermbg=236
hi IndentGuidesEven ctermbg=233
hi Normal ctermbg=none

let g:solarized_termtrans=1

"Gundo
nnoremap <silent> <F5> :GundoToggle<CR>
"Nerdtree
map <silent> <F2> :NERDTreeToggle<CR>
"FuzzyFinder
map <silent> <C-t> :FufCoverageFile<CR>
let g:fuf_file_exclude='\v\~$|\.(o|exe|dll|bak|orig|sw[po])$|(^|[/\\])\.(hg|git|bzr)($|[/\\])'


"Tagbar
nnoremap <silent> <F9> :TagbarToggle<CR>
"Status line of awesome
"Paren colors


"Statub line of awesome

let g:rbpt_colorpairs = [
\ ['brown', 'RoyalBlue3'],
\ ['Darkblue', 'SeaGreen3'],
\ ['darkgray', 'DarkOrchid3'],
\ ['darkgreen', 'firebrick3'],
\ ['darkcyan', 'RoyalBlue3'],
\ ['darkred', 'SeaGreen3'],
\ ['darkmagenta', 'DarkOrchid3'],
\ ['brown', 'firebrick3'],
\ ['gray', 'RoyalBlue3'],
\ ['darkmagenta', 'DarkOrchid3'],
\ ['Darkblue', 'firebrick3'],
\ ['darkgreen', 'RoyalBlue3'],
\ ['darkcyan', 'SeaGreen3'],
\ ['darkred', 'DarkOrchid3'],
\ ['red', 'firebrick3'],
\ ]

hi User1 ctermbg=237 ctermfg=248
hi User2 ctermbg=red ctermfg=blue
hi User3 ctermbg=blue ctermfg=green
Expand Down

0 comments on commit d0899e1

Please sign in to comment.