Merge branch 'master' of https://github.com/edthedev/dotfiles

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 3e91fed92faf0655dfb58c554e20548703b5a041..59a77ce238db8a14853268c25f014b0f632df933 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -174,8 +174,23 @@ Plugin 'bling/vim-airline'
 Plugin 'vimwiki/vimwiki'
 let g:vimwiki_list = [{'path': '~/Box Sync/wiki', 'path_html': '~/cites_wiki_html/'},{'path': '~/Dropbox/wiki', 'path_html': '~/vim_wiki_html/'}]
 
 Plugin 'vimwiki/vimwiki'
 let g:vimwiki_list = [{'path': '~/Box Sync/wiki', 'path_html': '~/cites_wiki_html/'},{'path': '~/Dropbox/wiki', 'path_html': '~/vim_wiki_html/'}]
 

-# Emacs style kill-paste ring
+" Emacs style kill-paste ring

 Plugin 'vim-scripts/YankRing.vim'
 Plugin 'vim-scripts/YankRing.vim'

+"    :h yankring.txt
+"    :h yankring-tutorial
+
+" Javascript
+Plugin 'maksimr/vim-jsbeautify'
+"Plugin 'einars/js-beautify'
+Plugin 'Delapouite/vim-javascript-syntax'
+"Plugin 'pangloss/vim-javascript'
+
+" HTML
+Bundle 'othree/html5.vim'
+"Bundle 'evidens/vim-twig'
+"Bundle 'tokutake/twig-indent'
+"Bundle 'groenewege/vim-less'
+"Bundle 'hail2u/vim-css3-syntax'

 
 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
 
 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle